And make the package bootstrap again with Automake >= 1.14, and require Automake >= 1.12 (see below for a rationale).
* Makefile.am: Add a dummy 'ChangeLog' target, so that Automake in 'gnu' strictness won't complain about a missing ChangeLog file; that file has recently switched to be autogenerated by recipes in 'maintMakefile'. (AUTOMAKE_OPTIONS): Delete redundant version requirement for 1.8 or later. Move options that only make sense for the top-level dir ... * configure.ac (AM_INIT_AUTOMAKE): ... in here. Bump requirement to Automake 1.12 (see below for a rationale). Drop the 'foreign' option, thus going back to the default 'gnu' strictness. Drop the '-Werror' option as well, so that the warning that Automake 1.14 gives about the 'subdir-objects' option not being enable will not be fatal (which is appropriate: any Automake in the 1.x series is required to still produce correct Makefiles even when the 'subdir-object' option is disabled. Also, while at it ... (AC_CHECK_PROG): ... drop the check for 'ar' here, and instead use AM_PROG_AR: this also avoids a Windows-related portability from Automake 1.12 or later (this is also what forces us to require 1.12 or later, as that macro is not available in earlier Automake version; but that's OK, since 1.12 is one-and-a-half years old now). Finally, also move AM_PROG_CC_C_O near to the AC_PROG_CC call (not strictly required, but better play safe). Copyright-paperwork-exempt: yes Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- Makefile.am | 1 - configure.ac | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index e2c0fe9..d820d33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see <http://www.gnu.org/licenses/>. -AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ACLOCAL_AMFLAGS = -I config MAKE_HOST = @MAKE_HOST@ diff --git a/configure.ac b/configure.ac index 8e11328..030adf5 100644 --- a/configure.ac +++ b/configure.ac @@ -26,15 +26,15 @@ AC_CONFIG_SRCDIR([vpath.c]) AC_CONFIG_HEADERS([config.h]) # Automake setup -# We have to enable "foreign" because ChangeLog is auto-generated -AM_INIT_AUTOMAKE([1.11.1 silent-rules foreign -Wall -Werror]) +AM_INIT_AUTOMAKE([1.12 silent-rules dist-bzip2 check-news -Wall]) # Checks for programs. AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_CPP -AC_CHECK_PROG([AR], [ar], [ar], [ar]) +AM_PROG_AR # Perl is needed for the test suite (only) AC_CHECK_PROG([PERL], [perl], [perl], [perl]) @@ -65,7 +65,6 @@ AC_HEADER_TIME AC_CHECK_HEADERS([stdlib.h locale.h unistd.h limits.h fcntl.h string.h \ memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h]) -AM_PROG_CC_C_O AC_C_CONST AC_TYPE_SIGNAL AC_TYPE_UID_T -- 1.8.3.1.605.g85318f5 _______________________________________________ Bug-make mailing list Bug-make@gnu.org https://lists.gnu.org/mailman/listinfo/bug-make
