modify eol-style property

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

diff --git a/autogen.sh b/autogen.sh
index cb522fb47a279f36e4ac157ce50fb22b59ceb017..529aa10a2ba3fc3365ae9b354696855fa9a534de 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,11 +2,15 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id: autogen.sh,v 1.31 2004/03/08 22:44:19 jmayer Exp $
+# $Id$
 
 DIE=true
 PROJECT="Ethereal"
 
+ACLOCAL=aclocal
+AUTOHEADER=autoheader
+AUTOMAKE=automake
+AUTOCONF=autoconf
 
 # Check for python. There's no "--version" option!
 python -c "print 'Checking for python.'"
@@ -21,10 +25,10 @@ _EOF_
 fi
 
 
-ACVER=`autoconf --version | grep '^autoconf' | sed 's/.*) *//'`
+ACVER=`$AUTOCONF --version | grep '^autoconf' | sed 's/.*) *//'`
 case "$ACVER" in
-0* | 1\.* | 2\.[0-4]* | \
-2\.5[0-1] | 2\.5[0-1][a-z]* )
+'' | 0.* | 1.* | 2.[0-4]* | \
+2.5[0-1] | 2.5[0-1][a-z]* )
   cat >&2 <<_EOF_
 
        You must have autoconf 2.52 or later installed to compile $PROJECT.
@@ -36,9 +40,9 @@ _EOF_
 esac
 
 
-AMVER=`automake --version | grep '^automake' | sed 's/.*) *//'`
+AMVER=`$AUTOMAKE --version | grep '^automake' | sed 's/.*) *//'`
 case "$AMVER" in
-0.* | 1\.[0-5] | 1\.[0-5]\..* )
+'' | 0.* | 1.[0-5]* )
 
   cat >&2 <<_EOF_
 
@@ -59,17 +63,17 @@ 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
 fi
 case "$LTVER" in
-0* | 1\.[0-3]* )
+'' | 0.* | 1.[0-3]* )
 
   cat >&2 <<_EOF_
 
@@ -83,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
@@ -109,14 +98,30 @@ for dir in . epan wiretap ;  do
     fi
     aclocal_flags=`$topdir/aclocal-flags`
     aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
-    echo aclocal $aclocalinclude
-    aclocal $aclocalinclude || exit 1
-    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
+    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