[cairo-commit] autogen.sh INSTALL

[Behdad Esfahbod]

 INSTALL    |    5 -----
 autogen.sh |    3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 50b2076a54c76e051305981280c7fe443f517d61
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 27 17:59:13 2008 -0400

    [autogen.sh] Prefer glibtoolize to libtoolize if available
    
    Makes OS X users happy.

diff --git a/INSTALL b/INSTALL
index dfff8be..9c5d145 100644
--- a/INSTALL
+++ b/INSTALL
@@ -172,11 +172,6 @@ the autogen.sh script. That can be as simple as:
 
 	./autogen.sh
 
-Or, if you're using Mac OS X, you'll have to let it know to use
-glibtool by instead doing:
-
-	LIBTOOLIZE=glibtoolize ./autogen.sh
-
 But before you run that command, note that the autogen.sh script
 accepts all the same arguments as the configure script, (and in fact,
 will generate the configure script and run it with the arguments you
diff --git a/autogen.sh b/autogen.sh
index 4253a91..cf253ef 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,6 @@ cd $srcdir
 
 PACKAGE=cairo
 
-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 LIBTOOLIZE_FLAGS="--copy --force"
 AUTOHEADER=${AUTOHEADER-autoheader}
 AUTOMAKE_FLAGS="--add-missing --foreign"
@@ -142,7 +141,7 @@ version_check automake AUTOMAKE "$AUTOMAKE automake automake-1.10 automake-1.9 a
 ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
 
 
-version_check libtool LIBTOOLIZE $LIBTOOLIZE $libtoolize_min_vers \
+version_check libtool LIBTOOLIZE "$LIBTOOLIZE glibtoolize libtoolize" $libtoolize_min_vers \
     "http://ftp.gnu.org/pub/gnu/libtool/libtool-${libtool_min_vers}.tar.gz" || DIE=1
 
 if test -z "$ACLOCAL_FLAGS"; then