From: xan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 3 Jan 2011 23:43:40 +0000 (+0000)
Subject: 2011-01-03  Xan Lopez  <xlopez@igalia.com>
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=d1eab94d028cfa9e23c10773496dfdf2227a059c

2011-01-03  Xan Lopez  <xlopez@igalia.com>

        Reviewed by Martin Robinson.

        Use autoreconf instead of calling manually all the usual commands.

        * autogen.sh: call autoreconf instead of
        aclocal/autoheader/autoconf/automake/libtoolize.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@74942 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/ChangeLog b/ChangeLog
index cd72bd7..b843915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,15 @@
 
         Reviewed by Martin Robinson.
 
+        Use autoreconf instead of calling manually all the usual commands.
+
+        * autogen.sh: call autoreconf instead of
+        aclocal/autoheader/autoconf/automake/libtoolize.
+
+2011-01-03  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
         [GTK] Disable superfluous GNU make built-in implicit rules
         https://bugs.webkit.org/show_bug.cgi?id=51826
 
diff --git a/autogen.sh b/autogen.sh
index d252eaf..4a9c891 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,55 +8,16 @@ test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd $srcdir
 
-GTKDOCIZE_FLAGS="--copy"
-LIBTOOLIZE_FLAGS="--force --automake"
-ACLOCAL_FLAGS="-I Source/autotools $ACLOCAL_FLAGS"
-AUTOMAKE_FLAGS="--foreign --add-missing"
+rm -f $top_srcdir/autom4te.cache
 
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $PROJECT."
-    echo "Install the appropriate package for your distribution,"
-    echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-    DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have automake 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
-}
-
-LIBTOOLIZE=libtoolize
-($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
-    LIBTOOLIZE=glibtoolize
-    ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
-        echo
-        echo "You must have libtool 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
-    }
-}
+touch README INSTALL
 
-if test "$DIE" -eq 1; then
+gtkdocize --copy > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
+if test -z `which autoreconf`; then
+    echo "Error: autoreconf not found, please install it."
     exit 1
 fi
-
-rm -rf $top_srcdir/autom4te.cache
-
-touch README INSTALL
-
-gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
-aclocal $ACLOCAL_FLAGS || exit $?
-$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
-autoheader || exit $?
-automake $AUTOMAKE_FLAGS || exit $?
-autoconf || exit $?
+autoreconf --verbose --install -I Source/autotools || exit $?
 
 cd $ORIGDIR || exit 1