Removed some more "statement not reached" warnings.

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

diff --git a/autogen.sh b/autogen.sh
index 529aa10a2ba3fc3365ae9b354696855fa9a534de..90b5e94f1fab0d608e208bcb190bdad96fbe20d3 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_
 
@@ -87,43 +95,30 @@ esac
 
 $DIE
 
-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
-    if [ "$dir" = "." ] ; then
-        #
-        # 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
-    fi
-    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
+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
+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