projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2010-06-16 Atsushi Enomoto <atsushi@ximian.com>
[mono.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index cff9ab10d77e69e24e6812ef2cbf095953e67589..898b2d80beb5bda8afb2db16c0bffe3cf0cbe86d 100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-31,7
+31,10
@@
fi
}
if [ -z "$LIBTOOL" ]; then
}
if [ -z "$LIBTOOL" ]; then
- LIBTOOL=`which glibtool` || LIBTOOL=`which libtool`
+ LIBTOOL=`which glibtool 2>/dev/null`
+ if [ ! -x "$LIBTOOL" ]; then
+ LIBTOOL=`which libtool`
+ fi
fi
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
fi
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
@@
-79,7
+82,7
@@
if test "$DIE" -eq 1; then
exit 1
fi
exit 1
fi
-if test -z "$*"; then
+if test
x$NOCONFIGURE = x && test
-z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the"
echo \`$0\'" command line."
echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the"
echo \`$0\'" command line."
@@
-99,8
+102,8
@@
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
fi
fi
fi
fi
-echo "Running aclocal $ACLOCAL_FLAGS ..."
-aclocal $ACLOCAL_FLAGS || {
+echo "Running aclocal
-I .
$ACLOCAL_FLAGS ..."
+aclocal
-I .
$ACLOCAL_FLAGS || {
echo
echo "**Error**: aclocal failed. This may mean that you have not"
echo "installed all of the packages you need, or you may need to"
echo
echo "**Error**: aclocal failed. This may mean that you have not"
echo "installed all of the packages you need, or you may need to"
@@
-116,7
+119,7
@@
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
fi
echo "Running automake --gnu $am_opt ..."
fi
echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu $am_opt ||
+automake --add-missing --gnu
-Wno-portability
$am_opt ||
{ echo "**Error**: automake failed."; exit 1; }
echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
{ echo "**Error**: automake failed."; exit 1; }
echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
@@
-127,6
+130,12
@@
if test -d $srcdir/libgc; then
echo Done running libgc/autogen.sh ...
fi
echo Done running libgc/autogen.sh ...
fi
+if test -d $srcdir/eglib; then
+ echo Running eglib/autogen.sh ...
+ (cd $srcdir/eglib ; NOCONFIGURE=1 ./autogen.sh "$@")
+ echo Done running eglib/autogen.sh ...
+fi
+
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c