get automake-1.4 changes from -2-0 branch

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 2cb68864e7a657ecef3a0f817c7da2fad4a55088..bb3e10d58b281e71255cb3daa96fd8aa94612e68 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,29 +12,49 @@ FILE=gdk
 
 DIE=0
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+have_libtool=false
+if libtool --version < /dev/null > /dev/null 2>&1 ; then
+       libtool_version=`libtoolize --version |  libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+       case $libtool_version in
+           1.4*)
+               have_libtool=true
+               ;;
+       esac
+fi
+if $have_libtool ; then : ; else
        echo
-       echo "You must have autoconf installed to compile $PROJECT."
-       echo "Download the appropriate package for your distribution,"
+       echo "You must have libtool 1.4 installed to compile $PROJECT."
+       echo "Install the appropriate package for your distribution,"
        echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
        DIE=1
-}
+fi
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
        echo
-       echo "You must have libtool installed to compile $PROJECT."
-       echo "Get ftp://alpha.gnu.org/gnu/libtool-1.2b.tar.gz"
-       echo "(or a newer version if it is available)"
+       echo "You must have autoconf installed to compile $PROJECT."
+       echo "libtool the appropriate package for your distribution,"
+       echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
        DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+have_automake=false
+if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
+       automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+       case $automake_version in
+          1.2*|1.3*|1.4) 
+               ;;
+          *)
+               have_automake=true
+               ;;
+       esac
+fi
+if $have_automake ; then : ; else
        echo
-       echo "You must have automake installed to compile $PROJECT."
-       echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
+       echo "You must have automake 1.4-p1 installed to compile $PROJECT."
+       echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz"
        echo "(or a newer version if it is available)"
        DIE=1
-}
+fi
 
 if test "$DIE" -eq 1; then
        exit 1
@@ -45,34 +65,48 @@ test $TEST_TYPE $FILE || {
        exit 1
 }
 
-if test -z "$*"; then
-       echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        if test -z "$*"; then
+                echo "I am going to run ./configure with no arguments - if you wish "
+                echo "to pass any to it, please specify them on the $0 command line."
+        fi
 fi
 
 case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-echo "Running gettextize...  Ignore non-fatal messages."
-# Hmm, we specify --force here, since otherwise things dont'
-# get added reliably, but we don't want to overwrite intl
-# while making dist.
-echo "no" | gettextize --copy --force
-
-# We don't need ./intl
-rm -rf intl
+if test -z "$ACLOCAL_FLAGS"; then
+
+       acdir=`aclocal-1.4 --print-ac-dir`
+        m4list="glib-2.0.m4 glib-gettext.m4"
+
+       for file in $m4list
+       do
+               if [ ! -f "$acdir/$file" ]; then
+                       echo "WARNING: aclocal's directory is $acdir, but..."
+                       echo "         no file $acdir/$file"
+                       echo "         You may see fatal macro warnings below."
+                       echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+                       echo "         environment variable to \"-I /some/dir\", or install"
+                       echo "         $acdir/$file."
+                       echo ""
+               fi
+       done
+fi
 
-aclocal $ACLOCAL_FLAGS
+aclocal-1.4 $ACLOCAL_FLAGS
 
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
-automake $am_opt
+automake-1.4 -a $am_opt
 autoconf
 cd $ORIGDIR
 
-$srcdir/configure "$@"
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
 
-echo 
-echo "Now type 'make' to compile $PROJECT."
+        echo 
+        echo "Now type 'make' to compile $PROJECT."
+fi
\ No newline at end of file