diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-07-23 22:21:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-07-23 22:23:49 -0700 |
| commit | 9b971bdd340e83c71068892d41baeb243e233f71 (patch) | |
| tree | 3f7cca497a8e1cc698b39456714a30b842427356 /m4 | |
| parent | 1f450f1d3531cb53ebe50744c85c90141fce7ad0 (diff) | |
| download | emacs-9b971bdd340e83c71068892d41baeb243e233f71.tar.gz | |
Merge from gnulib
This incorporates:
2017-07-23 Rename module 'strftime' to 'nstrftime'
* admin/merge-gnulib (GNULIB_MODULES): Add nstrftime, remove strftime.
* build-aux/config.guess: Copy from gnulib.
* lib/nstrftime.c: Rename from lib/strftime.c.
* m4/nstrftime.m4: Rename from m4/strftime.m4.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 8 | ||||
| -rw-r--r-- | m4/nstrftime.m4 (renamed from m4/strftime.m4) | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 038d78aafea..2f135773930 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -113,6 +113,7 @@ AC_DEFUN([gl_EARLY], # Code from module mktime-internal: # Code from module multiarch: # Code from module nocrash: + # Code from module nstrftime: # Code from module openat-h: # Code from module pipe2: # Code from module pselect: @@ -139,7 +140,6 @@ AC_DEFUN([gl_EARLY], # Code from module stdio: # Code from module stdlib: # Code from module stpcpy: - # Code from module strftime: # Code from module string: # Code from module strtoimax: # Code from module strtoll: @@ -314,6 +314,7 @@ AC_DEFUN([gl_INIT], fi gl_TIME_MODULE_INDICATOR([mktime]) gl_MULTIARCH + gl_FUNC_GNU_STRFTIME gl_FUNC_PIPE2 gl_UNISTD_MODULE_INDICATOR([pipe2]) gl_FUNC_PSELECT @@ -365,7 +366,6 @@ AC_DEFUN([gl_INIT], gl_PREREQ_STPCPY fi gl_STRING_MODULE_INDICATOR([stpcpy]) - gl_FUNC_GNU_STRFTIME gl_HEADER_STRING_H gl_FUNC_STRTOIMAX if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then @@ -893,6 +893,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/mkostemp.c lib/mktime-internal.h lib/mktime.c + lib/nstrftime.c lib/openat-priv.h lib/openat-proc.c lib/openat.h @@ -924,7 +925,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stdio.in.h lib/stdlib.in.h lib/stpcpy.c - lib/strftime.c lib/strftime.h lib/string.in.h lib/strtoimax.c @@ -1013,6 +1013,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/mktime.m4 m4/multiarch.m4 m4/nocrash.m4 + m4/nstrftime.m4 m4/off_t.m4 m4/pipe2.m4 m4/pselect.m4 @@ -1037,7 +1038,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/stdio_h.m4 m4/stdlib_h.m4 m4/stpcpy.m4 - m4/strftime.m4 m4/string_h.m4 m4/strtoimax.m4 m4/strtoll.m4 diff --git a/m4/strftime.m4 b/m4/nstrftime.m4 index d2dac9e2328..d2dac9e2328 100644 --- a/m4/strftime.m4 +++ b/m4/nstrftime.m4 |