diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-30 00:38:28 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-30 00:40:33 -0700 |
commit | 7e4dae99d619315179a90461b42ae8d734c5bb45 (patch) | |
tree | 98a34f046bd50c1a38bf19cb96e5e0fb77ecf441 /m4/gnulib-comp.m4 | |
parent | a3f3fea14abbc59a2b47cae5bec6252ec3a1f8cf (diff) | |
download | emacs-7e4dae99d619315179a90461b42ae8d734c5bb45.tar.gz |
Merge from gnulib
This avoids incorporating the following, which I suspect are
more trouble for Emacs than they’re worth:
2017-04-29 stat, fstat: fix time_t etc. on native Windows platforms
* admin/merge-gnulib (AVOIDED_MODULES): Avoid stat, too.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/pathmax.h, lib/stat.c, m4/pathmax.m4, m4/stat.m4: Remove.
Diffstat (limited to 'm4/gnulib-comp.m4')
-rw-r--r-- | m4/gnulib-comp.m4 | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 030304d6777..7dbfb9ae70d 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -110,7 +110,6 @@ AC_DEFUN([gl_EARLY], # Code from module multiarch: # Code from module nocrash: # Code from module openat-h: - # Code from module pathmax: # Code from module pipe2: # Code from module pselect: # Code from module pthread_sigmask: @@ -128,7 +127,6 @@ AC_DEFUN([gl_EARLY], # Code from module snippet/warn-on-use: # Code from module socklen: # Code from module ssize_t: - # Code from module stat: # Code from module stat-time: # Code from module std-gnu11: # Code from module stdalign: @@ -417,10 +415,8 @@ AC_DEFUN([gl_INIT], gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1=false gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31=false gl_gnulib_enabled_03e0aaad4cb89ca757653bd367a6ccb7=false - gl_gnulib_enabled_pathmax=false gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=false gl_gnulib_enabled_secure_getenv=false - gl_gnulib_enabled_stat=false gl_gnulib_enabled_strtoll=false gl_gnulib_enabled_strtoull=false gl_gnulib_enabled_tempname=false @@ -465,9 +461,6 @@ AC_DEFUN([gl_INIT], func_gl_gnulib_m4code_a9786850e999ae65a836a6041e8e5ed1 fi func_gl_gnulib_m4code_6099e9737f757db36c47fa9d9f02e88c - if test $HAVE_EUIDACCESS = 0; then - func_gl_gnulib_m4code_stat - fi fi } func_gl_gnulib_m4code_getdtablesize () @@ -536,13 +529,6 @@ AC_DEFUN([gl_INIT], gl_gnulib_enabled_03e0aaad4cb89ca757653bd367a6ccb7=true fi } - func_gl_gnulib_m4code_pathmax () - { - if ! $gl_gnulib_enabled_pathmax; then - gl_PATHMAX - gl_gnulib_enabled_pathmax=true - fi - } func_gl_gnulib_m4code_6099e9737f757db36c47fa9d9f02e88c () { if ! $gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c; then @@ -561,24 +547,6 @@ AC_DEFUN([gl_INIT], gl_gnulib_enabled_secure_getenv=true fi } - func_gl_gnulib_m4code_stat () - { - if ! $gl_gnulib_enabled_stat; then - gl_FUNC_STAT - if test $REPLACE_STAT = 1; then - AC_LIBOBJ([stat]) - gl_PREREQ_STAT - fi - gl_SYS_STAT_MODULE_INDICATOR([stat]) - gl_gnulib_enabled_stat=true - if test $REPLACE_STAT = 1; then - func_gl_gnulib_m4code_dosname - fi - if test $REPLACE_STAT = 1; then - func_gl_gnulib_m4code_pathmax - fi - fi - } func_gl_gnulib_m4code_strtoll () { if ! $gl_gnulib_enabled_strtoll; then @@ -653,15 +621,9 @@ AC_DEFUN([gl_INIT], if test $REPLACE_LSTAT = 1; then func_gl_gnulib_m4code_dosname fi - if test $REPLACE_LSTAT = 1; then - func_gl_gnulib_m4code_stat - fi if test $HAVE_MKOSTEMP = 0; then func_gl_gnulib_m4code_tempname fi - if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then - func_gl_gnulib_m4code_stat - fi if test $HAVE_READLINKAT = 0; then func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b fi @@ -691,10 +653,8 @@ AC_DEFUN([gl_INIT], AM_CONDITIONAL([gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1], [$gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1]) AM_CONDITIONAL([gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31], [$gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31]) AM_CONDITIONAL([gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7], [$gl_gnulib_enabled_03e0aaad4cb89ca757653bd367a6ccb7]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_pathmax], [$gl_gnulib_enabled_pathmax]) AM_CONDITIONAL([gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c], [$gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c]) AM_CONDITIONAL([gl_GNULIB_ENABLED_secure_getenv], [$gl_gnulib_enabled_secure_getenv]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_stat], [$gl_gnulib_enabled_stat]) AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoll], [$gl_gnulib_enabled_strtoll]) AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoull], [$gl_gnulib_enabled_strtoull]) AM_CONDITIONAL([gl_GNULIB_ENABLED_tempname], [$gl_gnulib_enabled_tempname]) @@ -930,7 +890,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/openat-priv.h lib/openat-proc.c lib/openat.h - lib/pathmax.h lib/pipe2.c lib/pselect.c lib/pthread_sigmask.c @@ -952,7 +911,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/signal.in.h lib/stat-time.c lib/stat-time.h - lib/stat.c lib/stdalign.in.h lib/stddef.in.h lib/stdint.in.h @@ -1049,7 +1007,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/multiarch.m4 m4/nocrash.m4 m4/off_t.m4 - m4/pathmax.m4 m4/pipe2.m4 m4/pselect.m4 m4/pthread_sigmask.m4 @@ -1066,7 +1023,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/ssize_t.m4 m4/st_dm_mode.m4 m4/stat-time.m4 - m4/stat.m4 m4/std-gnu11.m4 m4/stdalign.m4 m4/stddef_h.m4 |