Contents of /trunk/autoconf/patches/autoconf-2.67-acinit-literal.patch
Parent Directory | Revision Log
Revision 1100 -
(show annotations)
(download)
Thu Aug 19 19:35:15 2010 UTC (14 years, 1 month ago) by niro
File size: 4867 byte(s)
Thu Aug 19 19:35:15 2010 UTC (14 years, 1 month ago) by niro
File size: 4867 byte(s)
upstream fix
1 | From 64000cf1f891b8c64b9ad12f7b0f06075ba403b7 Mon Sep 17 00:00:00 2001 |
2 | From: Eric Blake <eblake@redhat.com> |
3 | Date: Sat, 14 Aug 2010 19:17:04 +0000 |
4 | Subject: AC_INIT: allow bugreport to contain '?' |
5 | |
6 | * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Relax check. |
7 | * tests/base.at (AC_INIT with unusual version strings): Enhance |
8 | test. |
9 | * doc/autoconf.texi (Initializing configure): Document this. |
10 | * NEWS: Likewise. |
11 | * THANKS: Update. |
12 | Reported by Yavor Doganov and others. |
13 | |
14 | Signed-off-by: Eric Blake <eblake@redhat.com> |
15 | --- |
16 | diff --git a/ChangeLog b/ChangeLog |
17 | index cfa3c0f..356d78f 100644 |
18 | --- a/ChangeLog |
19 | +++ b/ChangeLog |
20 | @@ -1,3 +1,14 @@ |
21 | +2010-08-14 Eric Blake <eblake@redhat.com> |
22 | + |
23 | + AC_INIT: allow bugreport to contain '?' |
24 | + * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Relax check. |
25 | + * tests/base.at (AC_INIT with unusual version strings): Enhance |
26 | + test. |
27 | + * doc/autoconf.texi (Initializing configure): Document this. |
28 | + * NEWS: Likewise. |
29 | + * THANKS: Update. |
30 | + Reported by Yavor Doganov and others. |
31 | + |
32 | 2010-08-10 Peter Rosin <peda@lysator.liu.se> |
33 | |
34 | Keep testsuite files on unexpected pass. |
35 | diff --git a/NEWS b/NEWS |
36 | index d7c74df..3c0aed3 100644 |
37 | --- a/NEWS |
38 | +++ b/NEWS |
39 | @@ -5,6 +5,9 @@ GNU Autoconf NEWS - User visible changes. |
40 | ** AT_BANNER() with empty argument will cause visual separation from previous |
41 | test category. |
42 | |
43 | +** AC_INIT again allows URLs with '?' for its BUG-REPORT argument. |
44 | + Regression introduced in 2.66. |
45 | + |
46 | |
47 | * Major changes in Autoconf 2.67 (2010-07-21) [stable] |
48 | Released by Eric Blake, based on git versions 2.66.*. |
49 | diff --git a/THANKS b/THANKS |
50 | index e26eb88..3b23589 100644 |
51 | --- a/THANKS |
52 | +++ b/THANKS |
53 | @@ -408,6 +408,7 @@ Werner Lemberg wl@gnu.org |
54 | Wilfredo Sanchez wsanchez@apple.com |
55 | William Pursell bill.pursell@gmail.com |
56 | Wolfgang Mueller Wolfgang.Mueller@cui.unige.ch |
57 | +Yavor Doganov yavor@gnu.org |
58 | Yury Puhalsky pooh@cryptopro.ru |
59 | Zack Weinberg zack@codesourcery.com |
60 | ? Seanster@Seanster.com |
61 | diff --git a/doc/autoconf.texi b/doc/autoconf.texi |
62 | index 0f04b10..05705f2 100644 |
63 | --- a/doc/autoconf.texi |
64 | +++ b/doc/autoconf.texi |
65 | @@ -1888,7 +1888,8 @@ Exactly @samp{@var{package} @var{version}}. |
66 | @acindex{PACKAGE_BUGREPORT} |
67 | @ovindex PACKAGE_BUGREPORT |
68 | @cvindex PACKAGE_BUGREPORT |
69 | -Exactly @var{bug-report}, if one was provided. |
70 | +Exactly @var{bug-report}, if one was provided. Typically an email |
71 | +address, or URL to a bug management web page. |
72 | |
73 | @item @code{AC_PACKAGE_URL}, @code{PACKAGE_URL} |
74 | @acindex{PACKAGE_URL} |
75 | diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 |
76 | index 8e9c8cf..99cc326 100644 |
77 | --- a/lib/autoconf/general.m4 |
78 | +++ b/lib/autoconf/general.m4 |
79 | @@ -239,7 +239,7 @@ m4_define([_AC_INIT_LITERAL], |
80 | m4_define([_AC_INIT_PACKAGE], |
81 | [_AC_INIT_LITERAL([$1]) |
82 | _AC_INIT_LITERAL([$2]) |
83 | -AS_LITERAL_IF([$3], [], [m4_warn([syntax], [AC_INIT: not a literal: $3])]) |
84 | +_AC_INIT_LITERAL([$3]) |
85 | m4_ifndef([AC_PACKAGE_NAME], |
86 | [m4_define([AC_PACKAGE_NAME], [$1])]) |
87 | m4_ifndef([AC_PACKAGE_TARNAME], |
88 | diff --git a/tests/base.at b/tests/base.at |
89 | index 3fcc096..4ba0140 100644 |
90 | --- a/tests/base.at |
91 | +++ b/tests/base.at |
92 | @@ -227,7 +227,7 @@ AT_SETUP([AC_INIT with unusual version strings]) |
93 | |
94 | AT_DATA([configure.ac], |
95 | [[AC_INIT([GNU String++ with spaces (foo)], |
96 | - [2.48++ (2010-07-03)], [http://clisp.cons.org/], [clisp]) |
97 | + [2.48++ (2010-07-03)], [[http://example.com/?a=b&c=d#e]], [clisp]) |
98 | AC_OUTPUT |
99 | ]]) |
100 | |
101 | @@ -239,18 +239,21 @@ fi |
102 | |
103 | AT_CHECK_AUTOCONF([-Werror]) |
104 | AT_CHECK_CONFIGURE([-q]) |
105 | -AT_CHECK_CONFIGURE([--help]) |
106 | +AT_CHECK_CONFIGURE([--help], [], [stdout]) |
107 | +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore]) |
108 | AT_CHECK_CONFIGURE([--version], [], [stdout]) |
109 | AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore]) |
110 | AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore]) |
111 | |
112 | +AT_CHECK([./config.status --help], [], [stdout]) |
113 | +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore]) |
114 | AT_CHECK([./config.status --version], [], [stdout]) |
115 | AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore]) |
116 | AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore]) |
117 | |
118 | AT_DATA([configure.ac], |
119 | [[AC_INIT([GNU "String++"], |
120 | - [2.48], [http://clisp.cons.org/], [clisp]) |
121 | + [2.48], [http://example.com/], [clisp]) |
122 | AC_OUTPUT |
123 | ]]) |
124 | |
125 | @@ -259,7 +262,7 @@ AT_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore]) |
126 | |
127 | AT_DATA([configure.ac], |
128 | [[AC_INIT([GNU String++], |
129 | - ['codename' 2.48], [http://clisp.cons.org/], [clisp]) |
130 | + ['codename' 2.48], [http://example.com/], [clisp]) |
131 | AC_OUTPUT |
132 | ]]) |
133 | |
134 | @@ -268,7 +271,7 @@ AT_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore]) |
135 | |
136 | AT_DATA([configure.ac], |
137 | [[AC_INIT([GNU |
138 | -String++], [2.48], [http://clisp.cons.org/], [clisp]) |
139 | +String++], [2.48], [http://example.com/], [clisp]) |
140 | AC_OUTPUT |
141 | ]]) |
142 | |
143 | -- |
144 | cgit v0.8.3.2 |