From: Bruno Haible Date: Sat, 18 Jan 2020 13:33:33 +0000 (+0100) Subject: Ensure Automake does not drop ~~gnulib.m4. X-Git-Tag: v1.0~4340 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=402ad3f07567fed0e3a3839d184088628d78df07;p=gnulib.git Ensure Automake does not drop ~~gnulib.m4. * m4/~~gnulib.m4 (gl_ZZGNULIB): New macro. * m4/gnulib-common.m4 (gl_COMMON): Require it. --- diff --git a/ChangeLog b/ChangeLog index ac1caf6fcb..020dfb9df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-01-18 Bruno Haible + + Ensure Automake does not drop ~~gnulib.m4. + * m4/~~gnulib.m4 (gl_ZZGNULIB): New macro. + * m4/gnulib-common.m4 (gl_COMMON): Require it. + 2020-01-18 Bruno Haible Fix major regression from 2020-01-10. diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 6c4cad6cef..276ed1affa 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 46 +# gnulib-common.m4 serial 47 dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,6 +12,7 @@ AC_DEFUN([gl_COMMON], [ dnl Use AC_REQUIRE here, so that the code is expanded once only. AC_REQUIRE([gl_00GNULIB]) AC_REQUIRE([gl_COMMON_BODY]) + AC_REQUIRE([gl_ZZGNULIB]) ]) AC_DEFUN([gl_COMMON_BODY], [ AH_VERBATIM([_Noreturn], diff --git a/m4/~~gnulib.m4 b/m4/~~gnulib.m4 index bb5e910914..f47691850a 100644 --- a/m4/~~gnulib.m4 +++ b/m4/~~gnulib.m4 @@ -15,3 +15,9 @@ m4_define([AC_PROG_CC], gl_COMPILER_CLANG gl_COMPILER_PREPARE_CHECK_DECL ]) + +# gl_ZZGNULIB +# ----------- +# Witness macro that this file has been included. Needed to force +# Automake to include this file after all other gnulib .m4 files. +AC_DEFUN([gl_ZZGNULIB])