public
Description: A mirror of QtWebKit
Homepage: http://trac.webkit.org/projects/webkit/wiki/QtWebKit
Clone URL: git://github.com/tronical/qtwebkit.git
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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@29807 
268f45cc-cd09-0410-ab3c-d52691b4dbfc
mrowe@apple.com (author)
Sat Jan 26 04:32:49 -0800 2008
commit  2bc789fb0f5af14218105971c7df52044132126f
tree    82f5b5748df52e1ec276ae5e999483b5f4c13c88
parent  59e7c54d22c4d3e3ece274d52fc60c7de2e15395
...
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
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.
...
11
12
13
14
15
16
17
18
 
 
 
 
 
19
20
21
22
23
24
25
26
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27
28
29
30
 
31
32
33
...
35
36
37
38
 
39
40
41
...
11
12
13
 
 
 
 
 
14
15
16
17
18
19
20
21
 
 
 
 
 
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
 
42
43
44
45
...
47
48
49
 
50
51
52
53
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 $?

Comments

    No one has commented yet.