Enable proper VPATH build by moving CPPFLAGS -I Flags from configure.ac to Makefile.am

Added -I$(top_srcdir)/intl to CPPFLAGS
Added -I$(top_srcdir) to CPPFLAGS


git-svn-id: file:///home/jj/hercules.svn/trunk@2471 956126f8-22a0-4046-8f4a-272fa8102e63

CHANGES

@@ -1,6 +1,7 @@
 
 ####   Don't forget to change the version number in configure.ac!   ####
 
+18 Nov 2004 VPATH Build enablement - Ivan Warren
 17 Nov 2004 DIEBR,DIDBR framework - Roger Bowler
 17 Nov 2004 Fix instruction operand trace display - Jan Jaeger
 17 Nov 2004 MADBR,MADB,MAEBR,MAEB,MSDBR,MSDB,MSEBR,MSEB instructions - Roger Bowler

Makefile.am

@@ -18,6 +18,8 @@ endif
 
 LDADD = @LTLIBINTL@ @LTLIBICONV@ @LIBS@
 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/intl
+
 if BUILD_HERCIFC
   HERCIFC = hercifc
 else

configure.ac

@@ -20,12 +20,13 @@ AM_MAINTAINER_MODE
 ## AC_PROG_LIBTOOL
 ##
 
-# Initialization
-CFLAGS="-W -Wall $CFLAGS"
-# ISW20030826-2 : add -I./intl as specified by gettext/info - Maintainers - Adjusting files - src/Makefile.in - Paragraph before last
-# added line below
-CPPFLAGS="-I ./intl"
+AC_CANONICAL_HOST
 
+CFLAGS="-W -Wall $CFLAGS"
+
+#
+# NOTE : The following no longer applies (ISW)
+#
 # Programs  (Note use "HC_PROG_CC" and not "AC_PROG_CC". We now
 #            have our own "hercules.m4" macro defined in the
 #            autoconf directory that fixes an undesired compiler

crypto/Makefile.am

@@ -9,7 +9,9 @@ LDADD = @LTLIBINTL@ @LTLIBICONV@ @LIBS@
 
 LDADD += $(LIBGCRYPT_LIBS)
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
+# AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
+
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir) $(LIBGCRYPT_CFLAGS)
 
 dyncrypt_SRC     = dyncrypt.c \
                    sha1.c