0
@@ -1,3 +1,16 @@
0
+2008-01-26  Mark Rowe  <mrowe@apple.com>
0
+
0
+        Reviewed by Alp Toker.
0
+
0
+        Fix http://bugs.webkit.org/show_bug.cgi?id=17007.
0
+        Bug 17007: [GTK] autogen.sh attempts to use "libtoolize" on the Mac
0
+
0
+        libtoolize is installed as glibtoolize on Mac OS X to avoid naming conflicts
0
+        with other system commands.  Check for the presence of glibtoolize if libtoolize
0
+        cannot be found.
0
+
0
+        * autogen.sh:
0
+
0
 2008-01-23  Alp Toker  <alp@atoker.com>
0
 
0
         Rubber-stamped by Mark Rowe.

0
@@ -11,23 +11,35 @@ cd $srcdir
0
 DIE=0
0
 
0
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
0
-	echo
0
-	echo "You must have autoconf installed to compile $PROJECT."
0
-	echo "Install the appropriate package for your distribution,"
0
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
0
-	DIE=1
0
+    echo
0
+    echo "You must have autoconf installed to compile $PROJECT."
0
+    echo "Install the appropriate package for your distribution,"
0
+    echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
0
+    DIE=1
0
 }
0
 
0
 (automake --version) < /dev/null > /dev/null 2>&1 || {
0
-	echo
0
-	echo "You must have automake installed to compile $PROJECT."
0
-	echo "Install the appropriate package for your distribution,"
0
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
0
-	DIE=1
0
+    echo
0
+    echo "You must have automake installed to compile $PROJECT."
0
+    echo "Install the appropriate package for your distribution,"
0
+    echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
0
+    DIE=1
0
+}
0
+
0
+LIBTOOLIZE=libtoolize
0
+($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
0
+    LIBTOOLIZE=glibtoolize
0
+    ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
0
+        echo
0
+        echo "You must have libtool installed to compile $PROJECT."
0
+        echo "Install the appropriate package for your distribution,"
0
+        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
0
+        DIE=1
0
+    }
0
 }
0
 
0
 if test "$DIE" -eq 1; then
0
-	exit 1
0
+    exit 1
0
 fi
0
 
0
 rm -rf $top_srcdir/autom4te.cache
0
@@ -35,7 +47,7 @@ rm -rf $top_srcdir/autom4te.cache
0
 touch README INSTALL
0
 
0
 aclocal || exit $?
0
-libtoolize --force || exit $?
0
+$LIBTOOLIZE --force || exit $?
0
 autoheader || exit $?
0
 automake --foreign --add-missing || exit $?
0
 autoconf || exit $?