Fix VARIANT out args

[platform/upstream/glib.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 9da7a60..358371b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,10 +13,13 @@ FILE=glib/glib.h
 DIE=0
 
 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/'`
+if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
+       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.4*|1.5*|2.2*)
                have_libtool=true
                ;;
        esac
@@ -25,47 +28,43 @@ if $have_libtool ; then : ; else
        echo
        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/"
+       echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
        DIE=1
 fi
 
+(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
+       echo
+       echo "You must have gtk-doc installed to compile $PROJECT."
+       echo "Install the appropriate package for your distribution,"
+       echo "or get the source tarball at ftp://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+       DIE=1
+}
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
        echo
        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/"
+       echo "Install the appropriate package for your distribution,"
+       echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
        DIE=1
 }
 
-have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-       automake_version=`automake --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
+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.9 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.9
+    ACLOCAL=aclocal-1.9
+else
        echo
-       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)"
+       echo "You must have automake 1.9.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
-
-have_gettext=false
-if xgettext --version 2>/dev/null | grep 'GNU' > /dev/null ; then 
-        have_gettext=true
 fi
-
-if $have_gettext ; then : ; else
-       echo
-       echo "GNU gettext must be installed to build GLib from CVS"
-       echo "GNU gettext is available from http://www.gnu.org/software/gettext/"
-       DIE=1
 fi
 
 if test "$DIE" -eq 1; then
@@ -84,22 +83,27 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
         fi
 fi
 
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
+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
+$ACLOCAL $ACLOCAL_FLAGS || exit $?
 
-# optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+libtoolize --force || exit $?
+gtkdocize || exit $?
 
-automake -a $am_opt
-autoconf
-cd $ORIGDIR
+autoheader || exit $?
+
+$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."
-fi
\ No newline at end of file
+fi