Merge branch 'dbus-1.4'

[platform/upstream/dbus.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 7c2ae06..6270ee1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,7 +47,12 @@ fi
        DIE=1
 }
 
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOLIZE=`which libtoolize`
+if ! test -f $LIBTOOLIZE; then
+       LIBTOOLIZE=`which glibtoolize`
+fi
+
+($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
        echo
        echo "You must have libtoolize installed to compile $PROJECT."
        echo "Install the libtool package from ftp.gnu.org or a mirror."
@@ -68,9 +73,8 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-libtoolize --copy --force
+$LIBTOOLIZE --copy --force
 
-echo $ACLOCAL $ACLOCAL_FLAGS
 $ACLOCAL $ACLOCAL_FLAGS
 
 ## optionally feature autoheader