Revert "Use automake silent rules (work everywhere) instead of custom sed(s)"

This reverts commit a7386ebbf60ebc533a4069b7ae9e1d4393ab567d.

diff --git a/configure.in b/configure.in
index 5e7f360f998abff5edd66ef00a5667c12e921b84..cbd3f1f74daf45a204c65d66bc9e0f34d32e12e3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -22,9 +22,6 @@ AC_SUBST(API_VER)
 
 AC_PROG_LN_S
 
-AM_INIT_AUTOMAKE([foreign])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
 # In case of cygwin, override LN_S, irrespective of what it determines.
 # The build uses cygwin, but the actual runtime doesn't.
 case $host_os in
@@ -720,8 +717,7 @@ if test "x$with_xen_opt" = "xyes" -a "x$mono_cv_clang" = "xno"; then
        ])
 fi
 
-# Use --disable-silent-rules instead
-#AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet runtime build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
+AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet runtime build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
 AC_ARG_ENABLE(small-config, [  --enable-small-config Enable tweaks to reduce requirements (and capabilities)], enable_small_config=$enableval, enable_small_config=no)
 
 if test x$enable_small_config = xyes; then
@@ -3110,16 +3106,16 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config],
     cd $depth
 ],[LN_S='$LN_S'])
 
-#if test x$enable_quiet_build = xyes; then
-#   AC_CONFIG_COMMANDS([quiet],
-#[  for i in `find mono libgc support -name Makefile`; do
-#         if [ grep -q 'generated by automake' $i ]; then
-#                $srcdir/scripts/patch-quiet.sh $i;
-#         fi;
-#   done
-#], [shell=$SHELL])
-#   AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
-#fi
+if test x$enable_quiet_build = xyes; then
+   AC_CONFIG_COMMANDS([quiet],
+[  for i in `find mono libgc support -name Makefile`; do
+          if [ grep -q 'generated by automake' $i ]; then
+                 $srcdir/scripts/patch-quiet.sh $i;
+          fi;
+   done
+], [shell=$SHELL])
+   AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
+fi
 
 AC_OUTPUT([
 Makefile