projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...
[platform/upstream/dbus.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index
a3a6368
..
ab3afed
100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-48,7
+48,7
@@
fi
}
LIBTOOLIZE=`which libtoolize`
}
LIBTOOLIZE=`which libtoolize`
-if
test -n
$LIBTOOLIZE; then
+if
! test -f
$LIBTOOLIZE; then
LIBTOOLIZE=`which glibtoolize`
fi
LIBTOOLIZE=`which glibtoolize`
fi
@@
-75,7
+75,7
@@
fi
$LIBTOOLIZE --copy --force
$LIBTOOLIZE --copy --force
-$ACLOCAL $ACLOCAL_FLAGS
+$ACLOCAL
-I m4
$ACLOCAL_FLAGS
## optionally feature autoheader
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
## optionally feature autoheader
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
@@
-85,8
+85,9
@@
autoconf || echo "autoconf failed - version 2.5x is probably required"
cd $ORIGDIR
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
case $arg in
--no-configure)
run_configure=false
@@
-94,10
+95,14
@@
for arg in $*; do
*)
;;
esac
*)
;;
esac
-done
+ done
+else
+ run_configure=false
+fi
+#--enable-developer --enable-verbose-mode
if $run_configure; then
if $run_configure; then
- $srcdir/configure --enable-
maintainer-mode --config-cache "$@"
+ $srcdir/configure --enable-
abstract-sockets --enable-verbose-mode --config-cache "$@" || exit $?
echo
echo "Now type 'make' to compile $PROJECT."
else
echo
echo "Now type 'make' to compile $PROJECT."
else