From c8a1cc363fc49c29ff0c15a36b50e14c7ab3b490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Mon, 26 Aug 2002 02:14:55 +0000
Subject: Disable the aclocal-fallback feature for aclocal (and thus automake)
 version 1.4

svn path=/trunk/; revision=6086
---
 autogen.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index fca12dafd2..58c1a246f1 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
-- 
cgit v1.2.1