diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-08-08 01:58:42 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-08-08 01:58:42 +0200 |
| commit | 15e4365267e316f15222b8bf9f0a7cd0db231e9c (patch) | |
| tree | b066c34e577c1206cddc65b13bfe4d40558bc741 | |
| parent | a192acd84d07c25256eea34a18293133d2435689 (diff) | |
| download | libunistring-15e4365267e316f15222b8bf9f0a7cd0db231e9c.tar.gz | |
Make gl_INIT_PACKAGE work with Automake >= 1.16.4.
Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in
<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>.
* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro
gl_INIT_EMPTY.
(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro
gl_INIT_DUMMY2.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | m4/init-package-version.m4 | 12 |
2 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,13 @@ +2021-08-07 Bruno Haible <bruno@clisp.org> + + Make gl_INIT_PACKAGE work with Automake >= 1.16.4. + Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in + <https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>. + * m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro + gl_INIT_EMPTY. + (gl_INIT_DUMMY): Expand to empty in two steps, via a new macro + gl_INIT_DUMMY2. + 2021-07-25 Bruno Haible <bruno@clisp.org> u{8,16,32}-uctomb: Avoid possible trouble with huge strings. diff --git a/m4/init-package-version.m4 b/m4/init-package-version.m4 index f131a84..a26b1ab 100644 --- a/m4/init-package-version.m4 +++ b/m4/init-package-version.m4 @@ -1,5 +1,5 @@ -# init-package-version.m4 serial 1 (gettext-0.18) -dnl Copyright (C) 1992-2009 Free Software Foundation, Inc. +# init-package-version.m4 serial 2 +dnl Copyright (C) 1992-2021 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE], m4_bpatsubst(m4_dquote( m4_defn([AM_INIT_AUTOMAKE])), [AC_PACKAGE_NAME], [gl_INIT_DUMMY])), - [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])), + [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])), [AC_PACKAGE_VERSION], [gl_INIT_DUMMY]) [AC_SUBST([PACKAGE], [$1]) AC_SUBST([VERSION], [$2]) @@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE], m4_define([AM_INIT_AUTOMAKE], m4_defn([gl_RPL_INIT_AUTOMAKE])) ]) -m4_define([gl_INIT_DUMMY], []) +m4_define([gl_INIT_EMPTY], []) +dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY. +dnl But a macro that later expands to empty works. +m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2]) +m4_define([gl_INIT_DUMMY2], []) AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ m4_ifval([$2], [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])]) |