change all file offsets from long to gint64 so we can - theoretically - handle files...

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

diff --git a/autogen.sh b/autogen.sh
index 529aa10a2ba3fc3365ae9b354696855fa9a534de..e9b02e414a1a17f21dc5d65d91e8ec0409c64298 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,11 +5,16 @@
 # $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!
@@ -42,7 +47,10 @@ esac
 
 AMVER=`$AUTOMAKE --version | grep '^automake' | sed 's/.*) *//'`
 case "$AMVER" in
-'' | 0.* | 1.[0-5]* )
+1.[6-9]* | 1.[1][0-9]*)
+  ;;
+
+*)
 
   cat >&2 <<_EOF_