Albert Chin:

	- AM_PROC_LIBTOOL is just an alias for AC_PROG_LIBTOOL, which is
	  called earlier.
	- Use AM_CPPFLAGS instead of CFLAGS and CPPFLAGS to add inlude
	  directories

svn path=/trunk/; revision=8445

4 files changed, 10 insertions, 7 deletions

diff --git a/AUTHORS b/AUTHORS
index 7665a710eb..609bb197d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -675,6 +675,7 @@ Albert Chin <china[AT]thewrittenword.com> {
 	Fix to TCP graph code to eliminate a GCCism
 	Simplify some autoconf code
 	Assorted cleanups
+	Autoconf/automake cleanups
 }
 
 Charles Levert <charles[AT]comm.polymtl.ca> {
diff --git a/Makefile.am b/Makefile.am
index 9451adcc05..3294f0a8a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.623 2003/09/06 06:55:56 guy Exp $
+# $Id: Makefile.am,v 1.624 2003/09/10 07:17:20 jmayer Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -941,6 +941,9 @@ editcap_DEPENDENCIES = wiretap/libwiretap.a
 editcap_LDADD = wiretap/libwiretap.a @GLIB_LIBS@
 mergecap_LDADD = wiretap/libwiretap.a @GLIB_LIBS@
 
+# Common headers
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
+
 #
 # Build various header files for the X11 dissector.
 #
diff --git a/configure.in b/configure.in
index d24eee13b8..c3f0d0be79 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.220 2003/09/08 03:13:14 gerald Exp $
+# $Id: configure.in,v 1.221 2003/09/10 07:17:21 jmayer Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -138,9 +138,6 @@ else
 	esac
 fi
 
-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
-
 dnl Look in /usr/local for header files and libraries ?
 dnl XXX FIXME don't include /usr/local if it is already in the system
 dnl search path as this causes gcc 3.2 on Linux to complain about a change
@@ -774,7 +771,6 @@ fi
 AC_SUBST(plugindir)
 
 dnl libtool defs
-AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2d85306bfd..bafba8fac6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for the GTK interface routines for Ethereal
 #
-# $Id: Makefile.am,v 1.67 2003/09/10 05:35:25 guy Exp $
+# $Id: Makefile.am,v 1.68 2003/09/10 07:17:21 jmayer Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -224,3 +224,6 @@ EXTRA_DIST = \
 	compat_macros.h \
 	print_mswin.c  \
 	print_mswin.h
+
+# Common headers
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap