projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[daemon-fix][opt] Name acquiring fixed and clean-ups
[platform/upstream/dbus.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index
4e9fa3b
..
a450272
100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-47,7
+47,12
@@
fi
DIE=1
}
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."
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,9
@@
if test -z "$*"; then
echo "to pass any to it, please specify them on the $0 command line."
fi
echo "to pass any to it, please specify them on the $0 command line."
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
@@
-80,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
@@
-89,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 --config-cache "$@" || exit $?
echo
echo "Now type 'make' to compile $PROJECT."
else
echo
echo "Now type 'make' to compile $PROJECT."
else