Add a big comment about the ISO 8613-6/T.416 SGR support.

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

diff --git a/autogen.sh b/autogen.sh
index 19b4e8516d6e9e438589341bcb3834b6d5a61121..bb2902bb26f761da16155f424bcfc18d36009fc1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,7 +26,7 @@ DIE=true
 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
+# installation 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'
 
@@ -73,14 +73,14 @@ esac
 
 AMVER=`$AUTOMAKE --version | grep '^automake' | sed 's/.*) *//'`
 case "$AMVER" in
-1.9* | 1.[1][0-9]*)
+1.11* | 1.1[2-9]*)
   ;;
 
 *)
 
   cat >&2 <<_EOF_
 
-       You must have automake 1.9 or later installed to compile $PROJECT.
+       You must have automake 1.11 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_
@@ -107,11 +107,11 @@ else
        LIBTOOLIZE=glibtoolize
 fi
 case "$LTVER" in
-'' | 0.* | 1.[0-3]* )
+'' | 0.* | 1.* | 2.2 )
 
   cat >&2 <<_EOF_
 
-       You must have libtool 1.4 or later installed to compile $PROJECT.
+       You must have libtool 2.2.2 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/libtool/
 _EOF_
@@ -135,24 +135,13 @@ fi
 
 $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.
-# We don't omit "--force", as we want libtoolize to install other files
-# without whining.
-#
-mv config.guess config.guess.save-libtool
-mv config.sub config.sub.save-libtool
 LTARGS=" --copy --force"
 echo $LIBTOOLIZE $LTARGS
 $LIBTOOLIZE $LTARGS || exit 1
-rm -f config.guess config.sub
-mv config.guess.save-libtool config.guess
-mv config.sub.save-libtool config.sub
+aclocal_flags="-I m4"
+aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
+echo $ACLOCAL $aclocalinclude
+$ACLOCAL $aclocalinclude || exit 1
 echo $AUTOHEADER
 $AUTOHEADER || exit 1
 echo $AUTOMAKE --add-missing --gnu $am_opt
@@ -160,12 +149,4 @@ $AUTOMAKE --add-missing --gnu $am_opt || exit 1
 echo $AUTOCONF
 $AUTOCONF || exit 1
 
-if [ `uname -s` = Darwin ] ; then
-    echo
-    echo "To configure Wireshark on OS X, you will need to type:"
-    echo "export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/X11/lib/pkgconfig"
-    echo "before you can run configure."
-fi
-
-echo
 echo "Now type \"./configure [options]\" and \"make\" to compile $PROJECT."