Mercurial > gnulib
changeset 39943:b1ba0c77fa16
Assume Automake >= 1.11.
* m4/configmake.m4: Update comments.
* m4/lib-link.m4 (AC_LIB_RPATH): Assume AC_REQUIRE_AUX_FILE exists.
* m4/po.m4 (AM_PO_SUBDIRS, AM_POSTPROCESS_PO_MAKEFILE): Eliminate uses
of 'eval'.
* gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am,
func_create_testdir, func_create_megatestdir): Emit a Makefile.am that
requires Automake >= 1.11.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 23 Oct 2018 00:06:46 +0200 |
| parents | 0e16812cd96d |
| children | eb64273b66c2 |
| files | ChangeLog gnulib-tool m4/configmake.m4 m4/lib-link.m4 m4/po.m4 |
| diffstat | 5 files changed, 31 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 23 00:05:27 2018 +0200 +++ b/ChangeLog Tue Oct 23 00:06:46 2018 +0200 @@ -1,3 +1,14 @@ +2018-10-22 Bruno Haible <bruno@clisp.org> + + Assume Automake >= 1.11. + * m4/configmake.m4: Update comments. + * m4/lib-link.m4 (AC_LIB_RPATH): Assume AC_REQUIRE_AUX_FILE exists. + * m4/po.m4 (AM_PO_SUBDIRS, AM_POSTPROCESS_PO_MAKEFILE): Eliminate uses + of 'eval'. + * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am, + func_create_testdir, func_create_megatestdir): Emit a Makefile.am that + requires Automake >= 1.11. + 2018-10-22 Bruno Haible <bruno@clisp.org> localename: Fix typo in comment.
--- a/gnulib-tool Tue Oct 23 00:05:27 2018 +0200 +++ b/gnulib-tool Tue Oct 23 00:06:46 2018 +0200 @@ -34,7 +34,7 @@ # ;; #esac -# You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH. +# You can set AUTOMAKEPATH to empty if automake 1.11 is already in your PATH. AUTOMAKEPATH= # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH. @@ -3602,7 +3602,7 @@ if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.9.6 gnits${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.11 gnits${subdir_options}" fi echo if test -z "$makefile_name"; then @@ -3942,7 +3942,7 @@ if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.9.6 foreign${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.11 foreign${subdir_options}" echo if $for_test && ! $single_configure; then echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" @@ -6342,7 +6342,7 @@ # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" + echo "AUTOMAKE_OPTIONS = 1.11 foreign" echo echo "SUBDIRS = $subdirs" echo @@ -6659,7 +6659,7 @@ # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" + echo "AUTOMAKE_OPTIONS = 1.11 foreign" echo echo "SUBDIRS = $megasubdirs" echo
--- a/m4/configmake.m4 Tue Oct 23 00:05:27 2018 +0200 +++ b/m4/configmake.m4 Tue Oct 23 00:06:46 2018 +0200 @@ -1,4 +1,4 @@ -# configmake.m4 serial 2 +# configmake.m4 serial 3 dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,8 +8,7 @@ # ------------------ # Guarantee all of the standard directory variables, even when used with # autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir -# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b, -# and runstatedir in 1.14.1). +# in 2.70) or automake 1.11 (runstatedir isn't supported even in 1.16.1). AC_DEFUN([gl_CONFIGMAKE_PREP], [ dnl Technically, datadir should default to datarootdir. But if @@ -49,7 +48,7 @@ AC_SUBST([runstatedir], ['${localstatedir}/run']) fi - dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely - dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe. + dnl Automake 1.11 provides pkglibexecdir merely without AC_SUBST. + dnl This blind use of AC_SUBST is safe. AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}']) ])
--- a/m4/lib-link.m4 Tue Oct 23 00:05:27 2018 +0200 +++ b/m4/lib-link.m4 Tue Oct 23 00:06:46 2018 +0200 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 26 (gettext-0.18.2) +# lib-link.m4 serial 27 dnl Copyright (C) 2001-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -124,8 +124,8 @@ dnl acl_hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) + dnl Complain if config.rpath is missing. + AC_REQUIRE_AUX_FILE([config.rpath]) AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
--- a/m4/po.m4 Tue Oct 23 00:05:27 2018 +0200 +++ b/m4/po.m4 Tue Oct 23 00:06:46 2018 +0200 @@ -1,5 +1,5 @@ -# po.m4 serial 24 (gettext-0.19) -dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc. +# po.m4 serial 25 +dnl Copyright (C) 1995-2014, 2016, 2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -130,14 +130,11 @@ if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assignment from automake < 1.5. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assignment from automake < 1.5. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS fi # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) @@ -208,9 +205,8 @@ esac done]], [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake < 1.5. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. + OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS" # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" ]) @@ -311,15 +307,13 @@ fi if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` + ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` - ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` + ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assignment from automake < 1.5. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) # Compute UPDATEPOFILES