1 commit a11cc13e77e96cf40b6060dd8384a00ff110b846
2 Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
3 Date: Wed Aug 4 20:31:06 2010 +0200
5 Fix AC_LANG_SOURCE and AC_LANG_PROGRAM tests.
7 * tests/compile.at (AC_LANG_SOURCE example)
8 (AC_LANG_PROGRAM example): Fix broken sed script for
9 extracting the interesting part of the conftest.c file.
10 Fixes test failure on Haiku.
12 Report by Scott McCreary.
14 Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 diff --git a/THANKS b/THANKS
17 index a621844..fc5a9b7 100644
20 @@ -350,6 +350,7 @@ Sam Varshavchik mrsam@courier-mta.com
21 Sander Niemeijer niemeijer@science-and-technology.nl
22 santilĂn listas@gestiong.org
23 Scott Bambrough scottb@corelcomputer.com
24 +Scott McCreary scottmc2@gmail.com
25 Scott Stanton stanton@scriptics.com
26 Sebastian Freundt hroptatyr@gna.org
28 diff --git a/tests/compile.at b/tests/compile.at
29 index 028f456..6a1092b 100644
30 --- a/tests/compile.at
31 +++ b/tests/compile.at
32 @@ -190,12 +190,11 @@ gcc -E -dD conftest.c || AS_EXIT([77])
34 AT_CHECK_CONFIGURE([], [], [stdout])
35 # Taken from autoconf.texi:Generating Sources.
36 -# Note that the output may contain more than one line matching
37 +# Note that the output may contain more defines and lines matching
39 -# so delete everything until the last one.
40 -AT_CHECK([sed '1,/# 1 "conftest\.c"/d' stdout], [],
42 -#define PACKAGE_NAME "Hello"
43 +# so delete everything before the interesting output.
44 +AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
45 +[[#define PACKAGE_NAME "Hello"
46 #define PACKAGE_TARNAME "hello"
47 #define PACKAGE_VERSION "1.0"
48 #define PACKAGE_STRING "Hello 1.0"
49 @@ -236,12 +235,11 @@ gcc -E -dD conftest.c || AS_EXIT([77])
51 AT_CHECK_CONFIGURE([], [], [stdout])
52 # Taken from autoconf.texi:Generating Sources.
53 -# Note that the output may contain more than one line matching
54 +# Note that the output may contain more defines and lines matching
56 -# so delete everything until the last one.
57 -AT_CHECK([sed '1,/# 1 "conftest\.c"/d' stdout], [],
59 -#define PACKAGE_NAME "Hello"
60 +# so delete everything before the interesting output.
61 +AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
62 +[[#define PACKAGE_NAME "Hello"
63 #define PACKAGE_TARNAME "hello"
64 #define PACKAGE_VERSION "1.0"
65 #define PACKAGE_STRING "Hello 1.0"
66 commit 64000cf1f891b8c64b9ad12f7b0f06075ba403b7
67 Author: Eric Blake <eblake@redhat.com>
68 Date: Sat Aug 14 13:17:04 2010 -0600
70 AC_INIT: allow bugreport to contain '?'
72 * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Relax check.
73 * tests/base.at (AC_INIT with unusual version strings): Enhance
75 * doc/autoconf.texi (Initializing configure): Document this.
78 Reported by Yavor Doganov and others.
80 Signed-off-by: Eric Blake <eblake@redhat.com>
82 diff --git a/NEWS b/NEWS
83 index d7c74df..3c0aed3 100644
86 @@ -5,6 +5,9 @@ GNU Autoconf NEWS - User visible changes.
87 ** AT_BANNER() with empty argument will cause visual separation from previous
90 +** AC_INIT again allows URLs with '?' for its BUG-REPORT argument.
91 + Regression introduced in 2.66.
94 * Major changes in Autoconf 2.67 (2010-07-21) [stable]
95 Released by Eric Blake, based on git versions 2.66.*.
96 diff --git a/THANKS b/THANKS
97 index e26eb88..3b23589 100644
100 @@ -408,6 +408,7 @@ Werner Lemberg wl@gnu.org
101 Wilfredo Sanchez wsanchez@apple.com
102 William Pursell bill.pursell@gmail.com
103 Wolfgang Mueller Wolfgang.Mueller@cui.unige.ch
104 +Yavor Doganov yavor@gnu.org
105 Yury Puhalsky pooh@cryptopro.ru
106 Zack Weinberg zack@codesourcery.com
107 ? Seanster@Seanster.com
108 diff --git a/doc/autoconf.texi b/doc/autoconf.texi
109 index 0f04b10..05705f2 100644
110 --- a/doc/autoconf.texi
111 +++ b/doc/autoconf.texi
112 @@ -1888,7 +1888,8 @@ Exactly @samp{@var{package} @var{version}}.
113 @acindex{PACKAGE_BUGREPORT}
114 @ovindex PACKAGE_BUGREPORT
115 @cvindex PACKAGE_BUGREPORT
116 -Exactly @var{bug-report}, if one was provided.
117 +Exactly @var{bug-report}, if one was provided. Typically an email
118 +address, or URL to a bug management web page.
120 @item @code{AC_PACKAGE_URL}, @code{PACKAGE_URL}
121 @acindex{PACKAGE_URL}
122 diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
123 index 8e9c8cf..99cc326 100644
124 --- a/lib/autoconf/general.m4
125 +++ b/lib/autoconf/general.m4
126 @@ -239,7 +239,7 @@ m4_define([_AC_INIT_LITERAL],
127 m4_define([_AC_INIT_PACKAGE],
128 [_AC_INIT_LITERAL([$1])
129 _AC_INIT_LITERAL([$2])
130 -AS_LITERAL_IF([$3], [], [m4_warn([syntax], [AC_INIT: not a literal: $3])])
131 +_AC_INIT_LITERAL([$3])
132 m4_ifndef([AC_PACKAGE_NAME],
133 [m4_define([AC_PACKAGE_NAME], [$1])])
134 m4_ifndef([AC_PACKAGE_TARNAME],
135 diff --git a/tests/base.at b/tests/base.at
136 index 3fcc096..4ba0140 100644
139 @@ -227,7 +227,7 @@ AT_SETUP([AC_INIT with unusual version strings])
141 AT_DATA([configure.ac],
142 [[AC_INIT([GNU String++ with spaces (foo)],
143 - [2.48++ (2010-07-03)], [http://clisp.cons.org/], [clisp])
144 + [2.48++ (2010-07-03)], [[http://example.com/?a=b&c=d#e]], [clisp])
148 @@ -239,18 +239,21 @@ fi
150 AT_CHECK_AUTOCONF([-Werror])
151 AT_CHECK_CONFIGURE([-q])
152 -AT_CHECK_CONFIGURE([--help])
153 +AT_CHECK_CONFIGURE([--help], [], [stdout])
154 +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore])
155 AT_CHECK_CONFIGURE([--version], [], [stdout])
156 AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore])
157 AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore])
159 +AT_CHECK([./config.status --help], [], [stdout])
160 +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore])
161 AT_CHECK([./config.status --version], [], [stdout])
162 AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore])
163 AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore])
165 AT_DATA([configure.ac],
166 [[AC_INIT([GNU "String++"],
167 - [2.48], [http://clisp.cons.org/], [clisp])
168 + [2.48], [http://example.com/], [clisp])
172 @@ -259,7 +262,7 @@ AT_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore])
174 AT_DATA([configure.ac],
175 [[AC_INIT([GNU String++],
176 - ['codename' 2.48], [http://clisp.cons.org/], [clisp])
177 + ['codename' 2.48], [http://example.com/], [clisp])
181 @@ -268,7 +271,7 @@ AT_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore])
183 AT_DATA([configure.ac],
185 -String++], [2.48], [http://clisp.cons.org/], [clisp])
186 +String++], [2.48], [http://example.com/], [clisp])
190 commit e0ac12089ea4c934029baf77741e659f0bebd653
191 Author: Eric Blake <eblake@redhat.com>
192 Date: Wed Aug 25 16:21:39 2010 -0600
194 m4sh: fix some namespace safety issues
196 * lib/m4sugar/m4sh.m4 (_AS_SHELL_SANITIZE): Avoid problems if
197 as_myself is inherited from environment.
198 (AS_TMPDIR): Be namespace clean.
200 Signed-off-by: Eric Blake <eblake@redhat.com>
202 diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
203 index 3cc868c..15dd80d 100644
204 --- a/lib/m4sugar/m4sh.m4
205 +++ b/lib/m4sugar/m4sh.m4
206 @@ -425,6 +425,7 @@ _AS_PATH_SEPARATOR_PREPARE
209 # Find who we are. Look in the path if we contain no directory separator.
212 *[[\\/]]* ) as_myself=$[0] ;;
214 @@ -1618,12 +1619,13 @@ m4_define([AS_TMPDIR],
215 [# Create a (secure) tmp directory for tmp files.
216 m4_if([$2], [], [: ${TMPDIR=/tmp}])
218 - tmp=`(umask 077 && mktemp -d "m4_default([$2], [$TMPDIR])/$1XXXXXX") 2>/dev/null` &&
219 - test -n "$tmp" && test -d "$tmp"
220 + as_tmp=`(umask 077 && mktemp -d "m4_default([$2],
221 + [$TMPDIR])/$1XXXXXX") 2>/dev/null` &&
225 - tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM
226 - (umask 077 && mkdir "$tmp")
227 + as_tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM
228 + (umask 077 && mkdir "$as_tmp")
229 } || AS_ERROR([cannot create a temporary directory in m4_default([$2],
230 [$TMPDIR])])])# AS_TMPDIR