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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 7184742eb03b8d9054d22be0b27ff8c3f77290be..d5973dcea0a70d19b64a74418a55736cfca491ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <eblake@redhat.com>
 
        docs: mention bash bug with word splitting

diff --git a/THANKS b/THANKS
index a621844dcf37de4feffaf9a3b95f10e95bced5db..fc5a9b75c3d66330ab82cb95b914c3e8c7e669c4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -350,6 +350,7 @@ Sam Varshavchik             mrsam@courier-mta.com
 Sander Niemeijer            niemeijer@science-and-technology.nl
 santilín                    listas@gestiong.org
 Scott Bambrough             scottb@corelcomputer.com
+Scott McCreary              scottmc2@gmail.com
 Scott Stanton               stanton@scriptics.com
 Sebastian Freundt           hroptatyr@gna.org
 Sergey Poznyakoff           ?

diff --git a/tests/compile.at b/tests/compile.at
index 028f45634f3f68ee463fa0e780c8e7bc889b95b1..6a1092b063c35092220bf90ce15fc4253c8a48e0 100644 (file)
--- 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"