Changeset 29807 in webkit

Timestamp:

Jan 26, 2008 4:32:49 AM (16 years ago)

Author:

mrowe@apple.com

Message:

Fix ​http://bugs.webkit.org/show_bug.cgi?id=17007 ([GTK] autogen.sh attempts to use "libtoolize" on the Mac).

Reviewed by Alp Toker.

libtoolize is installed as glibtoolize on Mac OS X to avoid naming conflicts
with other system commands. Check for the presence of glibtoolize if libtoolize
cannot be found.

• autogen.sh:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• autogen.sh (modified) (2 diffs)

trunk/ChangeLog

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

trunk/autogen.sh

@@ -12 +12 @@
 
 (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
 }
 
 (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
+    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
-        exit 1
+    exit 1
 fi
 
@@ -36 +48 @@
 
 aclocal || exit $?
-libtoolize --force || exit $?
+$LIBTOOLIZE --force || exit $?
 autoheader || exit $?
 automake --foreign --add-missing || exit $?