diff options
| -rwxr-xr-x | bootstrap | 8 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 8 deletions
@@ -686,12 +686,6 @@ find "$m4_base" "$source_base" \ -depth \( -name '*.m4' -o -name '*.[ch]' \) \ -type l -xtype l -delete > /dev/null 2>&1 -# Use automake's --silent-rules option, if possible. -automake="${AUTOMAKE-automake} --add-missing --copy --force-missing" -(${AUTOMAKE-automake} --help) 2>&1 \ - | grep -e '^ *--silent-rules' > /dev/null \ - && automake="$automake --silent-rules" - # Reconfigure, getting other files. for command in \ @@ -699,7 +693,7 @@ for command in \ "${ACLOCAL-aclocal} --force -I m4" \ "${AUTOCONF-autoconf} --force" \ "${AUTOHEADER-autoheader} --force" \ - "$automake" + "${AUTOMAKE-automake} --add-missing --copy --force-missing" do if test "$command" = libtool; then use_libtool=0 diff --git a/configure.ac b/configure.ac index 71f29e9d1..8d9bcafe6 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_CONFIG_SRCDIR([src/ls.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) -AM_INIT_AUTOMAKE([1.10a dist-xz color-tests parallel-tests]) +AM_INIT_AUTOMAKE([1.10b dist-xz color-tests parallel-tests silent-rules]) AC_PROG_CC_STDC AM_PROG_CC_C_O |