modify eol-style property

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

diff --git a/autogen.sh b/autogen.sh
index 8f4cdb9ae8b2a6011a1087106f3c02e9f382fb59..529aa10a2ba3fc3365ae9b354696855fa9a534de 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id: autogen.sh,v 1.33 2004/03/15 12:21:52 jmayer Exp $
+# $Id$
 
 DIE=true
 PROJECT="Ethereal"
@@ -63,11 +63,11 @@ 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
@@ -87,22 +87,7 @@ 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 . epan wiretap ;  do
+for dir in . wiretap ;  do
   echo processing $dir
   (
     cd $dir
@@ -115,6 +100,22 @@ for dir in . epan 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