diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-21 15:17:20 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-21 15:18:06 -0700 |
| commit | c0603964fdaac5209c65bb4af061cbc74747fdb5 (patch) | |
| tree | 34135ffaed6a96406c925aa83939a5ea29fe59a5 /m4 | |
| parent | c056077c29253b73442db93e744c41c7216302d1 (diff) | |
| download | emacs-c0603964fdaac5209c65bb4af061cbc74747fdb5.tar.gz | |
Port recent flexmember changes to NetBSD
The NetBSD library supports localtime_rz directly, and without
this change 'configure' omitted the flexmember test that is marked
as conditional on localtime_rz. Emacs now needs to use
flexmember.m4 even when localtime_rz works.
Problem reported by Thomas Klausner.
* admin/merge-gnulib (GNULIB_MODULES): Add flexmember.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 5a660c53751..592543b88f5 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -234,6 +234,7 @@ AC_DEFUN([gl_INIT], gl_DIRENT_MODULE_INDICATOR([fdopendir]) gl_MODULE_INDICATOR([fdopendir]) gl_FILEMODE + AC_C_FLEXIBLE_ARRAY_MEMBER gl_FUNC_FPENDING if test $gl_cv_func___fpending = no; then AC_LIBOBJ([fpending]) @@ -416,7 +417,6 @@ AC_DEFUN([gl_INIT], gl_gnulib_enabled_dirfd=false gl_gnulib_enabled_dosname=false gl_gnulib_enabled_euidaccess=false - gl_gnulib_enabled_flexmember=false gl_gnulib_enabled_getdtablesize=false gl_gnulib_enabled_getgroups=false gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false @@ -476,13 +476,6 @@ AC_DEFUN([gl_INIT], fi fi } - func_gl_gnulib_m4code_flexmember () - { - if ! $gl_gnulib_enabled_flexmember; then - AC_C_FLEXIBLE_ARRAY_MEMBER - gl_gnulib_enabled_flexmember=true - fi - } func_gl_gnulib_m4code_getdtablesize () { if ! $gl_gnulib_enabled_getdtablesize; then @@ -690,9 +683,6 @@ AC_DEFUN([gl_INIT], if { test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes; then func_gl_gnulib_m4code_strtoull fi - if test "$HAVE_TIMEZONE_T" = 0; then - func_gl_gnulib_m4code_flexmember - fi if test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1; then func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31 fi @@ -701,7 +691,6 @@ AC_DEFUN([gl_INIT], AM_CONDITIONAL([gl_GNULIB_ENABLED_dirfd], [$gl_gnulib_enabled_dirfd]) AM_CONDITIONAL([gl_GNULIB_ENABLED_dosname], [$gl_gnulib_enabled_dosname]) AM_CONDITIONAL([gl_GNULIB_ENABLED_euidaccess], [$gl_gnulib_enabled_euidaccess]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_flexmember], [$gl_gnulib_enabled_flexmember]) AM_CONDITIONAL([gl_GNULIB_ENABLED_getdtablesize], [$gl_gnulib_enabled_getdtablesize]) AM_CONDITIONAL([gl_GNULIB_ENABLED_getgroups], [$gl_gnulib_enabled_getgroups]) AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) |