Add pause on exception support to the Inspector debugger

[WebKit-https.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 24dcbad..a929538 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,43 +1,57 @@
 #! /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
 
 DIE=0
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 cd $srcdir
 
 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
+    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
+(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
+    }
+}

 
 if test "$DIE" -eq 1; then
 
 if test "$DIE" -eq 1; then

-       exit 1
+    exit 1

 fi
 
 rm -rf $top_srcdir/autom4te.cache
 
 touch README INSTALL
 
 fi
 
 rm -rf $top_srcdir/autom4te.cache
 
 touch README INSTALL
 

-$ACLOCAL || exit $?
-libtoolize --force || exit $?
+aclocal || exit $?
+$LIBTOOLIZE --force || exit $?

 autoheader || exit $?
 autoheader || exit $?

-$AUTOMAKE --foreign --add-missing || exit $?
+automake --foreign --add-missing || exit $?

 autoconf || exit $?
 
 autoconf || exit $?
 

-./configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+cd $ORIGDIR || exit 1
+
+$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?