Contents of /trunk/autoconf/patches/autoconf-2.67-acinit-literal-2.patch
Parent Directory | Revision Log
Revision 1101 -
(show annotations)
(download)
Thu Aug 19 19:45:11 2010 UTC (14 years, 1 month ago) by niro
File size: 4573 byte(s)
Thu Aug 19 19:45:11 2010 UTC (14 years, 1 month ago) by niro
File size: 4573 byte(s)
fixed patch
1 | diff -Naur autoconf-2.67/ChangeLog autoconf-2.67-magellan/ChangeLog |
2 | --- autoconf-2.67/ChangeLog 2010-07-22 00:16:44.000000000 +0200 |
3 | +++ autoconf-2.67-magellan/ChangeLog 2010-08-19 21:50:24.000000000 +0200 |
4 | @@ -1,3 +1,14 @@ |
5 | +2010-08-14 Eric Blake <eblake@redhat.com> |
6 | + |
7 | + AC_INIT: allow bugreport to contain '?' |
8 | + * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Relax check. |
9 | + * tests/base.at (AC_INIT with unusual version strings): Enhance |
10 | + test. |
11 | + * doc/autoconf.texi (Initializing configure): Document this. |
12 | + * NEWS: Likewise. |
13 | + * THANKS: Update. |
14 | + Reported by Yavor Doganov and others. |
15 | + |
16 | 2010-07-21 Eric Blake <eblake@redhat.com> |
17 | |
18 | Release Version 2.67. |
19 | diff -Naur autoconf-2.67/doc/autoconf.texi autoconf-2.67-magellan/doc/autoconf.texi |
20 | --- autoconf-2.67/doc/autoconf.texi 2010-07-21 23:58:24.000000000 +0200 |
21 | +++ autoconf-2.67-magellan/doc/autoconf.texi 2010-08-19 21:52:00.000000000 +0200 |
22 | @@ -1888,7 +1888,8 @@ |
23 | @acindex{PACKAGE_BUGREPORT} |
24 | @ovindex PACKAGE_BUGREPORT |
25 | @cvindex PACKAGE_BUGREPORT |
26 | -Exactly @var{bug-report}, if one was provided. |
27 | +Exactly @var{bug-report}, if one was provided. Typically an email |
28 | +address, or URL to a bug management web page. |
29 | |
30 | @item @code{AC_PACKAGE_URL}, @code{PACKAGE_URL} |
31 | @acindex{PACKAGE_URL} |
32 | diff -Naur autoconf-2.67/lib/autoconf/general.m4 autoconf-2.67-magellan/lib/autoconf/general.m4 |
33 | --- autoconf-2.67/lib/autoconf/general.m4 2010-07-20 15:56:53.000000000 +0200 |
34 | +++ autoconf-2.67-magellan/lib/autoconf/general.m4 2010-08-19 21:52:34.000000000 +0200 |
35 | @@ -239,7 +239,7 @@ |
36 | m4_define([_AC_INIT_PACKAGE], |
37 | [_AC_INIT_LITERAL([$1]) |
38 | _AC_INIT_LITERAL([$2]) |
39 | -AS_LITERAL_IF([$3], [], [m4_warn([syntax], [AC_INIT: not a literal: $3])]) |
40 | +_AC_INIT_LITERAL([$3]) |
41 | m4_ifndef([AC_PACKAGE_NAME], |
42 | [m4_define([AC_PACKAGE_NAME], [$1])]) |
43 | m4_ifndef([AC_PACKAGE_TARNAME], |
44 | diff -Naur autoconf-2.67/NEWS autoconf-2.67-magellan/NEWS |
45 | --- autoconf-2.67/NEWS 2010-07-22 00:16:40.000000000 +0200 |
46 | +++ autoconf-2.67-magellan/NEWS 2010-08-19 21:50:52.000000000 +0200 |
47 | @@ -1,5 +1,8 @@ |
48 | GNU Autoconf NEWS - User visible changes. |
49 | |
50 | +** AC_INIT again allows URLs with '?' for its BUG-REPORT argument. |
51 | + Regression introduced in 2.66. |
52 | + |
53 | * Major changes in Autoconf 2.67 (2010-07-21) [stable] |
54 | Released by Eric Blake, based on git versions 2.66.*. |
55 | |
56 | diff -Naur autoconf-2.67/tests/base.at autoconf-2.67-magellan/tests/base.at |
57 | --- autoconf-2.67/tests/base.at 2010-07-20 15:55:23.000000000 +0200 |
58 | +++ autoconf-2.67-magellan/tests/base.at 2010-08-19 21:55:03.000000000 +0200 |
59 | @@ -227,7 +227,7 @@ |
60 | |
61 | AT_DATA([configure.ac], |
62 | [[AC_INIT([GNU String++ with spaces (foo)], |
63 | - [2.48++ (2010-07-03)], [http://clisp.cons.org/], [clisp]) |
64 | + [2.48++ (2010-07-03)], [[http://example.com/?a=b&c=d#e]], [clisp]) |
65 | AC_OUTPUT |
66 | ]]) |
67 | |
68 | @@ -239,18 +239,21 @@ |
69 | |
70 | AT_CHECK_AUTOCONF([-Werror]) |
71 | AT_CHECK_CONFIGURE([-q]) |
72 | -AT_CHECK_CONFIGURE([--help]) |
73 | +AT_CHECK_CONFIGURE([--help], [], [stdout]) |
74 | +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore]) |
75 | AT_CHECK_CONFIGURE([--version], [], [stdout]) |
76 | AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore]) |
77 | AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore]) |
78 | |
79 | +AT_CHECK([./config.status --help], [], [stdout]) |
80 | +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore]) |
81 | AT_CHECK([./config.status --version], [], [stdout]) |
82 | AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore]) |
83 | AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore]) |
84 | |
85 | AT_DATA([configure.ac], |
86 | [[AC_INIT([GNU "String++"], |
87 | - [2.48], [http://clisp.cons.org/], [clisp]) |
88 | + [2.48], [http://example.com/], [clisp]) |
89 | AC_OUTPUT |
90 | ]]) |
91 | |
92 | @@ -259,7 +262,7 @@ |
93 | |
94 | AT_DATA([configure.ac], |
95 | [[AC_INIT([GNU String++], |
96 | - ['codename' 2.48], [http://clisp.cons.org/], [clisp]) |
97 | + ['codename' 2.48], [http://example.com/], [clisp]) |
98 | AC_OUTPUT |
99 | ]]) |
100 | |
101 | @@ -268,7 +271,7 @@ |
102 | |
103 | AT_DATA([configure.ac], |
104 | [[AC_INIT([GNU |
105 | -String++], [2.48], [http://clisp.cons.org/], [clisp]) |
106 | +String++], [2.48], [http://example.com/], [clisp]) |
107 | AC_OUTPUT |
108 | ]]) |
109 | |
110 | diff -Naur autoconf-2.67/THANKS autoconf-2.67-magellan/THANKS |
111 | --- autoconf-2.67/THANKS 2010-05-12 16:34:40.000000000 +0200 |
112 | +++ autoconf-2.67-magellan/THANKS 2010-08-19 21:51:14.000000000 +0200 |
113 | @@ -406,6 +406,7 @@ |
114 | Wilfredo Sanchez wsanchez@apple.com |
115 | William Pursell bill.pursell@gmail.com |
116 | Wolfgang Mueller Wolfgang.Mueller@cui.unige.ch |
117 | +Yavor Doganov yavor@gnu.org |
118 | Yury Puhalsky pooh@cryptopro.ru |
119 | Zack Weinberg zack@codesourcery.com |
120 | ? Seanster@Seanster.com |