upstream

3 files changed, 6 insertions, 4 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 71ba4bf8ece..d736f2354f7 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -201,7 +201,6 @@ NO_MATHERR
 NO_TERMIO
 NSIG
 NSIG_MINIMUM
-NULL
 NULL_DEVICE
 ORDINARY_LINK
 O_APPEND
@@ -272,7 +271,6 @@ chdir
 chmod
 chown
 close
-const
 creat
 ctime
 dup
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 86069da7f0b..5ee31127006 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,11 @@
 2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Use full name for m4/gnulib-comp.m4.  (Bug#11529)
+        * merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
+
+        Assume C89 or later.
+        * CPP-DEFINES: Remove NULL, const.
+
         Make merging from gnulib a script, not a makefile action.
         * merge-gnulib: New script, with actions moved here from
         ../Makefile.in.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 57b71ee4a74..fa082d94664 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -79,10 +79,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
   exit 1
 }
 
-cp -- "$src"m4/gl-comp.m4 "$src"m4/gnulib-comp.m4 &&
 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
 rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
-mv -- "$src"m4/gnulib-comp.m4 "$src"m4/gl-comp.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
 autoreconf -i -I m4 -- ${src:+"$src"}