Fix for bug 4695:

[obnox/wireshark/wip.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index fc45fef6b9225c6345cc28dfa304bf46fae0ea81..e6884fba6ec79b074662e3bd994b6e6701f54d0a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,14 +2,19 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id: autogen.sh,v 1.35 2004/05/02 00:43:43 guy Exp $
+# $Id$
 
 DIE=true
-PROJECT="Ethereal"
+PROJECT="Wireshark"
 
-ACLOCAL=aclocal
+# If you are going to use the non-default name for automake becase your OS
+# installaion has multiple versions, you need to call both aclocal and automake
+# with that version number, as they come from the same package.
+#AM_VERSION='-1.8'
+
+ACLOCAL=aclocal$AM_VERSION
 AUTOHEADER=autoheader
-AUTOMAKE=automake
+AUTOMAKE=automake$AM_VERSION
 AUTOCONF=autoconf
 
 # Check for python. There's no "--version" option!
@@ -27,11 +32,10 @@ fi
 
 ACVER=`$AUTOCONF --version | grep '^autoconf' | sed 's/.*) *//'`
 case "$ACVER" in
-'' | 0.* | 1.* | 2.[0-4]* | \
-2.5[0-1] | 2.5[0-1][a-z]* )
+'' | 0.* | 1.* | 2.[0-5]* )
   cat >&2 <<_EOF_
 
-       You must have autoconf 2.52 or later installed to compile $PROJECT.
+       You must have autoconf 2.60 or later installed to compile $PROJECT.
        Download the appropriate package for your distribution/OS,
        or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/
 _EOF_
@@ -42,11 +46,14 @@ esac
 
 AMVER=`$AUTOMAKE --version | grep '^automake' | sed 's/.*) *//'`
 case "$AMVER" in
-'' | 0.* | 1.[0-5]* )
+1.9* | 1.[1][0-9]*)
+  ;;
+
+*)
 
   cat >&2 <<_EOF_
 
-       You must have automake 1.6 or later installed to compile $PROJECT.
+       You must have automake 1.9 or later installed to compile $PROJECT.
        Download the appropriate package for your distribution/OS,
        or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/
 _EOF_
@@ -87,6 +94,10 @@ esac
 
 $DIE
 
+aclocal_flags=`./aclocal-flags`
+aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
+echo $ACLOCAL $aclocalinclude
+$ACLOCAL $aclocalinclude || exit 1
 #
 # We do NOT want libtoolize overwriting our versions of config.guess and
 # config.sub, so move them away and then move them back.
@@ -101,28 +112,12 @@ $LIBTOOLIZE $LTARGS || exit 1
 rm -f config.guess config.sub
 mv config.guess.save-libtool config.guess
 mv config.sub.save-libtool config.sub
-
-for dir in . wiretap ;  do
-  echo processing $dir
-  (
-    cd $dir
-    if [ "$dir" = "." ] ; then
-        topdir=.
-    else
-        topdir=..
-    fi
-    aclocal_flags=`$topdir/aclocal-flags`
-    aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
-    echo $ACLOCAL $aclocalinclude
-    $ACLOCAL $aclocalinclude || exit 1
-    echo $AUTOHEADER
-    $AUTOHEADER || exit 1
-    echo $AUTOMAKE --add-missing --gnu $am_opt
-    $AUTOMAKE --add-missing --gnu $am_opt || exit 1
-    echo $AUTOCONF
-    $AUTOCONF || exit 1
-  ) || exit 1
-done
+echo $AUTOHEADER
+$AUTOHEADER || exit 1
+echo $AUTOMAKE --add-missing --gnu $am_opt
+$AUTOMAKE --add-missing --gnu $am_opt || exit 1
+echo $AUTOCONF
+$AUTOCONF || exit 1
 
 #./configure "$@" || exit 1