[SCM] GNU Autoconf source repository branch, master, updated. v2.62-31-gc87512b

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=c87512b5ae11de7a98ccc8c3e42d5df6f5039fe0

The branch, master has been updated
       via  c87512b5ae11de7a98ccc8c3e42d5df6f5039fe0 (commit)
      from  7f53c249675131cf94d6e3947136b8f8826f799e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c87512b5ae11de7a98ccc8c3e42d5df6f5039fe0
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Jun 17 08:42:14 2008 +0200

    Fix '#undef variable /* comment */' transform in config headers.
    
    * lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS_PREPARE): For
    undefined preprocessor macros that are followed by a comment
    in the header template, do not create nested comments in the
    output.
    * tests/torture.at (@%:@define header templates): Extend test.
    * NEWS: Update.
    Report by Karsten Hopp <address@hidden>.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |   11 +++++++++++
 NEWS                   |    3 +++
 lib/autoconf/status.m4 |    4 ++--
 tests/torture.at       |    4 ++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 906ed71..a48f5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-06-17  Ralf Wildenhues  <address@hidden>
+
+       Fix '#undef variable /* comment */' transform in config headers.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS_PREPARE): For
+       undefined preprocessor macros that are followed by a comment
+       in the header template, do not create nested comments in the
+       output.
+       * tests/torture.at (@%:@define header templates): Extend test.
+       * NEWS: Update.
+       Report by Karsten Hopp <address@hidden>.
+
 2008-06-09  Eric Blake  <address@hidden>
 
        Mark AC_TYPE_SIGNAL as obsolete.
diff --git a/NEWS b/NEWS
index 945c994..06b705f 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,9 @@ GNU Autoconf NEWS - User visible changes.
    AT_KEYWORDS([m4_if([$1], [], [default])]) no longer complains about
    the possibly unexpanded m4_if [regression introduced in 2.62].
 
+** Config header templates `#undef UNDEFINED /* comment */' do not lead to
+   nested comments any more; regression introduced in 2.62.
+
 
 * Major changes in Autoconf 2.62 (2008-04-05) [stable]
   Released by Eric Blake, based on git versions 2.61a.*.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 50be77b..d5ed323 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -832,9 +832,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   }
   split(mac1, mac2, "(") #)
   macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
     # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
     print prefix "define", macro P[macro] D[macro]
     next
   } else {
@@ -842,7 +842,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     # in the case of _POSIX_SOURCE, which is predefined and required
     # on some systems where configure will not decide to define it.
     if (defundef == "undef") {
-      print "/*", line, "*/"
+      print "/*", prefix defundef, macro, "*/"
       next
     }
   }
diff --git a/tests/torture.at b/tests/torture.at
index c37daba..92f8d5b 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -497,6 +497,8 @@ AT_DATA([config.hin],
 #define str(define) \
 #define
 #define stringify(arg) str(arg)
+#undef aaa /* with comments */
+#undef not_substed /* with comments */
 ]])
 
 AT_CHECK_AUTOCONF
@@ -527,6 +529,8 @@ ARG1
 #define str(define) \
 #define
 #define stringify(arg) str(arg)
+#define aaa AAA
+/* #undef not_substed */
 ]])
 AT_CHECK([cat config.h], 0, expout)
 


hooks/post-receive
--
GNU Autoconf source repository