2 files changed, 8 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0981e0eaf10..3d8b21ff144 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume C99 or later (Bug#17487).
+        * merge-gnulib (GNULIB_MODULES): Remove stdarg, stdbool.
+        (GNULIB_TOOL_FLAGS): Avoid stdarg, stdbool.
+
 2014-05-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Don't require pkg-config when building from repository.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index b93d12fbd20..5df2020f3aa 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -35,7 +35,7 @@ GNULIB_MODULES='
   intprops largefile lstat
   manywarnings memrchr mkostemp mktime
   pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
-  sig2str socklen stat-time stdalign stdarg stdbool stdio
+  sig2str socklen stat-time stdalign stdio
   strftime strtoimax strtoumax symlink sys_stat
   sys_time time timer-time timespec-add timespec-sub
   unsetenv update-copyright utimens
@@ -49,6 +49,7 @@ GNULIB_TOOL_FLAGS='
   --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
   --avoid=save-cwd --avoid=select --avoid=sigprocmask
+  --avoid=stdarg --avoid=stdbool
   --avoid=threadlib
   --conditional-dependencies --import --no-changelog --no-vc-files
   --makefile-name=gnulib.mk