Follow up to rev 34073: Since "-b files:0" is no longer necessary to

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

diff --git a/autogen.sh b/autogen.sh
index e1cf3d06a85e0f3671311947c41b6c2027ddd921..e6884fba6ec79b074662e3bd994b6e6701f54d0a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,11 +2,20 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id: autogen.sh,v 1.32 2004/03/08 23:37:51 jmayer Exp $
+# $Id$
 
 DIE=true
-PROJECT="Ethereal"
+PROJECT="Wireshark"
 
+# 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$AM_VERSION
+AUTOCONF=autoconf
 
 # Check for python. There's no "--version" option!
 python -c "print 'Checking for python.'"
@@ -21,13 +30,12 @@ _EOF_
 fi
 
 
-ACVER=`autoconf --version | grep '^autoconf' | sed 's/.*) *//'`
+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_
@@ -36,13 +44,16 @@ _EOF_
 esac
 
 
-AMVER=`automake --version | grep '^automake' | sed 's/.*) *//'`
+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_
@@ -59,17 +70,17 @@ esac
 # Check for "glibtool" first.
 #
 LTVER=`glibtool --version 2>/dev/null | grep ' libtool)' | \
-    sed 's/.*) \([0-9][0-9.]*\) .*/\1/'`
+    sed 's/.*libtool) \([0-9][0-9.]*\)[^ ]* .*/\1/'`
 if test -z "$LTVER"
 then
        LTVER=`libtool --version | grep ' libtool)' | \
-           sed 's/.*) \([0-9][0-9.]*\) .*/\1/' `
+           sed 's/.*) \([0-9][0-9.]*\)[^ ]* .*/\1/' `
        LIBTOOLIZE=libtoolize
 else
        LIBTOOLIZE=glibtoolize
 fi
 case "$LTVER" in
-0* | 1\.[0-3]* )
+'' | 0.* | 1.[0-3]* )
 
   cat >&2 <<_EOF_
 
@@ -83,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.
@@ -97,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 . epan 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