summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-09-21 15:17:20 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-09-21 15:18:06 -0700
commitc0603964fdaac5209c65bb4af061cbc74747fdb5 (patch)
tree34135ffaed6a96406c925aa83939a5ea29fe59a5 /admin
parentc056077c29253b73442db93e744c41c7216302d1 (diff)
downloademacs-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 'admin')
-rwxr-xr-xadmin/merge-gnulib3
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index ada80b4ae86..29e5e43c9cd 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