aboutsummaryrefslogtreecommitdiffstats
path: root/autogen.sh
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2002-08-26 02:14:55 +0000
committerJörg Mayer <jmayer@loplof.de>2002-08-26 02:14:55 +0000
commitc8a1cc363fc49c29ff0c15a36b50e14c7ab3b490 (patch)
treea52a4e1bdd083278267163d95de73d0db9da829b /autogen.sh
parent9aaf4916afb93f8e55efce7cf1bf8c7b83de837d (diff)
Disable the aclocal-fallback feature for aclocal (and thus automake)
version 1.4 svn path=/trunk/; revision=6086
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh16
1 files changed, 14 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index fca12da..58c1a24 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
#
# Run this to generate all the initial makefiles.
#
-# $Id: autogen.sh,v 1.16 2002/08/23 21:12:07 jmayer Exp $
+# $Id: autogen.sh,v 1.17 2002/08/26 02:14:55 jmayer Exp $
DIE=true
PROJECT="Ethereal"
@@ -88,6 +88,7 @@ if test -z "$*"; then
fi
aclocal_flags="`./aclocal-flags`"
+
for dir in . epan wiretap ; do
echo processing $dir
(
@@ -97,7 +98,18 @@ for dir in . epan wiretap ; do
else
topdir=..
fi
- aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags -I $topdir/aclocal-fallback"; \
+ VER=`aclocal --version | head -1`
+ case $VER in
+ aclocal*1.4 | aclocal*1.4[^0-9]* )
+ echo "Automake 1.4 detected Disabling aclocal-fallback"
+ aclocal_fallback=""
+ ;;
+ * )
+ aclocal_fallback="-I $topdir/aclocal-fallback"
+ ;;
+ esac
+
+ aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags $aclocal_fallback"; \
echo aclocal $aclocalinclude
aclocal $aclocalinclude || exit 1
echo autoheader