diff --git a/bootstrap.conf b/bootstrap.conf index 100bdba..881089a 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -45,7 +45,6 @@ mbsinit memchr memrchr mkostemp -non-recursive-gnulib-prefix-hack obstack perl progname @@ -84,7 +83,7 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ ' gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\ - --makefile-name=gnulib.mk + --makefile-name=gnulib.mk --automake-subdir $avoided_gnulib_modules " @@ -106,9 +105,6 @@ bootstrap_post_import_hook () { # Automake requires that ChangeLog exist. touch ChangeLog || return 1 - - # Massage lib/gnulib.mk before using it later in the bootstrapping process. - build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk } bootstrap_epilogue() diff --git a/configure.ac b/configure.ac index 8fc927f..99ab7f0 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,7 @@ AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_SRCDIR([sed/sed.c]) AC_CONFIG_HEADERS([config.h:config_h.in]) AC_PREREQ([2.64]) -AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests - subdir-objects]) +AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests subdir-objects]) AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. AC_CONFIG_MACRO_DIR([m4])