[chromium] Update win/linux pixel expectations for r90701 (part 12/12).

[WebKit-https.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 24dcbad..23639e8 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,43 +1,24 @@
 #! /bin/sh
 
 #! /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=.
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 

+ORIGDIR=`pwd`

 cd $srcdir
 
 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
-}
-
-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.9.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
+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
 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 --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?