[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master c060396: Port recent flexmember changes to NetBSD
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master c060396: Port recent flexmember changes to NetBSD |
Date: |
Wed, 21 Sep 2016 22:18:09 +0000 (UTC) |
branch: master
commit c0603964fdaac5209c65bb4af061cbc74747fdb5
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
admin/merge-gnulib | 3 ++-
lib/gnulib.mk | 4 +---
m4/gnulib-comp.m4 | 13 +------------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index ada80b4..29e5e43 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -30,7 +30,8 @@ GNULIB_MODULES='
careadlinkat close-stream count-one-bits count-trailing-zeros
crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
dtoastr dtotimespec dup2 environ execinfo faccessat
- fcntl fcntl-h fdatasync fdopendir filemode filevercmp fstatat fsync
+ fcntl fcntl-h fdatasync fdopendir
+ filemode filevercmp flexmember fstatat fsync
getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
ignore-value intprops largefile lstat
manywarnings memrchr mkostemp mktime
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index e11e0ca..a691a0b 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux
--avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die
--avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv
--avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib
--avoid=unsetenv --makefile-name=gnulib.mk --conditional-depend [...]
+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux
--avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die
--avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv
--avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib
--avoid=unsetenv --makefile-name=gnulib.mk --conditional-depend [...]
MOSTLYCLEANFILES += core *.stackdump
@@ -451,9 +451,7 @@ EXTRA_DIST += filevercmp.h
## begin gnulib module flexmember
-if gl_GNULIB_ENABLED_flexmember
-endif
EXTRA_DIST += flexmember.h
## end gnulib module flexmember
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 5a660c5..592543b 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])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master c060396: Port recent flexmember changes to NetBSD,
Paul Eggert <=