cd ../gtk ==> cd ../ui/gtk

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

diff --git a/autogen.sh b/autogen.sh
index 7d03ac66496a678dd311dfba5945cdb45f3f2037..5d45e447f6ba16bb35a0ac21b6bacb996c1d32e2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,9 +17,13 @@ AUTOHEADER=autoheader
 AUTOMAKE=automake$AM_VERSION
 AUTOCONF=autoconf
 
-# Check for python. There's no "--version" option!
-python -c "print 'Checking for python.'"
-if [ $? != 0 ] ; then
+# Check for python. Python did not support --version before version 2.5.
+# Until we require a version > 2.5, we should use -V.
+PYVER=`python -V 2>&1 | sed 's/Python *//'`
+case "$PYVER" in
+2*|3*)
+  ;;
+*)
   cat >&2 <<_EOF_
 
        You must have Python in order to compile $PROJECT.
@@ -27,16 +31,15 @@ if [ $? != 0 ] ; then
        or get the source tarball at http://www.python.org/
 _EOF_
   DIE="exit 1"
-fi
+esac
 
 
 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-5]* )
   cat >&2 <<_EOF_
 
-       You must have autoconf 2.52 or later installed to compile $PROJECT.
+       You must have autoconf 2.60 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/autoconf/
 _EOF_
@@ -47,11 +50,14 @@ esac
 
 AMVER=`$AUTOMAKE --version | grep '^automake' | sed 's/.*) *//'`
 case "$AMVER" in
-'' | 0.* | 1.[0-5]* )
+1.9* | 1.[1][0-9]*)
+  ;;
+
+*)
 
   cat >&2 <<_EOF_
 
-       You must have automake 1.6 or later installed to compile $PROJECT.
+       You must have automake 1.9 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_
@@ -92,43 +98,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