Ethereal->Wireshark

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

diff --git a/autogen.sh b/autogen.sh
index fc45fef6b9225c6345cc28dfa304bf46fae0ea81..55dcfd63a874548cebf1d6edde9d062ac76b3d39 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"
 
-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!
@@ -87,21 +92,6 @@ esac
 
 $DIE
 
-#
-# 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
-
 for dir in . wiretap ;  do
   echo processing $dir
   (
@@ -115,6 +105,22 @@ for dir in . wiretap ;  do
     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