projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[runtime] Prioritize loading a profiler library from the installation dir over standa...
[mono.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index 8fc51d24df070776c14a3ba73fd310cba639610a..d4a6ecaccbbb9de378559f6e8d9e4824f0ab0eee 100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-37,7
+37,7
@@
if [ -z "$LIBTOOL" ]; then
fi
fi
fi
fi
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.
in
>/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.
ac
>/dev/null) && {
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed to compile Mono."
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed to compile Mono."
@@
-47,8
+47,8
@@
fi
}
}
}
}
-grep "^AM_GNU_GETTEXT" $srcdir/configure.
in
>/dev/null && {
- grep "sed.*POTFILES" $srcdir/configure.
in
>/dev/null || \
+grep "^AM_GNU_GETTEXT" $srcdir/configure.
ac
>/dev/null && {
+ grep "sed.*POTFILES" $srcdir/configure.
ac
>/dev/null || \
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`gettext' installed to compile Mono."
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`gettext' installed to compile Mono."
@@
-95,7
+95,7
@@
xlc )
esac
esac
-if grep "^AM_PROG_LIBTOOL" configure.
in
>/dev/null; then
+if grep "^AM_PROG_LIBTOOL" configure.
ac
>/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
${LIBTOOL}ize --force --copy
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
${LIBTOOL}ize --force --copy
@@
-107,19
+107,22
@@
fi
# Plug in the extension module
#
has_ext_mod=false
# Plug in the extension module
#
has_ext_mod=false
+ext_mod_args=''
for PARAM; do
for PARAM; do
- if test "$PARAM" = "--enable-extension-module" ; then
- has_ext_mod=true
- fi
+ if [[ $PARAM =~ "--enable-extension-module" ]] ; then
+ has_ext_mod=true
+ if [[ $PARAM =~ "=" ]] ; then
+ ext_mod_args=`echo $PARAM | cut -d= -f2`
+ fi
+ fi
done
if test x$has_ext_mod = xtrue; then
pushd ../mono-extensions/scripts
done
if test x$has_ext_mod = xtrue; then
pushd ../mono-extensions/scripts
- sh ./prepare-repo.sh || exit 1
+ sh ./prepare-repo.sh
$ext_mod_args
|| exit 1
popd
else
cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
popd
else
cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
- cat mono/metadata/Makefile.am.in > mono/metadata/Makefile.am
fi
fi
@@
-134,7
+137,7
@@
aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
exit 1
}
exit 1
}
-if grep "^AC_CONFIG_HEADERS" configure.
in
>/dev/null; then
+if grep "^AC_CONFIG_HEADERS" configure.
ac
>/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi