[Joerg Mayer <jmayer@xxxxxxxxx>]

On Thu, Sep 12, 2002 at 03:18:46PM -0700, Guy Harris wrote:
> Nope, it didn't help:

Another week another patch. It might be a bit overkill but should
do the job. It also adds the same special detetion code that was
used for gtk to properly detect glib.
Please let me know the results.

  Ciao
         Jörg
--
Joerg Mayer                                          <jmayer@xxxxxxxxx>
I found out that "pro" means "instead of" (as in proconsul). Now I know
what proactive means.

? aclocalmess.diff
? m.log
Index: .cvsignore
===================================================================
RCS file: /usr/local/cvsroot/ethereal/.cvsignore,v
retrieving revision 1.23
diff -u -p -r1.23 .cvsignore
--- .cvsignore	14 Aug 2002 14:45:45 -0000	1.23
+++ .cvsignore	16 Sep 2002 22:03:49 -0000
@@ -47,6 +47,7 @@ randpkt
 rdps
 register-static.c
 register.c
+stamp-aclocal
 stamp-h
 stamp-h.in
 stamp-h1
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ethereal/Makefile.am,v
retrieving revision 1.500
diff -u -p -r1.500 Makefile.am
--- Makefile.am	16 Sep 2002 17:49:17 -0000	1.500
+++ Makefile.am	16 Sep 2002 22:03:50 -0000
@@ -21,8 +21,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#topdir = .
-ACLOCAL_AMFLAGS = "`./aclocal-flags`"
+ACLOCAL_AMFLAGS = `./aclocal-flags`
+
+$(ACLOCAL_M4):  configure.in acinclude.m4 stamp-aclocal
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+stamp-aclocal:
+	@./aclocal-flags
 
 #
 # This is a hideous hack.
Index: aclocal-flags
===================================================================
RCS file: /usr/local/cvsroot/ethereal/aclocal-flags,v
retrieving revision 1.4
diff -u -p -r1.4 aclocal-flags
--- aclocal-flags	6 Mar 2002 06:36:22 -0000	1.4
+++ aclocal-flags	16 Sep 2002 22:03:50 -0000
@@ -49,8 +49,62 @@ fi
 # they're different.
 #
 if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
-    -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
+	-a "$aclocal_dir" != "$gtk_aclocal_dir" ]
 then
-	echo "-I $gtk_aclocal_dir"
+	echo " -I $gtk_aclocal_dir"
 fi
+
+#
+# Same procedure for glib
+#
+glib_prefix=`glib-config --prefix`
+
+if [ -z "$glib_prefix" ]
+then
+	glib_aclocal_dir=""
+else
+	glib_aclocal_dir=$glib_prefix/share/aclocal
+fi
+
+#
+# If there's no "aclocal", the former will be empty; if there's no
+# "glib-config", the latter will be empty.
+#
+# Add the "-I" flag only if neither of those strings are empty, and
+# they're different.
+#
+if [ ! -z "$aclocal_dir" -a ! -z "$glib_aclocal_dir" \
+	-a "$aclocal_dir" != "$glib_aclocal_dir" ]
+then
+	echo " -I $glib_aclocal_dir"
+fi
+
+#
+#
+topdir=`dirname $0`
+
+cd "$topdir"
+if glib-config --version >/dev/null 2>&1 ; then
+	rm -f aclocal-missing/glib.m4
+else
+	cp aclocal-fallback/glib.m4 aclocal-missing/
+fi
+if gtk-config --version >/dev/null 2>&1 ; then
+	rm -f aclocal-missing/gtk.m4
+else
+	cp aclocal-fallback/gtk.m4 aclocal-missing/
+fi
+if pkg-config glib-2.0 >/dev/null 2>&1 ; then
+	rm -f aclocal-missing/glib-2.0.m4
+else
+	cp aclocal-fallback/glib-2.0.m4 aclocal-missing/
+fi
+if pkg-config gtk+-2.0 >/dev/null 2>&1 ; then
+	rm -f aclocal-missing/gtk-2.0.m4
+else
+	cp aclocal-fallback/gtk-2.0.m4 aclocal-missing/
+fi
+touch stamp-aclocal
+echo " -I $topdir/aclocal-missing"
+
 exit 0
