From: Bruno Haible Date: Sat, 18 Jan 2020 22:05:36 +0000 (+0100) Subject: Rename ~~gnulib.m4 to zzgnulib.m4. X-Git-Tag: v1.0~4337 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=38b9f0600d698d2b24014f83abad97c9e76e2b87;p=gnulib.git Rename ~~gnulib.m4 to zzgnulib.m4. Suggested by Paul Eggert. * m4/zzgnulib.m4: Renamed from m4/~~gnulib.m4. * gnulib-tool (func_get_filelist): Update. * pygnulib/GLModuleSystem.py (getFiles): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 9b5af022f1..ebee6ae8a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-01-18 Bruno Haible + + Rename ~~gnulib.m4 to zzgnulib.m4. + Suggested by Paul Eggert. + * m4/zzgnulib.m4: Renamed from m4/~~gnulib.m4. + * gnulib-tool (func_get_filelist): Update. + * pygnulib/GLModuleSystem.py (getFiles): Likewise. + 2020-01-18 Bruno Haible doc: Update license notices. diff --git a/gnulib-tool b/gnulib-tool index ba51606b8e..89f6077e57 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2294,7 +2294,7 @@ func_get_filelist () fi fi echo m4/00gnulib.m4 - echo 'm4/~~gnulib.m4' + echo m4/zzgnulib.m4 echo m4/gnulib-common.m4 } diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index 90e7e04169..06eff4f386 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -101,7 +101,7 @@ dnl AC_REQUIRE([gl_COMPILER_CLANG]) ]) dnl Redefine _AC_CHECK_DECL_BODY so that it references ac_compile_for_check_decl dnl instead of ac_compile. If, for whatever reason, the override of AC_PROG_CC -dnl in ~~gnulib.m4 is inactive, use the original ac_compile. +dnl in zzgnulib.m4 is inactive, use the original ac_compile. m4_define([_AC_CHECK_DECL_BODY], [ ac_save_ac_compile="$ac_compile" if test -n "$ac_compile_for_check_decl"; then diff --git a/m4/zzgnulib.m4 b/m4/zzgnulib.m4 new file mode 100644 index 0000000000..98fa68f51a --- /dev/null +++ b/m4/zzgnulib.m4 @@ -0,0 +1,23 @@ +# zzgnulib.m4 serial 1 +dnl Copyright (C) 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, +dnl with or without modifications, as long as this notice is preserved. + +dnl This file must be named something that sorts after all other +dnl package- or gnulib-provided .m4 files - at least for those packages +dnl that redefine AC_PROG_CC. + +dnl Redefine AC_PROG_CC so that it ends with invocations of gl_COMPILER_CLANG +dnl and gl_COMPILER_PREPARE_CHECK_DECL. +m4_define([AC_PROG_CC], + m4_defn([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]) diff --git a/m4/~~gnulib.m4 b/m4/~~gnulib.m4 deleted file mode 100644 index f47691850a..0000000000 --- a/m4/~~gnulib.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# ~~gnulib.m4 serial 1 -dnl Copyright (C) 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, -dnl with or without modifications, as long as this notice is preserved. - -dnl This file must be named something that sorts after all other -dnl package- or gnulib-provided .m4 files - at least for those packages -dnl that redefine AC_PROG_CC. - -dnl Redefine AC_PROG_CC so that it ends with invocations of gl_COMPILER_CLANG -dnl and gl_COMPILER_PREPARE_CHECK_DECL. -m4_define([AC_PROG_CC], - m4_defn([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]) diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index 72a6c9f964..73c207d995 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -544,7 +544,7 @@ Include:|Link:|License:|Maintainer:)' parts += [line] result = [part.strip() for part in parts if part.strip()] result += [joinpath('m4', '00gnulib.m4')] - result += [joinpath('m4', '~~gnulib.m4')] + result += [joinpath('m4', 'zzgnulib.m4')] result += [joinpath('m4', 'gnulib-common.m4')] self.cache['files'] = list(result) return(list(self.cache['files']))