[SCM] GNU Autoconf source repository branch, master, updated. v2.67-12-ga11cc13

[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=a11cc13e77e96cf40b6060dd8384a00ff110b846

The branch, master has been updated
       via  a11cc13e77e96cf40b6060dd8384a00ff110b846 (commit)
      from  5adc15b7b64622cf6f7f76e8b6f5cbde4be82851 (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 a11cc13e77e96cf40b6060dd8384a00ff110b846
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Aug 4 20:31:06 2010 +0200

    Fix AC_LANG_SOURCE and AC_LANG_PROGRAM tests.
    
    * tests/compile.at (AC_LANG_SOURCE example)
    (AC_LANG_PROGRAM example): Fix broken sed script for
    extracting the interesting part of the conftest.c file.
    Fixes test failure on Haiku.
    * THANKS: Update.
    Report by Scott McCreary.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog        |   10 ++++++++++
 THANKS           |    1 +
 tests/compile.at |   18 ++++++++----------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7184742..d5973dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-04  Ralf Wildenhues  <address@hidden>
+
+       Fix AC_LANG_SOURCE and AC_LANG_PROGRAM tests.
+       * tests/compile.at (AC_LANG_SOURCE example)
+       (AC_LANG_PROGRAM example): Fix broken sed script for
+       extracting the interesting part of the conftest.c file.
+       Fixes test failure on Haiku.
+       * THANKS: Update.
+       Report by Scott McCreary.
+
 2010-08-03  Eric Blake  <address@hidden>
 
        docs: mention bash bug with word splitting
diff --git a/THANKS b/THANKS
index a621844..fc5a9b7 100644
--- a/THANKS
+++ b/THANKS
@@ -350,6 +350,7 @@ Sam Varshavchik             address@hidden
 Sander Niemeijer            address@hidden
 santilín                    address@hidden
 Scott Bambrough             address@hidden
+Scott McCreary              address@hidden
 Scott Stanton               address@hidden
 Sebastian Freundt           address@hidden
 Sergey Poznyakoff           ?
diff --git a/tests/compile.at b/tests/compile.at
index 028f456..6a1092b 100644
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -190,12 +190,11 @@ gcc -E -dD conftest.c || AS_EXIT([77])
 AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE([], [], [stdout])
 # Taken from autoconf.texi:Generating Sources.
-# Note that the output may contain more than one line matching
+# Note that the output may contain more defines and lines matching
 #   # 1 "conftest.c"
-# so delete everything until the last one.
-AT_CHECK([sed  '1,/# 1 "conftest\.c"/d' stdout], [],
-[[
-#define PACKAGE_NAME "Hello"
+# so delete everything before the interesting output.
+AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
+[[#define PACKAGE_NAME "Hello"
 #define PACKAGE_TARNAME "hello"
 #define PACKAGE_VERSION "1.0"
 #define PACKAGE_STRING "Hello 1.0"
@@ -236,12 +235,11 @@ gcc -E -dD conftest.c || AS_EXIT([77])
 AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE([], [], [stdout])
 # Taken from autoconf.texi:Generating Sources.
-# Note that the output may contain more than one line matching
+# Note that the output may contain more defines and lines matching
 #   # 1 "conftest.c"
-# so delete everything until the last one.
-AT_CHECK([sed  '1,/# 1 "conftest\.c"/d' stdout], [],
-[[
-#define PACKAGE_NAME "Hello"
+# so delete everything before the interesting output.
+AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
+[[#define PACKAGE_NAME "Hello"
 #define PACKAGE_TARNAME "hello"
 #define PACKAGE_VERSION "1.0"
 #define PACKAGE_STRING "Hello 1.0"


hooks/post-receive
-- 
GNU Autoconf source repository