Index: autogen.sh
===================================================================
RCS file: /usr/local/cvsroot/ethereal/autogen.sh,v
retrieving revision 1.19
diff -u -p -r1.19 autogen.sh
--- autogen.sh	28 Aug 2002 12:25:54 -0000	1.19
+++ autogen.sh	16 Sep 2002 22:03:50 -0000
@@ -87,28 +87,6 @@ if test -z "$*"; then
 	echo "please specify them on the $0 command line."
 fi
 
-aclocal_flags="`./aclocal-flags`"
-
-if glib-config --version >/dev/null 2>&1 ; then
-	rm -f aclocal-missing/glib.m4
-else
-	cp aclocal-fallback/glib.m4 aclocal-missing/
-fi
-if gtk-config --version >/dev/null 2>&1 ; then
-	rm -f aclocal-missing/gtk.m4
-else
-	cp aclocal-fallback/gtk.m4 aclocal-missing/
-fi
-if pkg-config glib-2.0 >/dev/null 2>&1 ; then
-	rm -f aclocal-missing/glib-2.0.m4
-else
-	cp aclocal-fallback/glib-2.0.m4 aclocal-missing/
-fi
-if pkg-config gtk+-2.0 >/dev/null 2>&1 ; then
-	rm -f aclocal-missing/gtk-2.0.m4
-else
-	cp aclocal-fallback/gtk-2.0.m4 aclocal-missing/
-fi
 
 for dir in . epan wiretap ;  do
   echo processing $dir
@@ -119,8 +97,8 @@ for dir in . epan wiretap ;  do
     else
         topdir=..
     fi
-    aclocal_missing="-I $topdir/aclocal-missing"
-    aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags $aclocal_missing";
+    aclocal_flags="`$topdir/aclocal-flags`"
+    eval aclocalinclude=\"$ACLOCAL_FLAGS $aclocal_flags\"
     echo aclocal $aclocalinclude
     aclocal $aclocalinclude || exit 1
     echo autoheader
Index: epan/Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ethereal/epan/Makefile.am,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile.am
--- epan/Makefile.am	18 Dec 2001 19:09:03 -0000	1.30
+++ epan/Makefile.am	16 Sep 2002 22:03:50 -0000
@@ -8,17 +8,17 @@
 # By Gerald Combs <gerald@xxxxxxxx>
 # Copyright 1998 Gerald Combs
 #
-# 
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -30,6 +30,12 @@ SUBDIRS = ftypes dfilter
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
+$(ACLOCAL_M4):  configure.in acinclude.m4 ../stamp-aclocal
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+../stamp-aclocal:
+	@../aclocal-flags
+
 noinst_LIBRARIES = libethereal.a
 
 INCLUDES = -I$(srcdir)/..
@@ -83,10 +89,10 @@ libethereal_a_SOURCES = \
 	tvbuff.c		\
 	tvbuff.h		\
 	value_string.c		\
-	value_string.h		
+	value_string.h
 
 EXTRA_libethereal_a_SOURCES =	\
-        inet_aton.c		\
+	inet_aton.c		\
 	inet_pton.c		\
 	inet_ntop.c		\
 	inet_aton.h		\
Index: wiretap/Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ethereal/wiretap/Makefile.am,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile.am
--- wiretap/Makefile.am	31 Jul 2002 19:27:56 -0000	1.39
+++ wiretap/Makefile.am	16 Sep 2002 22:03:51 -0000
@@ -7,22 +7,28 @@
 # By Gerald Combs <gerald@xxxxxxxx>
 # Copyright 1998 Gerald Combs
 #
-# 
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
+
+$(ACLOCAL_M4):  configure.in acinclude.m4 ../stamp-aclocal
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+../stamp-aclocal:
+	@../aclocal-flags
 
 noinst_LIBRARIES = libwiretap.a