]> git.pld-linux.org Git - packages/autoconf.git/blame - autoconf-git.patch
projects / packages / autoconf.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 6; one git patch too much (that uses new as_tmp instead of tmp)
[packages/autoconf.git] / autoconf-git.patch
CommitLineData
1bf97682
AM		 1commit a11cc13e77e96cf40b6060dd8384a00ff110b846
2Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
3Date: Wed Aug 4 20:31:06 2010 +0200
4
5 Fix AC_LANG_SOURCE and AC_LANG_PROGRAM tests.
6
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.
11 * THANKS: Update.
12 Report by Scott McCreary.
13
14 Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15
16diff --git a/THANKS b/THANKS
17index a621844..fc5a9b7 100644
18--- a/THANKS
19+++ b/THANKS
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
27 Sergey Poznyakoff ?
28diff --git a/tests/compile.at b/tests/compile.at
29index 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])
33 AT_CHECK_AUTOCONF
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
38 # # 1 "conftest.c"
39-# so delete everything until the last one.
40-AT_CHECK([sed '1,/# 1 "conftest\.c"/d' stdout], [],
41-[[
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])
50 AT_CHECK_AUTOCONF
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
55 # # 1 "conftest.c"
56-# so delete everything until the last one.
57-AT_CHECK([sed '1,/# 1 "conftest\.c"/d' stdout], [],
58-[[
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"
66commit 64000cf1f891b8c64b9ad12f7b0f06075ba403b7
67Author: Eric Blake <eblake@redhat.com>
68Date: Sat Aug 14 13:17:04 2010 -0600
69
70 AC_INIT: allow bugreport to contain '?'
71
72 * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Relax check.
73 * tests/base.at (AC_INIT with unusual version strings): Enhance
74 test.
75 * doc/autoconf.texi (Initializing configure): Document this.
76 * NEWS: Likewise.
77 * THANKS: Update.
78 Reported by Yavor Doganov and others.
79
80 Signed-off-by: Eric Blake <eblake@redhat.com>
81
82diff --git a/NEWS b/NEWS
83index d7c74df..3c0aed3 100644
84--- a/NEWS
85+++ b/NEWS
86@@ -5,6 +5,9 @@ GNU Autoconf NEWS - User visible changes.
87 ** AT_BANNER() with empty argument will cause visual separation from previous
88 test category.
89
90+** AC_INIT again allows URLs with '?' for its BUG-REPORT argument.
91+ Regression introduced in 2.66.
92+
93
94 * Major changes in Autoconf 2.67 (2010-07-21) [stable]
95 Released by Eric Blake, based on git versions 2.66.*.
96diff --git a/THANKS b/THANKS
97index e26eb88..3b23589 100644
98--- a/THANKS
99+++ b/THANKS
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
108diff --git a/doc/autoconf.texi b/doc/autoconf.texi
109index 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.
119
120 @item @code{AC_PACKAGE_URL}, @code{PACKAGE_URL}
121 @acindex{PACKAGE_URL}
122diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
123index 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],
135diff --git a/tests/base.at b/tests/base.at
136index 3fcc096..4ba0140 100644
137--- a/tests/base.at
138+++ b/tests/base.at
139@@ -227,7 +227,7 @@ AT_SETUP([AC_INIT with unusual version strings])
140
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])
145 AC_OUTPUT
146 ]])
147
148@@ -239,18 +239,21 @@ fi
149
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])
158
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])
164
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])
169 AC_OUTPUT
170 ]])
171
172@@ -259,7 +262,7 @@ AT_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore])
173
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])
178 AC_OUTPUT
179 ]])
180
181@@ -268,7 +271,7 @@ AT_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore])
182
183 AT_DATA([configure.ac],
184 [[AC_INIT([GNU
185-String++], [2.48], [http://clisp.cons.org/], [clisp])
186+String++], [2.48], [http://example.com/], [clisp])
187 AC_OUTPUT
188 ]])
189
1bf97682 190
GNU autoconf - source configuration tools
This page took 0.058262 seconds and 4 git commands to generate.