diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-03-17 01:12:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-17 17:40:55 +0000 |
commit | 3072c245da1a36205cd5e258515eff16f6f7f55e (patch) | |
tree | 10633949a1f179d782cb5d6e4ff6934caa5c9d05 /meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch | |
parent | 490bbfbe4b4c7ec9c0942b5fadae1ad12af31c20 (diff) | |
download | poky-3072c245da1a36205cd5e258515eff16f6f7f55e.tar.gz |
gettext: Upgrade GPLv2 version to 0.16.1
This adds a couple of new patches for handling various autoconf
and autolocal issues. It also hardcodes a GETTEXT_MACRO_VERSION
to 0.17 to match the native gettext.
(From OE-Core rev: e897103a58ad672cc87d2bab3ec45501ef09f8f1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch | 345 |
1 files changed, 345 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch new file mode 100644 index 0000000000..8b42f1b37d --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch | |||
@@ -0,0 +1,345 @@ | |||
1 | This patch removes the circular dependency on AC_GNU_SOURCE in | ||
2 | AC_USE_SYSTEM_EXTENSIONS. | ||
3 | |||
4 | Thanks to Mark Hatle for the timely pointers and fixes. | ||
5 | |||
6 | Signed-off-by Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 | ||
9 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 2006-11-27 09:14:38.000000000 -0800 | ||
10 | +++ gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 2011-03-16 23:54:01.711923448 -0700 | ||
11 | @@ -16,43 +16,47 @@ | ||
12 | # ------------------------ | ||
13 | # Enable extensions on systems that normally disable them, | ||
14 | # typically due to standards-conformance issues. | ||
15 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
16 | -[ | ||
17 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
18 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
19 | - | ||
20 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
21 | - AC_REQUIRE([AC_AIX]) | ||
22 | - AC_REQUIRE([AC_MINIX]) | ||
23 | - | ||
24 | - AH_VERBATIM([__EXTENSIONS__], | ||
25 | -[/* Enable extensions on Solaris. */ | ||
26 | -#ifndef __EXTENSIONS__ | ||
27 | -# undef __EXTENSIONS__ | ||
28 | -#endif | ||
29 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
30 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
31 | -#endif | ||
32 | -#ifndef _TANDEM_SOURCE | ||
33 | -# undef _TANDEM_SOURCE | ||
34 | -#endif]) | ||
35 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
36 | - [ac_cv_safe_to_define___extensions__], | ||
37 | - [AC_COMPILE_IFELSE( | ||
38 | - [AC_LANG_PROGRAM([ | ||
39 | -# define __EXTENSIONS__ 1 | ||
40 | - AC_INCLUDES_DEFAULT])], | ||
41 | - [ac_cv_safe_to_define___extensions__=yes], | ||
42 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
43 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
44 | - AC_DEFINE([__EXTENSIONS__]) | ||
45 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
46 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
47 | -]) | ||
48 | +#AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
49 | +#[ | ||
50 | +# AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
51 | +# AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
52 | +# | ||
53 | +# AC_REQUIRE([AC_GNU_SOURCE]) | ||
54 | +# AC_REQUIRE([AC_AIX]) | ||
55 | +# AC_REQUIRE([AC_MINIX]) | ||
56 | +# | ||
57 | +# AH_VERBATIM([__EXTENSIONS__], | ||
58 | +#[/* Enable extensions on Solaris. */ | ||
59 | +##ifndef __EXTENSIONS__ | ||
60 | +## undef __EXTENSIONS__ | ||
61 | +##endif | ||
62 | +##ifndef _POSIX_PTHREAD_SEMANTICS | ||
63 | +## undef _POSIX_PTHREAD_SEMANTICS | ||
64 | +##endif | ||
65 | +##ifndef _TANDEM_SOURCE | ||
66 | +## undef _TANDEM_SOURCE | ||
67 | +##endif]) | ||
68 | +# AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
69 | +# [ac_cv_safe_to_define___extensions__], | ||
70 | +# [AC_COMPILE_IFELSE( | ||
71 | +# [AC_LANG_PROGRAM([ | ||
72 | +## define __EXTENSIONS__ 1 | ||
73 | +# AC_INCLUDES_DEFAULT])], | ||
74 | +# [ac_cv_safe_to_define___extensions__=yes], | ||
75 | +# [ac_cv_safe_to_define___extensions__=no])]) | ||
76 | +# test $ac_cv_safe_to_define___extensions__ = yes && | ||
77 | +# AC_DEFINE([__EXTENSIONS__]) | ||
78 | +# AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
79 | +# AC_DEFINE([_TANDEM_SOURCE]) | ||
80 | +#]) | ||
81 | |||
82 | # gl_USE_SYSTEM_EXTENSIONS | ||
83 | # ------------------------ | ||
84 | # Enable extensions on systems that normally disable them, | ||
85 | # typically due to standards-conformance issues. | ||
86 | AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], | ||
87 | - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) | ||
88 | +[ | ||
89 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
90 | + | ||
91 | + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) | ||
92 | +]) | ||
93 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-runtime/gnulib-m4/gnulib-comp.m4 | ||
94 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:19.000000000 -0800 | ||
95 | +++ gettext.patched/gettext-runtime/gnulib-m4/gnulib-comp.m4 2011-03-16 23:50:17.471531838 -0700 | ||
96 | @@ -25,7 +25,7 @@ | ||
97 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
98 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
99 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
100 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
101 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
102 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
103 | ]) | ||
104 | |||
105 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/mbchar.m4 gettext.patched/gettext-runtime/gnulib-m4/mbchar.m4 | ||
106 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/mbchar.m4 2006-11-27 09:14:38.000000000 -0800 | ||
107 | +++ gettext.patched/gettext-runtime/gnulib-m4/mbchar.m4 2011-03-16 23:50:10.814396529 -0700 | ||
108 | @@ -9,7 +9,7 @@ | ||
109 | |||
110 | AC_DEFUN([gl_MBCHAR], | ||
111 | [ | ||
112 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
113 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
114 | dnl The following line is that so the user can test HAVE_WCHAR_H | ||
115 | dnl before #include "mbchar.h". | ||
116 | AC_CHECK_HEADERS_ONCE([wchar.h]) | ||
117 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/wcwidth.m4 gettext.patched/gettext-runtime/gnulib-m4/wcwidth.m4 | ||
118 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/wcwidth.m4 2006-11-27 09:14:38.000000000 -0800 | ||
119 | +++ gettext.patched/gettext-runtime/gnulib-m4/wcwidth.m4 2011-03-16 23:50:08.357396247 -0700 | ||
120 | @@ -7,7 +7,7 @@ | ||
121 | AC_DEFUN([gl_FUNC_WCWIDTH], | ||
122 | [ | ||
123 | dnl Persuade glibc <wchar.h> to declare wcwidth(). | ||
124 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
125 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
126 | |||
127 | AC_REQUIRE([AC_C_INLINE]) | ||
128 | AC_REQUIRE([gt_TYPE_WCHAR_T]) | ||
129 | diff -ru gettext-0.16.1/gettext-runtime/m4/lock.m4 gettext.patched/gettext-runtime/m4/lock.m4 | ||
130 | --- gettext-0.16.1/gettext-runtime/m4/lock.m4 2006-10-24 13:59:59.000000000 -0700 | ||
131 | +++ gettext.patched/gettext-runtime/m4/lock.m4 2011-03-16 23:50:04.355891676 -0700 | ||
132 | @@ -35,7 +35,7 @@ | ||
133 | AC_BEFORE([$0], [gl_ARGP])dnl | ||
134 | |||
135 | AC_REQUIRE([AC_CANONICAL_HOST]) | ||
136 | - AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems | ||
137 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems | ||
138 | dnl Check for multithreading. | ||
139 | AC_ARG_ENABLE(threads, | ||
140 | AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) | ||
141 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/extensions.m4 gettext.patched/gettext-tools/gnulib-m4/extensions.m4 | ||
142 | --- gettext-0.16.1/gettext-tools/gnulib-m4/extensions.m4 2006-11-27 09:14:54.000000000 -0800 | ||
143 | +++ gettext.patched/gettext-tools/gnulib-m4/extensions.m4 2011-03-16 23:53:28.487671266 -0700 | ||
144 | @@ -16,43 +16,47 @@ | ||
145 | # ------------------------ | ||
146 | # Enable extensions on systems that normally disable them, | ||
147 | # typically due to standards-conformance issues. | ||
148 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
149 | -[ | ||
150 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
151 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
152 | - | ||
153 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
154 | - AC_REQUIRE([AC_AIX]) | ||
155 | - AC_REQUIRE([AC_MINIX]) | ||
156 | - | ||
157 | - AH_VERBATIM([__EXTENSIONS__], | ||
158 | -[/* Enable extensions on Solaris. */ | ||
159 | -#ifndef __EXTENSIONS__ | ||
160 | -# undef __EXTENSIONS__ | ||
161 | -#endif | ||
162 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
163 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
164 | -#endif | ||
165 | -#ifndef _TANDEM_SOURCE | ||
166 | -# undef _TANDEM_SOURCE | ||
167 | -#endif]) | ||
168 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
169 | - [ac_cv_safe_to_define___extensions__], | ||
170 | - [AC_COMPILE_IFELSE( | ||
171 | - [AC_LANG_PROGRAM([ | ||
172 | -# define __EXTENSIONS__ 1 | ||
173 | - AC_INCLUDES_DEFAULT])], | ||
174 | - [ac_cv_safe_to_define___extensions__=yes], | ||
175 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
176 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
177 | - AC_DEFINE([__EXTENSIONS__]) | ||
178 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
179 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
180 | -]) | ||
181 | +#AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
182 | +#[ | ||
183 | +# AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
184 | +# AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
185 | +# | ||
186 | +# AC_REQUIRE([AC_GNU_SOURCE]) | ||
187 | +# AC_REQUIRE([AC_AIX]) | ||
188 | +# AC_REQUIRE([AC_MINIX]) | ||
189 | +# | ||
190 | +# AH_VERBATIM([__EXTENSIONS__], | ||
191 | +#[/* Enable extensions on Solaris. */ | ||
192 | +##ifndef __EXTENSIONS__ | ||
193 | +## undef __EXTENSIONS__ | ||
194 | +##endif | ||
195 | +##ifndef _POSIX_PTHREAD_SEMANTICS | ||
196 | +## undef _POSIX_PTHREAD_SEMANTICS | ||
197 | +##endif | ||
198 | +##ifndef _TANDEM_SOURCE | ||
199 | +## undef _TANDEM_SOURCE | ||
200 | +##endif]) | ||
201 | +# AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
202 | +# [ac_cv_safe_to_define___extensions__], | ||
203 | +# [AC_COMPILE_IFELSE( | ||
204 | +# [AC_LANG_PROGRAM([ | ||
205 | +## define __EXTENSIONS__ 1 | ||
206 | +# AC_INCLUDES_DEFAULT])], | ||
207 | +# [ac_cv_safe_to_define___extensions__=yes], | ||
208 | +# [ac_cv_safe_to_define___extensions__=no])]) | ||
209 | +# test $ac_cv_safe_to_define___extensions__ = yes && | ||
210 | +# AC_DEFINE([__EXTENSIONS__]) | ||
211 | +# AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
212 | +# AC_DEFINE([_TANDEM_SOURCE]) | ||
213 | +#]) | ||
214 | |||
215 | # gl_USE_SYSTEM_EXTENSIONS | ||
216 | # ------------------------ | ||
217 | # Enable extensions on systems that normally disable them, | ||
218 | # typically due to standards-conformance issues. | ||
219 | AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], | ||
220 | - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) | ||
221 | +[ | ||
222 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
223 | + | ||
224 | + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) | ||
225 | +]) | ||
226 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/fnmatch.m4 gettext.patched/gettext-tools/gnulib-m4/fnmatch.m4 | ||
227 | --- gettext-0.16.1/gettext-tools/gnulib-m4/fnmatch.m4 2006-11-27 09:14:54.000000000 -0800 | ||
228 | +++ gettext.patched/gettext-tools/gnulib-m4/fnmatch.m4 2011-03-16 23:52:06.477463671 -0700 | ||
229 | @@ -91,7 +91,7 @@ | ||
230 | AC_DEFUN([gl_FUNC_FNMATCH_GNU], | ||
231 | [ | ||
232 | dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc. | ||
233 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
234 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
235 | |||
236 | FNMATCH_H= | ||
237 | _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu], | ||
238 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/getdelim.m4 gettext.patched/gettext-tools/gnulib-m4/getdelim.m4 | ||
239 | --- gettext-0.16.1/gettext-tools/gnulib-m4/getdelim.m4 2006-11-27 09:14:54.000000000 -0800 | ||
240 | +++ gettext.patched/gettext-tools/gnulib-m4/getdelim.m4 2011-03-16 23:52:22.871674845 -0700 | ||
241 | @@ -12,7 +12,7 @@ | ||
242 | [ | ||
243 | |||
244 | dnl Persuade glibc <stdio.h> to declare getdelim(). | ||
245 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
246 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
247 | |||
248 | AC_REPLACE_FUNCS(getdelim) | ||
249 | AC_CHECK_DECLS_ONCE(getdelim) | ||
250 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/getline.m4 gettext.patched/gettext-tools/gnulib-m4/getline.m4 | ||
251 | --- gettext-0.16.1/gettext-tools/gnulib-m4/getline.m4 2006-11-27 09:14:54.000000000 -0800 | ||
252 | +++ gettext.patched/gettext-tools/gnulib-m4/getline.m4 2011-03-16 23:51:49.829971108 -0700 | ||
253 | @@ -16,7 +16,7 @@ | ||
254 | AC_DEFUN([gl_FUNC_GETLINE], | ||
255 | [ | ||
256 | dnl Persuade glibc <stdio.h> to declare getline(). | ||
257 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
258 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
259 | |||
260 | AC_CHECK_DECLS([getline]) | ||
261 | |||
262 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-tools/gnulib-m4/gnulib-comp.m4 | ||
263 | --- gettext-0.16.1/gettext-tools/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:36.000000000 -0800 | ||
264 | +++ gettext.patched/gettext-tools/gnulib-m4/gnulib-comp.m4 2011-03-16 23:52:18.970450488 -0700 | ||
265 | @@ -25,7 +25,7 @@ | ||
266 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
267 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
268 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
269 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
270 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
271 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
272 | AC_REQUIRE([gl_LOCK_EARLY]) | ||
273 | ]) | ||
274 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/mbchar.m4 gettext.patched/gettext-tools/gnulib-m4/mbchar.m4 | ||
275 | --- gettext-0.16.1/gettext-tools/gnulib-m4/mbchar.m4 2006-11-27 09:14:55.000000000 -0800 | ||
276 | +++ gettext.patched/gettext-tools/gnulib-m4/mbchar.m4 2011-03-16 23:51:40.844410216 -0700 | ||
277 | @@ -9,7 +9,7 @@ | ||
278 | |||
279 | AC_DEFUN([gl_MBCHAR], | ||
280 | [ | ||
281 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
282 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
283 | dnl The following line is that so the user can test HAVE_WCHAR_H | ||
284 | dnl before #include "mbchar.h". | ||
285 | AC_CHECK_HEADERS_ONCE([wchar.h]) | ||
286 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/stpcpy.m4 gettext.patched/gettext-tools/gnulib-m4/stpcpy.m4 | ||
287 | --- gettext-0.16.1/gettext-tools/gnulib-m4/stpcpy.m4 2006-11-27 09:14:55.000000000 -0800 | ||
288 | +++ gettext.patched/gettext-tools/gnulib-m4/stpcpy.m4 2011-03-16 23:52:14.691396045 -0700 | ||
289 | @@ -7,7 +7,7 @@ | ||
290 | AC_DEFUN([gl_FUNC_STPCPY], | ||
291 | [ | ||
292 | dnl Persuade glibc <string.h> to declare stpcpy(). | ||
293 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
294 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
295 | |||
296 | AC_REPLACE_FUNCS(stpcpy) | ||
297 | if test $ac_cv_func_stpcpy = no; then | ||
298 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/stpncpy.m4 gettext.patched/gettext-tools/gnulib-m4/stpncpy.m4 | ||
299 | --- gettext-0.16.1/gettext-tools/gnulib-m4/stpncpy.m4 2006-11-27 09:14:55.000000000 -0800 | ||
300 | +++ gettext.patched/gettext-tools/gnulib-m4/stpncpy.m4 2011-03-16 23:52:10.356641459 -0700 | ||
301 | @@ -7,7 +7,7 @@ | ||
302 | AC_DEFUN([gl_FUNC_STPNCPY], | ||
303 | [ | ||
304 | dnl Persuade glibc <string.h> to declare stpncpy(). | ||
305 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
306 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
307 | |||
308 | dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy() function | ||
309 | dnl declared in <string.h>. Its side effects are the same as those | ||
310 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/wcwidth.m4 gettext.patched/gettext-tools/gnulib-m4/wcwidth.m4 | ||
311 | --- gettext-0.16.1/gettext-tools/gnulib-m4/wcwidth.m4 2006-11-27 09:14:55.000000000 -0800 | ||
312 | +++ gettext.patched/gettext-tools/gnulib-m4/wcwidth.m4 2011-03-16 23:51:08.260324221 -0700 | ||
313 | @@ -7,7 +7,7 @@ | ||
314 | AC_DEFUN([gl_FUNC_WCWIDTH], | ||
315 | [ | ||
316 | dnl Persuade glibc <wchar.h> to declare wcwidth(). | ||
317 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
318 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
319 | |||
320 | AC_REQUIRE([AC_C_INLINE]) | ||
321 | AC_REQUIRE([gt_TYPE_WCHAR_T]) | ||
322 | diff -ru gettext-0.16.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 | ||
323 | --- gettext-0.16.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:45.000000000 -0800 | ||
324 | +++ gettext.patched/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 2011-03-16 23:51:02.036061317 -0700 | ||
325 | @@ -25,7 +25,7 @@ | ||
326 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
327 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
328 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
329 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
330 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
331 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
332 | AC_REQUIRE([gl_LOCK_EARLY]) | ||
333 | ]) | ||
334 | diff -ru gettext-0.16.1/gettext-tools/m4/regex.m4 gettext.patched/gettext-tools/m4/regex.m4 | ||
335 | --- gettext-0.16.1/gettext-tools/m4/regex.m4 2006-11-27 09:02:05.000000000 -0800 | ||
336 | +++ gettext.patched/gettext-tools/m4/regex.m4 2011-03-16 23:50:53.533477195 -0700 | ||
337 | @@ -116,7 +116,7 @@ | ||
338 | dnl to get them. | ||
339 | |||
340 | dnl Persuade glibc <string.h> to declare mempcpy(). | ||
341 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
342 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
343 | |||
344 | AC_REQUIRE([AC_C_RESTRICT]) | ||
345 | AC_REQUIRE([AC_FUNC_ALLOCA]) | ||