X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=autogen.sh;h=6de735f0e3689812f6dc352cf97049a703d75ee9;hb=5c4fb289437d1d80991ae74f689e34fcebb27b31;hp=a3a63685611f2db93282c57bcd92d769dd5c8dec;hpb=a19c3d2e8b590d95a4959c68895331b88d121ecb;p=platform%2Fupstream%2Fdbus.git

diff --git a/autogen.sh b/autogen.sh
index a3a6368..6de735f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,8 +15,8 @@ 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
+    cp .git/hooks/pre-commit.sample .git/hooks/pre-commit
+    chmod +x .git/hooks/pre-commit
 fi
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
@@ -48,7 +48,7 @@ fi
 }
 
 LIBTOOLIZE=`which libtoolize`
-if test -n $LIBTOOLIZE; then
+if ! test -f "$LIBTOOLIZE"; then
 	LIBTOOLIZE=`which glibtoolize`
 fi
 
@@ -75,18 +75,22 @@ fi
 
 $LIBTOOLIZE --copy --force
 
-$ACLOCAL $ACLOCAL_FLAGS
+$ACLOCAL -I m4 $ACLOCAL_FLAGS
 
 ## optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
 $AUTOMAKE -a $am_opt
-autoconf || echo "autoconf failed - version 2.5x is probably required"
+if ! autoconf; then
+  echo "autoconf failed - version 2.5x is probably required" >&2
+  exit 1
+fi
 
 cd $ORIGDIR
 
-run_configure=true
-for arg in $*; do
+if test x"$NOCONFIGURE" = x; then
+  run_configure=true
+  for arg in $*; do
     case $arg in 
         --no-configure)
             run_configure=false
@@ -94,14 +98,11 @@ for arg in $*; do
         *)
             ;;
     esac
-done
-
-if $run_configure; then
-    $srcdir/configure --enable-maintainer-mode --config-cache "$@"
-    echo 
-    echo "Now type 'make' to compile $PROJECT."
+  done
 else
-    echo
-    echo "Now run 'configure' and 'make' to compile $PROJECT."
+  run_configure=false
 fi
 
+if $run_configure; then
+    $srcdir/configure --enable-developer --config-cache "$@"
+fi