Add a script, "aclocal-flags", which figures out where

	1) aclocal expects autoconf/automake macros to be hidden;

	2) GTK+ hid its autoconf/automake macros;

and, if both places exist but aren't the same directory, returns a "-I"
flag to tell aclocal to look in GTK+'s directory.

Then have "autogen.sh", and Makefiles in directories with "acinclude.m4"
files, use that script and pass what flag it supplies, if any, to
aclocal.

This should, I hope, avoid problems such as those FreeBSD systems where
GTK+ was installed from a port or package (and thus stuck its macros in
"/usr/X11R6/share/aclocal") but aclocal doesn't look there.

(It doesn't solve the problem of somebody downloading and installing,
say, libtool from source - which means it probably shows up under
"/usr/local", with its macros in "/usr/local/share/aclocal" - on a
system that comes with aclocal (meaning it probably just looks in
"/usr/share/aclocal", but that may be best fixed by, whenever you
download a source tarball for something that's part of your OS,
configuring it to install in the standard system directories and
*overwriting* your OS's version.)

svn path=/trunk/; revision=2165

1 files changed, 3 insertions, 2 deletions

diff --git a/autogen.sh b/autogen.sh
index 5642f71cd6..cb1ad9a373 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id: autogen.sh,v 1.9 2000/07/22 20:00:21 guy Exp $
+# $Id: autogen.sh,v 1.10 2000/07/26 08:03:39 guy Exp $
 
 DIE=true
 PROJECT="Ethereal"
@@ -62,11 +62,12 @@ if test -z "$*"; then
 	echo "please specify them on the $0 command line."
 fi
 
+aclocal_flags="`./aclocal-flags`"
 for dir in . wiretap ;  do
   echo processing $dir
   (
     cd $dir
-    aclocalinclude="$ACLOCAL_FLAGS"; \
+    aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags"; \
     echo aclocal $aclocalinclude
     aclocal $aclocalinclude || exit 1
     echo autoheader