Don't hang print dialog when remote CUPS printer is not available

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 3c1c6ec53d9ebaa76bf3ac1302508381560afe55..19d2bdc81ace303d1c32949a8ac5ade5dc45b7a0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,9 +14,12 @@ 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*)
+           1.4*|1.5*|2.2*)
                have_libtool=true
                ;;
        esac
@@ -45,16 +48,24 @@ fi
        DIE=1
 }
 
-if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+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 if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.7
     ACLOCAL=aclocal-1.7
 else
        echo
-       echo "You must have automake 1.7.x installed to compile $PROJECT."
+       echo "You must have automake 1.7.x, 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
+fi
 
 if test "$DIE" -eq 1; then
        exit 1
@@ -91,19 +102,26 @@ if test -z "$ACLOCAL_FLAGS"; then
        done
 fi
 
-$ACLOCAL $ACLOCAL_FLAGS || exit 1
+rm -rf autom4te.cache
+
+# 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
+
+$ACLOCAL $ACLOCAL_FLAGS || exit $?
 
-libtoolize --force || exit 1
-gtkdocize || exit 1
+libtoolize --force || exit $?
+gtkdocize || exit $?
 
-autoheader || exit 1
+autoheader || exit $?
 
-$AUTOMAKE --add-missing || exit 1
-autoconf || exit 1
-cd $ORIGDIR
+$AUTOMAKE --add-missing || exit $?
+autoconf || exit $?
+cd $ORIGDIR || exit $?
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
+        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
 
         echo 
         echo "Now type 'make' to compile $PROJECT."