diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-18 20:34:55 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-18 20:55:09 -0800 |
commit | 52baaca152135e3b67edb13df392ae9047af015c (patch) | |
tree | a62b50b45ff3b2254468a596198575fd45276ad8 /m4/zzgnulib.m4 | |
parent | 0e577923956e0025ad764f5ced76d5f4e1a9e904 (diff) | |
download | emacs-52baaca152135e3b67edb13df392ae9047af015c.tar.gz emacs-52baaca152135e3b67edb13df392ae9047af015c.tar.bz2 emacs-52baaca152135e3b67edb13df392ae9047af015c.zip |
Update from Gnulib
This incorporates:
2020-01-18 Rename ~~gnulib.m4 to zzgnulib.m4
2020-01-18 Fix "m4_require: circular dependency of AC_LANG_COMPILER(C)"
2020-01-18 Ensure Automake does not drop ~~gnulib.m4
2020-01-18 Fix major regression from 2020-01-10
* m4/00gnulib.m4, m4/gnulib-common.m4: Copy from Gnulib.
* m4/gnulib-comp.m4: Regenerate.
* m4/zzgnulib.m4: New file, from Gnulib.
Diffstat (limited to 'm4/zzgnulib.m4')
-rw-r--r-- | m4/zzgnulib.m4 | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/m4/zzgnulib.m4 b/m4/zzgnulib.m4 new file mode 100644 index 00000000000..98fa68f51a6 --- /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]) |