X-Git-Url: https://git.webkit.org/?p=WebKit.git;a=blobdiff_plain;f=autogen.sh;h=23639e897f28cd1cc3ce3244164db3c8f7a097e8;hp=b7f7d37b2f759b1a33247f57030586d880f3e5cd;hb=c107c6f1f80fba7a6688cc85e6cc68f0226bf85a;hpb=f93619a7e8b40ada05b2a969d1c8effd958688d1

diff --git a/autogen.sh b/autogen.sh
index b7f7d37..23639e8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,40 +1,24 @@
 #! /bin/sh
 
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
+ORIGDIR=`pwd`
 cd $srcdir
 
-DIE=0
+rm -f $top_srcdir/autom4te.cache
 
-(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
-}
+touch README INSTALL
 
-if test "$DIE" -eq 1; then
-	exit 1
+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
+autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?
 
-rm -rf $top_srcdir/autom4te.cache
-
-touch README INSTALL
-
-aclocal || exit $?
-libtoolize --force || exit $?
-autoheader || exit $?
-automake --foreign --add-missing || exit $?
-autoconf || exit $?
+cd $ORIGDIR || exit 1
 
-./configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?