autogen.sh: run gtkdocize before aclocal

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 10a7fdad97a6df4181a661f620b692d5a70e0fea..1ad0b06970f07fafcbfec84c9724214a9655daf1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,16 +14,19 @@ DIE=0
 
 have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-       libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+       libtool_version=`libtoolize --version |
+                        head -1 |
+                        sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
+                            -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
        case $libtool_version in
-           1.4*|1.5*)
+           2.2*)
                have_libtool=true
                ;;
        esac
 fi
 if $have_libtool ; then : ; else
        echo
-       echo "You must have libtool 1.4 installed to compile $PROJECT."
+       echo "You must have libtool 2.2 installed to compile $PROJECT."
        echo "Install the appropriate package for your distribution,"
        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
        DIE=1
@@ -45,16 +48,20 @@ fi
        DIE=1
 }
 
-if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.7
-    ACLOCAL=aclocal-1.7
+if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
 else
        echo
-       echo "You must have automake 1.7.x installed to compile $PROJECT."
+       echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
        echo "Install the appropriate package for your distribution,"
        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
        DIE=1
 fi
+fi
 
 if test "$DIE" -eq 1; then
        exit 1
@@ -65,7 +72,12 @@ test $TEST_TYPE $FILE || {
        exit 1
 }
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+# NOCONFIGURE is used by gnome-common; support both
+if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
+    NOCONFIGURE=1
+fi
+
+if test -z "$NOCONFIGURE"; 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."
@@ -93,18 +105,24 @@ fi
 
 rm -rf autom4te.cache
 
-$ACLOCAL $ACLOCAL_FLAGS || exit $?
+# README and INSTALL are required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch these here, they will be
+# regenerated from their corresponding *.in files by ./configure anyway.
+touch README INSTALL
 
-libtoolize --force || exit $?
 gtkdocize || exit $?
 
+$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
+
+libtoolize --force || exit $?
+
 autoheader || exit $?
 
 $AUTOMAKE --add-missing || exit $?
 autoconf || exit $?
 cd $ORIGDIR || exit $?
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$NOCONFIGURE"; then
         $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
 
         echo