Fix data-loss with --batch.

[bpt/emacs.git] / admin / merge-gnulib

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 7f91b78..901daf4 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -26,18 +26,23 @@
 GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 
 GNULIB_MODULES='
-  alloca-opt
-  careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
-  dtoastr dup2
-  filemode getloadavg getopt-gnu ignore-value intprops largefile lstat
-  manywarnings mktime pthread_sigmask readlink
-  socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+  alloca-opt c-ctype c-strcase
+  careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
+  dtoastr dtotimespec dup2 environ execinfo
+  filemode getloadavg getopt-gnu gettime gettimeofday
+  ignore-value intprops largefile lstat
+  manywarnings mktime pselect pthread_sigmask readlink
+  socklen stat-time stdalign stdarg stdbool stdio
+  strftime strtoimax strtoumax symlink sys_stat
+  sys_time time timer-time timespec-add timespec-sub utimens
   warnings
 '
 
 GNULIB_TOOL_FLAGS='
+  --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat
   --avoid=msvc-inval --avoid=msvc-nothrow
-  --avoid=raise --avoid=threadlib
+  --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types
+  --avoid=threadlib
   --conditional-dependencies --import --no-changelog --no-vc-files
   --makefile-name=gnulib.mk
 '