projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start 1.12.10 development
[platform/upstream/dbus.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index
d139fa4
..
6de735f
100755
(executable)
--- 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."
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 || {
fi
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
@@
-48,7
+48,7
@@
fi
}
LIBTOOLIZE=`which libtoolize`
}
LIBTOOLIZE=`which libtoolize`
-if ! test -f
$LIBTOOLIZE
; then
+if ! test -f
"$LIBTOOLIZE"
; then
LIBTOOLIZE=`which glibtoolize`
fi
LIBTOOLIZE=`which glibtoolize`
fi
@@
-81,7
+81,10
@@
$ACLOCAL -I m4 $ACLOCAL_FLAGS
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
$AUTOMAKE -a $am_opt
(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
cd $ORIGDIR
@@
-101,11
+104,5
@@
else
fi
if $run_configure; then
fi
if $run_configure; then
- $srcdir/configure --enable-maintainer-mode --config-cache "$@"
- echo
- echo "Now type 'make' to compile $PROJECT."
-else
- echo
- echo "Now run 'configure' and 'make' to compile $PROJECT."
+ $srcdir/configure --enable-developer --config-cache "$@"
fi
fi
-