projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2008-12-10 Zoltan Varga <vargaz@gmail.com>
[mono.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index 8d89d7f7b825476b720608310bf0803d5ae4d6e1..2c80b3c6b522b2aefdf39816960400711d9cc486 100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-12,13
+12,10
@@
if [ -n "$MONO_PATH" ]; then
# to -> /mono /another/mono
for i in `echo ${MONO_PATH} | tr ":" " "`; do
i=`dirname ${i}`
# to -> /mono /another/mono
for i in `echo ${MONO_PATH} | tr ":" " "`; do
i=`dirname ${i}`
- echo "i es $i"
if [ -n "{i}" -a -d "${i}/share/aclocal" ]; then
if [ -n "{i}" -a -d "${i}/share/aclocal" ]; then
- echo "añado $i/share/local"
ACLOCAL_FLAGS="-I ${i}/share/aclocal $ACLOCAL_FLAGS"
fi
if [ -n "{i}" -a -d "${i}/bin" ]; then
ACLOCAL_FLAGS="-I ${i}/share/aclocal $ACLOCAL_FLAGS"
fi
if [ -n "{i}" -a -d "${i}/bin" ]; then
- echo "añado $i/bin"
PATH="${i}/bin:$PATH"
fi
done
PATH="${i}/bin:$PATH"
fi
done
@@
-33,8
+30,15
@@
fi
DIE=1
}
DIE=1
}
+if [ -z "$LIBTOOL" ]; then
+ LIBTOOL=`which glibtool 2>/dev/null`
+ if [ ! -x "$LIBTOOL" ]; then
+ LIBTOOL=`which libtool`
+ fi
+fi
+
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
- (
libtool
--version) < /dev/null > /dev/null 2>&1 || {
+ (
$LIBTOOL
--version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed to compile Mono."
echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
echo
echo "**Error**: You must have \`libtool' installed to compile Mono."
echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
@@
-78,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."
@@
-94,12
+98,12
@@
esac
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
-
libtool
ize --force --copy
+
${LIBTOOL}
ize --force --copy
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"
@@
-120,6
+124,12
@@
automake --add-missing --gnu $am_opt ||
echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+if test -d $srcdir/libgc; then
+ echo Running libgc/autogen.sh ...
+ (cd $srcdir/libgc ; NOCONFIGURE=1 ./autogen.sh "$@")
+ echo Done running libgc/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