Modernize checks for dirfd/dd_fd

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

diff --git a/autogen.sh b/autogen.sh
index 0b374df..6270ee1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,10 +9,16 @@ cd $srcdir
 
 PROJECT=dbus
 TEST_TYPE=-f
-FILE=dbus-1.0.pc.in
+FILE=dbus-1.pc.in
 
 DIE=0
 
+if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+    echo "Activating pre-commit hook."
+    cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
+    chmod -c +x  .git/hooks/pre-commit
+fi
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
        echo
        echo "You must have autoconf installed to compile $PROJECT."
@@ -21,8 +27,12 @@ DIE=0
        DIE=1
 }
 
-AUTOMAKE=automake-1.6
-ACLOCAL=aclocal-1.6
+# If the user hasn't explicitly chosen an Automake version, use 1.11. This is
+# the earliest version that gives us silent rules.
+if test -z "$AUTOMAKE"; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+fi
 
 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
         AUTOMAKE=automake
@@ -37,7 +47,12 @@ ACLOCAL=aclocal-1.6
        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."
@@ -58,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
@@ -83,7 +97,7 @@ for arg in $*; do
 done
 
 if $run_configure; then
-    $srcdir/configure --enable-maintainer-mode "$@"
+    $srcdir/configure --enable-maintainer-mode --config-cache "$@"
     echo 
     echo "Now type 'make' to compile $PROJECT."
 else