diff options
| author | Bruno Haible <bruno@clisp.org> | 2018-10-23 00:06:46 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2018-10-23 00:06:46 +0200 |
| commit | 97eae14a5b2506457a72f89d5897a20730ab6eee (patch) | |
| tree | ae581018cac95353cee239e552b201f03354890d /m4/configmake.m4 | |
| parent | a78dbe23b45d7d5e7ec174d8ecf881934de3aafb (diff) | |
| download | gnulib-97eae14a5b2506457a72f89d5897a20730ab6eee.tar.gz | |
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.
Diffstat (limited to 'm4/configmake.m4')
| -rw-r--r-- | m4/configmake.m4 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/m4/configmake.m4 b/m4/configmake.m4 index e0b5835b26..a4285f8add 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -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 @@ dnl with or without modifications, as long as this notice is preserved. # ------------------ # 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_DEFUN([gl_CONFIGMAKE_PREP], 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}']) ]) |