summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-01-08 02:23:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-10 17:28:43 +0000
commitf558210c8fd7ea135c5db92f7c12cc4c0e6130ed (patch)
tree6887af22d8287ad4f7f59b59af1c3558ee098487
parent6f99591a6fa5fa615465045d16d9a65ba16b8b3a (diff)
downloadpoky-f558210c8fd7ea135c5db92f7c12cc4c0e6130ed.tar.gz
libiconv_1.14.bb: Fix build failure
Currently libiconv is failing after upgrade to 1.14 this patch fixes the problem. It uses relocatable gnulib module which should be added. Delete unpackaged files. (From OE-Core rev: fcb8d6fd9c1d6ee28bb8ab79d7829f719d989bae) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch5008
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.14.bb8
2 files changed, 5015 insertions, 1 deletions
diff --git a/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch b/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch
new file mode 100644
index 0000000000..6af377b4cc
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch
@@ -0,0 +1,5008 @@
1This patch is needed to solve issues like
2| iconv.o: In function `main':
3| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/src/./iconv.c:861: undefined reference to `relocate'
4| ../srclib/libicrt.a(progreloc.o): In function `prepare_relocate':
5| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/srclib/progreloc.c:297: undefined reference to `compute_curr_prefix'
6| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/srclib/progreloc.c:302: undefined reference to `set_relocation_prefix'
7| collect2: ld returned 1 exit status
8| make[1]: *** [install] Error 1
9
10Upstream-Status: Inappropriate [OE config specific]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14diff -Naurp libiconv-1.14.org//build-aux/arg-nonnull.h libiconv-1.14/build-aux/arg-nonnull.h
15--- libiconv-1.14.org//build-aux/arg-nonnull.h 1969-12-31 16:00:00.000000000 -0800
16+++ libiconv-1.14/build-aux/arg-nonnull.h 2012-01-08 02:07:39.930484438 -0800
17@@ -0,0 +1,26 @@
18+/* A C macro for declaring that specific arguments must not be NULL.
19+ Copyright (C) 2009-2011 Free Software Foundation, Inc.
20+
21+ This program is free software: you can redistribute it and/or modify it
22+ under the terms of the GNU General Public License as published
23+ by the Free Software Foundation; either version 3 of the License, or
24+ (at your option) any later version.
25+
26+ This program is distributed in the hope that it will be useful,
27+ but WITHOUT ANY WARRANTY; without even the implied warranty of
28+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29+ General Public License for more details.
30+
31+ You should have received a copy of the GNU General Public License
32+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
33+
34+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
35+ that the values passed as arguments n, ..., m must be non-NULL pointers.
36+ n = 1 stands for the first argument, n = 2 for the second argument etc. */
37+#ifndef _GL_ARG_NONNULL
38+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
39+# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
40+# else
41+# define _GL_ARG_NONNULL(params)
42+# endif
43+#endif
44diff -Naurp libiconv-1.14.org//build-aux/c++defs.h libiconv-1.14/build-aux/c++defs.h
45--- libiconv-1.14.org//build-aux/c++defs.h 1969-12-31 16:00:00.000000000 -0800
46+++ libiconv-1.14/build-aux/c++defs.h 2012-01-08 02:07:39.942484438 -0800
47@@ -0,0 +1,271 @@
48+/* C++ compatible function declaration macros.
49+ Copyright (C) 2010-2011 Free Software Foundation, Inc.
50+
51+ This program is free software: you can redistribute it and/or modify it
52+ under the terms of the GNU General Public License as published
53+ by the Free Software Foundation; either version 3 of the License, or
54+ (at your option) any later version.
55+
56+ This program is distributed in the hope that it will be useful,
57+ but WITHOUT ANY WARRANTY; without even the implied warranty of
58+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
59+ General Public License for more details.
60+
61+ You should have received a copy of the GNU General Public License
62+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
63+
64+#ifndef _GL_CXXDEFS_H
65+#define _GL_CXXDEFS_H
66+
67+/* The three most frequent use cases of these macros are:
68+
69+ * For providing a substitute for a function that is missing on some
70+ platforms, but is declared and works fine on the platforms on which
71+ it exists:
72+
73+ #if @GNULIB_FOO@
74+ # if !@HAVE_FOO@
75+ _GL_FUNCDECL_SYS (foo, ...);
76+ # endif
77+ _GL_CXXALIAS_SYS (foo, ...);
78+ _GL_CXXALIASWARN (foo);
79+ #elif defined GNULIB_POSIXCHECK
80+ ...
81+ #endif
82+
83+ * For providing a replacement for a function that exists on all platforms,
84+ but is broken/insufficient and needs to be replaced on some platforms:
85+
86+ #if @GNULIB_FOO@
87+ # if @REPLACE_FOO@
88+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
89+ # undef foo
90+ # define foo rpl_foo
91+ # endif
92+ _GL_FUNCDECL_RPL (foo, ...);
93+ _GL_CXXALIAS_RPL (foo, ...);
94+ # else
95+ _GL_CXXALIAS_SYS (foo, ...);
96+ # endif
97+ _GL_CXXALIASWARN (foo);
98+ #elif defined GNULIB_POSIXCHECK
99+ ...
100+ #endif
101+
102+ * For providing a replacement for a function that exists on some platforms
103+ but is broken/insufficient and needs to be replaced on some of them and
104+ is additionally either missing or undeclared on some other platforms:
105+
106+ #if @GNULIB_FOO@
107+ # if @REPLACE_FOO@
108+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
109+ # undef foo
110+ # define foo rpl_foo
111+ # endif
112+ _GL_FUNCDECL_RPL (foo, ...);
113+ _GL_CXXALIAS_RPL (foo, ...);
114+ # else
115+ # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@
116+ _GL_FUNCDECL_SYS (foo, ...);
117+ # endif
118+ _GL_CXXALIAS_SYS (foo, ...);
119+ # endif
120+ _GL_CXXALIASWARN (foo);
121+ #elif defined GNULIB_POSIXCHECK
122+ ...
123+ #endif
124+*/
125+
126+/* _GL_EXTERN_C declaration;
127+ performs the declaration with C linkage. */
128+#if defined __cplusplus
129+# define _GL_EXTERN_C extern "C"
130+#else
131+# define _GL_EXTERN_C extern
132+#endif
133+
134+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
135+ declares a replacement function, named rpl_func, with the given prototype,
136+ consisting of return type, parameters, and attributes.
137+ Example:
138+ _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
139+ _GL_ARG_NONNULL ((1)));
140+ */
141+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
142+ _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
143+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
144+ _GL_EXTERN_C rettype rpl_func parameters_and_attributes
145+
146+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
147+ declares the system function, named func, with the given prototype,
148+ consisting of return type, parameters, and attributes.
149+ Example:
150+ _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
151+ _GL_ARG_NONNULL ((1)));
152+ */
153+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
154+ _GL_EXTERN_C rettype func parameters_and_attributes
155+
156+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
157+ declares a C++ alias called GNULIB_NAMESPACE::func
158+ that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
159+ Example:
160+ _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
161+ */
162+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
163+ _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
164+#if defined __cplusplus && defined GNULIB_NAMESPACE
165+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
166+ namespace GNULIB_NAMESPACE \
167+ { \
168+ rettype (*const func) parameters = ::rpl_func; \
169+ } \
170+ _GL_EXTERN_C int _gl_cxxalias_dummy
171+#else
172+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
173+ _GL_EXTERN_C int _gl_cxxalias_dummy
174+#endif
175+
176+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
177+ is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
178+ except that the C function rpl_func may have a slightly different
179+ declaration. A cast is used to silence the "invalid conversion" error
180+ that would otherwise occur. */
181+#if defined __cplusplus && defined GNULIB_NAMESPACE
182+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
183+ namespace GNULIB_NAMESPACE \
184+ { \
185+ rettype (*const func) parameters = \
186+ reinterpret_cast<rettype(*)parameters>(::rpl_func); \
187+ } \
188+ _GL_EXTERN_C int _gl_cxxalias_dummy
189+#else
190+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
191+ _GL_EXTERN_C int _gl_cxxalias_dummy
192+#endif
193+
194+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
195+ declares a C++ alias called GNULIB_NAMESPACE::func
196+ that redirects to the system provided function func, if GNULIB_NAMESPACE
197+ is defined.
198+ Example:
199+ _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
200+ */
201+#if defined __cplusplus && defined GNULIB_NAMESPACE
202+ /* If we were to write
203+ rettype (*const func) parameters = ::func;
204+ like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
205+ better (remove an indirection through a 'static' pointer variable),
206+ but then the _GL_CXXALIASWARN macro below would cause a warning not only
207+ for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */
208+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
209+ namespace GNULIB_NAMESPACE \
210+ { \
211+ static rettype (*func) parameters = ::func; \
212+ } \
213+ _GL_EXTERN_C int _gl_cxxalias_dummy
214+#else
215+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
216+ _GL_EXTERN_C int _gl_cxxalias_dummy
217+#endif
218+
219+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
220+ is like _GL_CXXALIAS_SYS (func, rettype, parameters);
221+ except that the C function func may have a slightly different declaration.
222+ A cast is used to silence the "invalid conversion" error that would
223+ otherwise occur. */
224+#if defined __cplusplus && defined GNULIB_NAMESPACE
225+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
226+ namespace GNULIB_NAMESPACE \
227+ { \
228+ static rettype (*func) parameters = \
229+ reinterpret_cast<rettype(*)parameters>(::func); \
230+ } \
231+ _GL_EXTERN_C int _gl_cxxalias_dummy
232+#else
233+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
234+ _GL_EXTERN_C int _gl_cxxalias_dummy
235+#endif
236+
237+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
238+ is like _GL_CXXALIAS_SYS (func, rettype, parameters);
239+ except that the C function is picked among a set of overloaded functions,
240+ namely the one with rettype2 and parameters2. Two consecutive casts
241+ are used to silence the "cannot find a match" and "invalid conversion"
242+ errors that would otherwise occur. */
243+#if defined __cplusplus && defined GNULIB_NAMESPACE
244+ /* The outer cast must be a reinterpret_cast.
245+ The inner cast: When the function is defined as a set of overloaded
246+ functions, it works as a static_cast<>, choosing the designated variant.
247+ When the function is defined as a single variant, it works as a
248+ reinterpret_cast<>. The parenthesized cast syntax works both ways. */
249+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
250+ namespace GNULIB_NAMESPACE \
251+ { \
252+ static rettype (*func) parameters = \
253+ reinterpret_cast<rettype(*)parameters>( \
254+ (rettype2(*)parameters2)(::func)); \
255+ } \
256+ _GL_EXTERN_C int _gl_cxxalias_dummy
257+#else
258+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
259+ _GL_EXTERN_C int _gl_cxxalias_dummy
260+#endif
261+
262+/* _GL_CXXALIASWARN (func);
263+ causes a warning to be emitted when ::func is used but not when
264+ GNULIB_NAMESPACE::func is used. func must be defined without overloaded
265+ variants. */
266+#if defined __cplusplus && defined GNULIB_NAMESPACE
267+# define _GL_CXXALIASWARN(func) \
268+ _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
269+# define _GL_CXXALIASWARN_1(func,namespace) \
270+ _GL_CXXALIASWARN_2 (func, namespace)
271+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
272+ we enable the warning only when not optimizing. */
273+# if !__OPTIMIZE__
274+# define _GL_CXXALIASWARN_2(func,namespace) \
275+ _GL_WARN_ON_USE (func, \
276+ "The symbol ::" #func " refers to the system function. " \
277+ "Use " #namespace "::" #func " instead.")
278+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
279+# define _GL_CXXALIASWARN_2(func,namespace) \
280+ extern __typeof__ (func) func
281+# else
282+# define _GL_CXXALIASWARN_2(func,namespace) \
283+ _GL_EXTERN_C int _gl_cxxalias_dummy
284+# endif
285+#else
286+# define _GL_CXXALIASWARN(func) \
287+ _GL_EXTERN_C int _gl_cxxalias_dummy
288+#endif
289+
290+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
291+ causes a warning to be emitted when the given overloaded variant of ::func
292+ is used but not when GNULIB_NAMESPACE::func is used. */
293+#if defined __cplusplus && defined GNULIB_NAMESPACE
294+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
295+ _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
296+ GNULIB_NAMESPACE)
297+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
298+ _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
299+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
300+ we enable the warning only when not optimizing. */
301+# if !__OPTIMIZE__
302+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
303+ _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
304+ "The symbol ::" #func " refers to the system function. " \
305+ "Use " #namespace "::" #func " instead.")
306+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
307+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
308+ extern __typeof__ (func) func
309+# else
310+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
311+ _GL_EXTERN_C int _gl_cxxalias_dummy
312+# endif
313+#else
314+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
315+ _GL_EXTERN_C int _gl_cxxalias_dummy
316+#endif
317+
318+#endif /* _GL_CXXDEFS_H */
319diff -Naurp libiconv-1.14.org//build-aux/snippet/arg-nonnull.h libiconv-1.14/build-aux/snippet/arg-nonnull.h
320--- libiconv-1.14.org//build-aux/snippet/arg-nonnull.h 2011-08-07 06:22:07.000000000 -0700
321+++ libiconv-1.14/build-aux/snippet/arg-nonnull.h 1969-12-31 16:00:00.000000000 -0800
322@@ -1,26 +0,0 @@
323-/* A C macro for declaring that specific arguments must not be NULL.
324- Copyright (C) 2009-2011 Free Software Foundation, Inc.
325-
326- This program is free software: you can redistribute it and/or modify it
327- under the terms of the GNU General Public License as published
328- by the Free Software Foundation; either version 3 of the License, or
329- (at your option) any later version.
330-
331- This program is distributed in the hope that it will be useful,
332- but WITHOUT ANY WARRANTY; without even the implied warranty of
333- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
334- General Public License for more details.
335-
336- You should have received a copy of the GNU General Public License
337- along with this program. If not, see <http://www.gnu.org/licenses/>. */
338-
339-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
340- that the values passed as arguments n, ..., m must be non-NULL pointers.
341- n = 1 stands for the first argument, n = 2 for the second argument etc. */
342-#ifndef _GL_ARG_NONNULL
343-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
344-# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
345-# else
346-# define _GL_ARG_NONNULL(params)
347-# endif
348-#endif
349diff -Naurp libiconv-1.14.org//build-aux/snippet/c++defs.h libiconv-1.14/build-aux/snippet/c++defs.h
350--- libiconv-1.14.org//build-aux/snippet/c++defs.h 2011-08-07 06:22:07.000000000 -0700
351+++ libiconv-1.14/build-aux/snippet/c++defs.h 1969-12-31 16:00:00.000000000 -0800
352@@ -1,271 +0,0 @@
353-/* C++ compatible function declaration macros.
354- Copyright (C) 2010-2011 Free Software Foundation, Inc.
355-
356- This program is free software: you can redistribute it and/or modify it
357- under the terms of the GNU General Public License as published
358- by the Free Software Foundation; either version 3 of the License, or
359- (at your option) any later version.
360-
361- This program is distributed in the hope that it will be useful,
362- but WITHOUT ANY WARRANTY; without even the implied warranty of
363- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
364- General Public License for more details.
365-
366- You should have received a copy of the GNU General Public License
367- along with this program. If not, see <http://www.gnu.org/licenses/>. */
368-
369-#ifndef _GL_CXXDEFS_H
370-#define _GL_CXXDEFS_H
371-
372-/* The three most frequent use cases of these macros are:
373-
374- * For providing a substitute for a function that is missing on some
375- platforms, but is declared and works fine on the platforms on which
376- it exists:
377-
378- #if @GNULIB_FOO@
379- # if !@HAVE_FOO@
380- _GL_FUNCDECL_SYS (foo, ...);
381- # endif
382- _GL_CXXALIAS_SYS (foo, ...);
383- _GL_CXXALIASWARN (foo);
384- #elif defined GNULIB_POSIXCHECK
385- ...
386- #endif
387-
388- * For providing a replacement for a function that exists on all platforms,
389- but is broken/insufficient and needs to be replaced on some platforms:
390-
391- #if @GNULIB_FOO@
392- # if @REPLACE_FOO@
393- # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
394- # undef foo
395- # define foo rpl_foo
396- # endif
397- _GL_FUNCDECL_RPL (foo, ...);
398- _GL_CXXALIAS_RPL (foo, ...);
399- # else
400- _GL_CXXALIAS_SYS (foo, ...);
401- # endif
402- _GL_CXXALIASWARN (foo);
403- #elif defined GNULIB_POSIXCHECK
404- ...
405- #endif
406-
407- * For providing a replacement for a function that exists on some platforms
408- but is broken/insufficient and needs to be replaced on some of them and
409- is additionally either missing or undeclared on some other platforms:
410-
411- #if @GNULIB_FOO@
412- # if @REPLACE_FOO@
413- # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
414- # undef foo
415- # define foo rpl_foo
416- # endif
417- _GL_FUNCDECL_RPL (foo, ...);
418- _GL_CXXALIAS_RPL (foo, ...);
419- # else
420- # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@
421- _GL_FUNCDECL_SYS (foo, ...);
422- # endif
423- _GL_CXXALIAS_SYS (foo, ...);
424- # endif
425- _GL_CXXALIASWARN (foo);
426- #elif defined GNULIB_POSIXCHECK
427- ...
428- #endif
429-*/
430-
431-/* _GL_EXTERN_C declaration;
432- performs the declaration with C linkage. */
433-#if defined __cplusplus
434-# define _GL_EXTERN_C extern "C"
435-#else
436-# define _GL_EXTERN_C extern
437-#endif
438-
439-/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
440- declares a replacement function, named rpl_func, with the given prototype,
441- consisting of return type, parameters, and attributes.
442- Example:
443- _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
444- _GL_ARG_NONNULL ((1)));
445- */
446-#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
447- _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
448-#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
449- _GL_EXTERN_C rettype rpl_func parameters_and_attributes
450-
451-/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
452- declares the system function, named func, with the given prototype,
453- consisting of return type, parameters, and attributes.
454- Example:
455- _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
456- _GL_ARG_NONNULL ((1)));
457- */
458-#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
459- _GL_EXTERN_C rettype func parameters_and_attributes
460-
461-/* _GL_CXXALIAS_RPL (func, rettype, parameters);
462- declares a C++ alias called GNULIB_NAMESPACE::func
463- that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
464- Example:
465- _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
466- */
467-#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
468- _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
469-#if defined __cplusplus && defined GNULIB_NAMESPACE
470-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
471- namespace GNULIB_NAMESPACE \
472- { \
473- rettype (*const func) parameters = ::rpl_func; \
474- } \
475- _GL_EXTERN_C int _gl_cxxalias_dummy
476-#else
477-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
478- _GL_EXTERN_C int _gl_cxxalias_dummy
479-#endif
480-
481-/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
482- is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
483- except that the C function rpl_func may have a slightly different
484- declaration. A cast is used to silence the "invalid conversion" error
485- that would otherwise occur. */
486-#if defined __cplusplus && defined GNULIB_NAMESPACE
487-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
488- namespace GNULIB_NAMESPACE \
489- { \
490- rettype (*const func) parameters = \
491- reinterpret_cast<rettype(*)parameters>(::rpl_func); \
492- } \
493- _GL_EXTERN_C int _gl_cxxalias_dummy
494-#else
495-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
496- _GL_EXTERN_C int _gl_cxxalias_dummy
497-#endif
498-
499-/* _GL_CXXALIAS_SYS (func, rettype, parameters);
500- declares a C++ alias called GNULIB_NAMESPACE::func
501- that redirects to the system provided function func, if GNULIB_NAMESPACE
502- is defined.
503- Example:
504- _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
505- */
506-#if defined __cplusplus && defined GNULIB_NAMESPACE
507- /* If we were to write
508- rettype (*const func) parameters = ::func;
509- like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
510- better (remove an indirection through a 'static' pointer variable),
511- but then the _GL_CXXALIASWARN macro below would cause a warning not only
512- for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */
513-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
514- namespace GNULIB_NAMESPACE \
515- { \
516- static rettype (*func) parameters = ::func; \
517- } \
518- _GL_EXTERN_C int _gl_cxxalias_dummy
519-#else
520-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
521- _GL_EXTERN_C int _gl_cxxalias_dummy
522-#endif
523-
524-/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
525- is like _GL_CXXALIAS_SYS (func, rettype, parameters);
526- except that the C function func may have a slightly different declaration.
527- A cast is used to silence the "invalid conversion" error that would
528- otherwise occur. */
529-#if defined __cplusplus && defined GNULIB_NAMESPACE
530-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
531- namespace GNULIB_NAMESPACE \
532- { \
533- static rettype (*func) parameters = \
534- reinterpret_cast<rettype(*)parameters>(::func); \
535- } \
536- _GL_EXTERN_C int _gl_cxxalias_dummy
537-#else
538-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
539- _GL_EXTERN_C int _gl_cxxalias_dummy
540-#endif
541-
542-/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
543- is like _GL_CXXALIAS_SYS (func, rettype, parameters);
544- except that the C function is picked among a set of overloaded functions,
545- namely the one with rettype2 and parameters2. Two consecutive casts
546- are used to silence the "cannot find a match" and "invalid conversion"
547- errors that would otherwise occur. */
548-#if defined __cplusplus && defined GNULIB_NAMESPACE
549- /* The outer cast must be a reinterpret_cast.
550- The inner cast: When the function is defined as a set of overloaded
551- functions, it works as a static_cast<>, choosing the designated variant.
552- When the function is defined as a single variant, it works as a
553- reinterpret_cast<>. The parenthesized cast syntax works both ways. */
554-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
555- namespace GNULIB_NAMESPACE \
556- { \
557- static rettype (*func) parameters = \
558- reinterpret_cast<rettype(*)parameters>( \
559- (rettype2(*)parameters2)(::func)); \
560- } \
561- _GL_EXTERN_C int _gl_cxxalias_dummy
562-#else
563-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
564- _GL_EXTERN_C int _gl_cxxalias_dummy
565-#endif
566-
567-/* _GL_CXXALIASWARN (func);
568- causes a warning to be emitted when ::func is used but not when
569- GNULIB_NAMESPACE::func is used. func must be defined without overloaded
570- variants. */
571-#if defined __cplusplus && defined GNULIB_NAMESPACE
572-# define _GL_CXXALIASWARN(func) \
573- _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
574-# define _GL_CXXALIASWARN_1(func,namespace) \
575- _GL_CXXALIASWARN_2 (func, namespace)
576-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
577- we enable the warning only when not optimizing. */
578-# if !__OPTIMIZE__
579-# define _GL_CXXALIASWARN_2(func,namespace) \
580- _GL_WARN_ON_USE (func, \
581- "The symbol ::" #func " refers to the system function. " \
582- "Use " #namespace "::" #func " instead.")
583-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
584-# define _GL_CXXALIASWARN_2(func,namespace) \
585- extern __typeof__ (func) func
586-# else
587-# define _GL_CXXALIASWARN_2(func,namespace) \
588- _GL_EXTERN_C int _gl_cxxalias_dummy
589-# endif
590-#else
591-# define _GL_CXXALIASWARN(func) \
592- _GL_EXTERN_C int _gl_cxxalias_dummy
593-#endif
594-
595-/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
596- causes a warning to be emitted when the given overloaded variant of ::func
597- is used but not when GNULIB_NAMESPACE::func is used. */
598-#if defined __cplusplus && defined GNULIB_NAMESPACE
599-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
600- _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
601- GNULIB_NAMESPACE)
602-# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
603- _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
604-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
605- we enable the warning only when not optimizing. */
606-# if !__OPTIMIZE__
607-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
608- _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
609- "The symbol ::" #func " refers to the system function. " \
610- "Use " #namespace "::" #func " instead.")
611-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
612-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
613- extern __typeof__ (func) func
614-# else
615-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
616- _GL_EXTERN_C int _gl_cxxalias_dummy
617-# endif
618-#else
619-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
620- _GL_EXTERN_C int _gl_cxxalias_dummy
621-#endif
622-
623-#endif /* _GL_CXXDEFS_H */
624diff -Naurp libiconv-1.14.org//build-aux/snippet/_Noreturn.h libiconv-1.14/build-aux/snippet/_Noreturn.h
625--- libiconv-1.14.org//build-aux/snippet/_Noreturn.h 2011-08-07 06:22:07.000000000 -0700
626+++ libiconv-1.14/build-aux/snippet/_Noreturn.h 1969-12-31 16:00:00.000000000 -0800
627@@ -1,10 +0,0 @@
628-#ifndef _Noreturn
629-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
630- || 0x5110 <= __SUNPRO_C)
631-# define _Noreturn __attribute__ ((__noreturn__))
632-# elif 1200 <= _MSC_VER
633-# define _Noreturn __declspec (noreturn)
634-# else
635-# define _Noreturn
636-# endif
637-#endif
638diff -Naurp libiconv-1.14.org//build-aux/snippet/warn-on-use.h libiconv-1.14/build-aux/snippet/warn-on-use.h
639--- libiconv-1.14.org//build-aux/snippet/warn-on-use.h 2011-08-07 06:22:07.000000000 -0700
640+++ libiconv-1.14/build-aux/snippet/warn-on-use.h 1969-12-31 16:00:00.000000000 -0800
641@@ -1,109 +0,0 @@
642-/* A C macro for emitting warnings if a function is used.
643- Copyright (C) 2010-2011 Free Software Foundation, Inc.
644-
645- This program is free software: you can redistribute it and/or modify it
646- under the terms of the GNU General Public License as published
647- by the Free Software Foundation; either version 3 of the License, or
648- (at your option) any later version.
649-
650- This program is distributed in the hope that it will be useful,
651- but WITHOUT ANY WARRANTY; without even the implied warranty of
652- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
653- General Public License for more details.
654-
655- You should have received a copy of the GNU General Public License
656- along with this program. If not, see <http://www.gnu.org/licenses/>. */
657-
658-/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
659- for FUNCTION which will then trigger a compiler warning containing
660- the text of "literal string" anywhere that function is called, if
661- supported by the compiler. If the compiler does not support this
662- feature, the macro expands to an unused extern declaration.
663-
664- This macro is useful for marking a function as a potential
665- portability trap, with the intent that "literal string" include
666- instructions on the replacement function that should be used
667- instead. However, one of the reasons that a function is a
668- portability trap is if it has the wrong signature. Declaring
669- FUNCTION with a different signature in C is a compilation error, so
670- this macro must use the same type as any existing declaration so
671- that programs that avoid the problematic FUNCTION do not fail to
672- compile merely because they included a header that poisoned the
673- function. But this implies that _GL_WARN_ON_USE is only safe to
674- use if FUNCTION is known to already have a declaration. Use of
675- this macro implies that there must not be any other macro hiding
676- the declaration of FUNCTION; but undefining FUNCTION first is part
677- of the poisoning process anyway (although for symbols that are
678- provided only via a macro, the result is a compilation error rather
679- than a warning containing "literal string"). Also note that in
680- C++, it is only safe to use if FUNCTION has no overloads.
681-
682- For an example, it is possible to poison 'getline' by:
683- - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
684- [getline]) in configure.ac, which potentially defines
685- HAVE_RAW_DECL_GETLINE
686- - adding this code to a header that wraps the system <stdio.h>:
687- #undef getline
688- #if HAVE_RAW_DECL_GETLINE
689- _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
690- "not universally present; use the gnulib module getline");
691- #endif
692-
693- It is not possible to directly poison global variables. But it is
694- possible to write a wrapper accessor function, and poison that
695- (less common usage, like &environ, will cause a compilation error
696- rather than issue the nice warning, but the end result of informing
697- the developer about their portability problem is still achieved):
698- #if HAVE_RAW_DECL_ENVIRON
699- static inline char ***rpl_environ (void) { return &environ; }
700- _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
701- # undef environ
702- # define environ (*rpl_environ ())
703- #endif
704- */
705-#ifndef _GL_WARN_ON_USE
706-
707-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
708-/* A compiler attribute is available in gcc versions 4.3.0 and later. */
709-# define _GL_WARN_ON_USE(function, message) \
710-extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
711-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
712-/* Verify the existence of the function. */
713-# define _GL_WARN_ON_USE(function, message) \
714-extern __typeof__ (function) function
715-# else /* Unsupported. */
716-# define _GL_WARN_ON_USE(function, message) \
717-_GL_WARN_EXTERN_C int _gl_warn_on_use
718-# endif
719-#endif
720-
721-/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
722- is like _GL_WARN_ON_USE (function, "string"), except that the function is
723- declared with the given prototype, consisting of return type, parameters,
724- and attributes.
725- This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
726- not work in this case. */
727-#ifndef _GL_WARN_ON_USE_CXX
728-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
729-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
730-extern rettype function parameters_and_attributes \
731- __attribute__ ((__warning__ (msg)))
732-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
733-/* Verify the existence of the function. */
734-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
735-extern rettype function parameters_and_attributes
736-# else /* Unsupported. */
737-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
738-_GL_WARN_EXTERN_C int _gl_warn_on_use
739-# endif
740-#endif
741-
742-/* _GL_WARN_EXTERN_C declaration;
743- performs the declaration with C linkage. */
744-#ifndef _GL_WARN_EXTERN_C
745-# if defined __cplusplus
746-# define _GL_WARN_EXTERN_C extern "C"
747-# else
748-# define _GL_WARN_EXTERN_C extern
749-# endif
750-#endif
751diff -Naurp libiconv-1.14.org//build-aux/warn-on-use.h libiconv-1.14/build-aux/warn-on-use.h
752--- libiconv-1.14.org//build-aux/warn-on-use.h 1969-12-31 16:00:00.000000000 -0800
753+++ libiconv-1.14/build-aux/warn-on-use.h 2012-01-08 02:07:39.950484439 -0800
754@@ -0,0 +1,109 @@
755+/* A C macro for emitting warnings if a function is used.
756+ Copyright (C) 2010-2011 Free Software Foundation, Inc.
757+
758+ This program is free software: you can redistribute it and/or modify it
759+ under the terms of the GNU General Public License as published
760+ by the Free Software Foundation; either version 3 of the License, or
761+ (at your option) any later version.
762+
763+ This program is distributed in the hope that it will be useful,
764+ but WITHOUT ANY WARRANTY; without even the implied warranty of
765+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
766+ General Public License for more details.
767+
768+ You should have received a copy of the GNU General Public License
769+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
770+
771+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
772+ for FUNCTION which will then trigger a compiler warning containing
773+ the text of "literal string" anywhere that function is called, if
774+ supported by the compiler. If the compiler does not support this
775+ feature, the macro expands to an unused extern declaration.
776+
777+ This macro is useful for marking a function as a potential
778+ portability trap, with the intent that "literal string" include
779+ instructions on the replacement function that should be used
780+ instead. However, one of the reasons that a function is a
781+ portability trap is if it has the wrong signature. Declaring
782+ FUNCTION with a different signature in C is a compilation error, so
783+ this macro must use the same type as any existing declaration so
784+ that programs that avoid the problematic FUNCTION do not fail to
785+ compile merely because they included a header that poisoned the
786+ function. But this implies that _GL_WARN_ON_USE is only safe to
787+ use if FUNCTION is known to already have a declaration. Use of
788+ this macro implies that there must not be any other macro hiding
789+ the declaration of FUNCTION; but undefining FUNCTION first is part
790+ of the poisoning process anyway (although for symbols that are
791+ provided only via a macro, the result is a compilation error rather
792+ than a warning containing "literal string"). Also note that in
793+ C++, it is only safe to use if FUNCTION has no overloads.
794+
795+ For an example, it is possible to poison 'getline' by:
796+ - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
797+ [getline]) in configure.ac, which potentially defines
798+ HAVE_RAW_DECL_GETLINE
799+ - adding this code to a header that wraps the system <stdio.h>:
800+ #undef getline
801+ #if HAVE_RAW_DECL_GETLINE
802+ _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
803+ "not universally present; use the gnulib module getline");
804+ #endif
805+
806+ It is not possible to directly poison global variables. But it is
807+ possible to write a wrapper accessor function, and poison that
808+ (less common usage, like &environ, will cause a compilation error
809+ rather than issue the nice warning, but the end result of informing
810+ the developer about their portability problem is still achieved):
811+ #if HAVE_RAW_DECL_ENVIRON
812+ static inline char ***rpl_environ (void) { return &environ; }
813+ _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
814+ # undef environ
815+ # define environ (*rpl_environ ())
816+ #endif
817+ */
818+#ifndef _GL_WARN_ON_USE
819+
820+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
821+/* A compiler attribute is available in gcc versions 4.3.0 and later. */
822+# define _GL_WARN_ON_USE(function, message) \
823+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
824+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
825+/* Verify the existence of the function. */
826+# define _GL_WARN_ON_USE(function, message) \
827+extern __typeof__ (function) function
828+# else /* Unsupported. */
829+# define _GL_WARN_ON_USE(function, message) \
830+_GL_WARN_EXTERN_C int _gl_warn_on_use
831+# endif
832+#endif
833+
834+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
835+ is like _GL_WARN_ON_USE (function, "string"), except that the function is
836+ declared with the given prototype, consisting of return type, parameters,
837+ and attributes.
838+ This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
839+ not work in this case. */
840+#ifndef _GL_WARN_ON_USE_CXX
841+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
842+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
843+extern rettype function parameters_and_attributes \
844+ __attribute__ ((__warning__ (msg)))
845+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
846+/* Verify the existence of the function. */
847+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
848+extern rettype function parameters_and_attributes
849+# else /* Unsupported. */
850+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
851+_GL_WARN_EXTERN_C int _gl_warn_on_use
852+# endif
853+#endif
854+
855+/* _GL_WARN_EXTERN_C declaration;
856+ performs the declaration with C linkage. */
857+#ifndef _GL_WARN_EXTERN_C
858+# if defined __cplusplus
859+# define _GL_WARN_EXTERN_C extern "C"
860+# else
861+# define _GL_WARN_EXTERN_C extern
862+# endif
863+#endif
864diff -Naurp libiconv-1.14.org//srclib/allocator.h libiconv-1.14/srclib/allocator.h
865--- libiconv-1.14.org//srclib/allocator.h 2011-08-07 06:42:06.000000000 -0700
866+++ libiconv-1.14/srclib/allocator.h 2012-01-08 02:07:40.050484444 -0800
867@@ -45,11 +45,10 @@ struct allocator
868 /* Call FREE to free memory, like 'free'. */
869 void (*free) (void *);
870
871- /* If nonnull, call DIE (SIZE) if MALLOC (SIZE) or REALLOC (...,
872- SIZE) fails. DIE should not return. SIZE should equal SIZE_MAX
873- if size_t overflow was detected while calculating sizes to be
874- passed to MALLOC or REALLOC. */
875- void (*die) (size_t);
876+ /* If nonnull, call DIE if MALLOC or REALLOC fails. DIE should not
877+ return. DIE can be used by code that detects memory overflow
878+ while calculating sizes to be passed to MALLOC or REALLOC. */
879+ void (*die) (void);
880 };
881
882 /* An allocator using the stdlib functions and a null DIE function. */
883diff -Naurp libiconv-1.14.org//srclib/canonicalize-lgpl.c libiconv-1.14/srclib/canonicalize-lgpl.c
884--- libiconv-1.14.org//srclib/canonicalize-lgpl.c 2011-08-07 06:42:06.000000000 -0700
885+++ libiconv-1.14/srclib/canonicalize-lgpl.c 2012-01-08 02:07:40.094484446 -0800
886@@ -125,7 +125,7 @@ __realpath (const char *name, char *reso
887 #else
888 path_max = pathconf (name, _PC_PATH_MAX);
889 if (path_max <= 0)
890- path_max = 8192;
891+ path_max = 1024;
892 #endif
893
894 if (resolved == NULL)
895diff -Naurp libiconv-1.14.org//srclib/careadlinkat.c libiconv-1.14/srclib/careadlinkat.c
896--- libiconv-1.14.org//srclib/careadlinkat.c 2011-08-07 06:42:06.000000000 -0700
897+++ libiconv-1.14/srclib/careadlinkat.c 2012-01-08 02:07:40.102484445 -0800
898@@ -133,7 +133,6 @@ careadlinkat (int fd, char const *filena
899 if (buf == stack_buf)
900 {
901 char *b = (char *) alloc->allocate (link_size);
902- buf_size = link_size;
903 if (! b)
904 break;
905 memcpy (b, buf, link_size);
906@@ -157,11 +156,6 @@ careadlinkat (int fd, char const *filena
907 buf_size *= 2;
908 else if (buf_size < buf_size_max)
909 buf_size = buf_size_max;
910- else if (buf_size_max < SIZE_MAX)
911- {
912- errno = ENAMETOOLONG;
913- return NULL;
914- }
915 else
916 break;
917 buf = (char *) alloc->allocate (buf_size);
918@@ -169,7 +163,7 @@ careadlinkat (int fd, char const *filena
919 while (buf);
920
921 if (alloc->die)
922- alloc->die (buf_size);
923+ alloc->die ();
924 errno = ENOMEM;
925 return NULL;
926 }
927diff -Naurp libiconv-1.14.org//srclib/errno.in.h libiconv-1.14/srclib/errno.in.h
928--- libiconv-1.14.org//srclib/errno.in.h 2011-08-07 06:42:06.000000000 -0700
929+++ libiconv-1.14/srclib/errno.in.h 2012-01-08 02:07:40.122484446 -0800
930@@ -16,7 +16,7 @@
931 along with this program; if not, write to the Free Software Foundation,
932 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
933
934-#ifndef _@GUARD_PREFIX@_ERRNO_H
935+#ifndef _GL_ERRNO_H
936
937 #if __GNUC__ >= 3
938 @PRAGMA_SYSTEM_HEADER@
939@@ -26,8 +26,8 @@
940 /* The include_next requires a split double-inclusion guard. */
941 #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
942
943-#ifndef _@GUARD_PREFIX@_ERRNO_H
944-#define _@GUARD_PREFIX@_ERRNO_H
945+#ifndef _GL_ERRNO_H
946+#define _GL_ERRNO_H
947
948
949 /* On native Windows platforms, many macros are not defined. */
950@@ -147,16 +147,6 @@
951 # define GNULIB_defined_ENOTSUP 1
952 # endif
953
954-# ifndef ENETRESET
955-# define ENETRESET 2011
956-# define GNULIB_defined_ENETRESET 1
957-# endif
958-
959-# ifndef ECONNABORTED
960-# define ECONNABORTED 2012
961-# define GNULIB_defined_ECONNABORTED 1
962-# endif
963-
964 # ifndef ESTALE
965 # define ESTALE 2009
966 # define GNULIB_defined_ESTALE 1
967@@ -173,5 +163,5 @@
968 # endif
969
970
971-#endif /* _@GUARD_PREFIX@_ERRNO_H */
972-#endif /* _@GUARD_PREFIX@_ERRNO_H */
973+#endif /* _GL_ERRNO_H */
974+#endif /* _GL_ERRNO_H */
975diff -Naurp libiconv-1.14.org//srclib/error.c libiconv-1.14/srclib/error.c
976--- libiconv-1.14.org//srclib/error.c 2011-08-07 06:42:06.000000000 -0700
977+++ libiconv-1.14/srclib/error.c 2012-01-08 02:07:40.134484448 -0800
978@@ -97,15 +97,11 @@ extern void __error_at_line (int status,
979 /* The gnulib override of fcntl is not needed in this file. */
980 # undef fcntl
981
982-# if !HAVE_DECL_STRERROR_R
983+# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
984 # ifndef HAVE_DECL_STRERROR_R
985 "this configure-time declaration test was not run"
986 # endif
987-# if STRERROR_R_CHAR_P
988 char *strerror_r ();
989-# else
990-int strerror_r ();
991-# endif
992 # endif
993
994 /* The calling program should define program_name and set it to the
995diff -Naurp libiconv-1.14.org//srclib/fcntl.in.h libiconv-1.14/srclib/fcntl.in.h
996--- libiconv-1.14.org//srclib/fcntl.in.h 2011-08-07 06:42:06.000000000 -0700
997+++ libiconv-1.14/srclib/fcntl.in.h 2012-01-08 02:07:40.154484449 -0800
998@@ -40,7 +40,7 @@
999 #else
1000 /* Normal invocation convention. */
1001
1002-#ifndef _@GUARD_PREFIX@_FCNTL_H
1003+#ifndef _GL_FCNTL_H
1004
1005 #include <sys/types.h>
1006 /* On some systems other than glibc, <sys/stat.h> is a prerequisite of
1007@@ -55,8 +55,8 @@
1008 /* The include_next requires a split double-inclusion guard. */
1009 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
1010
1011-#ifndef _@GUARD_PREFIX@_FCNTL_H
1012-#define _@GUARD_PREFIX@_FCNTL_H
1013+#ifndef _GL_FCNTL_H
1014+#define _GL_FCNTL_H
1015
1016 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */
1017 # include <unistd.h>
1018@@ -320,6 +320,6 @@ _GL_WARN_ON_USE (openat, "openat is not
1019 #endif
1020
1021
1022-#endif /* _@GUARD_PREFIX@_FCNTL_H */
1023-#endif /* _@GUARD_PREFIX@_FCNTL_H */
1024+#endif /* _GL_FCNTL_H */
1025+#endif /* _GL_FCNTL_H */
1026 #endif
1027diff -Naurp libiconv-1.14.org//srclib/intprops.h libiconv-1.14/srclib/intprops.h
1028--- libiconv-1.14.org//srclib/intprops.h 2011-08-07 06:42:06.000000000 -0700
1029+++ libiconv-1.14/srclib/intprops.h 2012-01-08 02:07:40.174484450 -0800
1030@@ -22,13 +22,14 @@
1031
1032 #include <limits.h>
1033
1034-/* Return an integer value, converted to the same type as the integer
1035- expression E after integer type promotion. V is the unconverted value. */
1036-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
1037+/* Return a integer value, converted to the same type as the integer
1038+ expression E after integer type promotion. V is the unconverted value.
1039+ E should not have side effects. */
1040+#define _GL_INT_CONVERT(e, v) ((e) - (e) + (v))
1041
1042 /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
1043 <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>. */
1044-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
1045+#define _GL_INT_NEGATE_CONVERT(e, v) ((e) - (e) - (v))
1046
1047 /* The extra casts in the following macros work around compiler bugs,
1048 e.g., in Cray C 5.0.3.0. */
1049@@ -52,7 +53,7 @@
1050 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
1051
1052 /* Return 1 if the integer expression E, after integer promotion, has
1053- a signed type. */
1054+ a signed type. E should not have side effects. */
1055 #define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
1056
1057
1058@@ -310,10 +311,13 @@
1059 /* Return 1 if the expression A <op> B would overflow,
1060 where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
1061 assuming MIN and MAX are the minimum and maximum for the result type.
1062- Arguments should be free of side effects. */
1063+
1064+ This macro assumes that A | B is a valid integer if both A and B are,
1065+ which is true of all known practical hosts. If this is a problem
1066+ for you, please let us know how to fix it for your host. */
1067 #define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \
1068 op_result_overflow (a, b, \
1069- _GL_INT_MINIMUM (0 * (b) + (a)), \
1070- _GL_INT_MAXIMUM (0 * (b) + (a)))
1071+ _GL_INT_MINIMUM ((a) | (b)), \
1072+ _GL_INT_MAXIMUM ((a) | (b)))
1073
1074 #endif /* _GL_INTPROPS_H */
1075diff -Naurp libiconv-1.14.org//srclib/Makefile.gnulib libiconv-1.14/srclib/Makefile.gnulib
1076--- libiconv-1.14.org//srclib/Makefile.gnulib 2012-01-08 02:05:18.754477606 -0800
1077+++ libiconv-1.14/srclib/Makefile.gnulib 2012-01-08 02:07:43.138484592 -0800
1078@@ -9,7 +9,7 @@
1079 # the same distribution terms as the rest of that program.
1080 #
1081 # Generated by gnulib-tool.
1082-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc
1083+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc
1084
1085
1086 MOSTLYCLEANFILES += core *.stackdump
1087@@ -60,12 +60,60 @@ EXTRA_DIST += areadlink.h
1088
1089 ## end gnulib module areadlink
1090
1091+## begin gnulib module arg-nonnull
1092+
1093+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
1094+# statements but through direct file reference. Therefore this snippet must be
1095+# present in all Makefile.am that need it. This is ensured by the applicability
1096+# 'all' defined above.
1097+
1098+BUILT_SOURCES += arg-nonnull.h
1099+# The arg-nonnull.h that gets inserted into generated .h files is the same as
1100+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
1101+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
1102+ $(AM_V_GEN)rm -f $@-t $@ && \
1103+ sed -n -e '/GL_ARG_NONNULL/,$$p' \
1104+ < $(top_srcdir)/build-aux/arg-nonnull.h \
1105+ > $@-t && \
1106+ mv $@-t $@
1107+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
1108+
1109+ARG_NONNULL_H=arg-nonnull.h
1110+
1111+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h
1112+
1113+## end gnulib module arg-nonnull
1114+
1115 ## begin gnulib module binary-io
1116
1117 libicrt_a_SOURCES += binary-io.h
1118
1119 ## end gnulib module binary-io
1120
1121+## begin gnulib module c++defs
1122+
1123+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
1124+# statements but through direct file reference. Therefore this snippet must be
1125+# present in all Makefile.am that need it. This is ensured by the applicability
1126+# 'all' defined above.
1127+
1128+BUILT_SOURCES += c++defs.h
1129+# The c++defs.h that gets inserted into generated .h files is the same as
1130+# build-aux/c++defs.h, except that it has the copyright header cut off.
1131+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
1132+ $(AM_V_GEN)rm -f $@-t $@ && \
1133+ sed -n -e '/_GL_CXXDEFS/,$$p' \
1134+ < $(top_srcdir)/build-aux/c++defs.h \
1135+ > $@-t && \
1136+ mv $@-t $@
1137+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
1138+
1139+CXXDEFS_H=c++defs.h
1140+
1141+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h
1142+
1143+## end gnulib module c++defs
1144+
1145 ## begin gnulib module canonicalize-lgpl
1146
1147
1148@@ -100,8 +148,7 @@ if GL_GENERATE_ERRNO_H
1149 errno.h: errno.in.h $(top_builddir)/config.status
1150 $(AM_V_GEN)rm -f $@-t $@ && \
1151 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
1152- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1153- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1154+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1155 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1156 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1157 -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
1158@@ -142,15 +189,14 @@ BUILT_SOURCES += fcntl.h
1159 fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1160 $(AM_V_GEN)rm -f $@-t $@ && \
1161 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
1162- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1163- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1164+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1165 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1166 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1167 -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
1168- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
1169- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
1170- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
1171- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
1172+ -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
1173+ -e 's|@''GNULIB_NONBLOCKING''@|$(GNULIB_NONBLOCKING)|g' \
1174+ -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
1175+ -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \
1176 -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
1177 -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
1178 -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
1179@@ -297,7 +343,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/co
1180 ## begin gnulib module relocatable-prog-wrapper
1181
1182
1183-EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c
1184+EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c strerror.c
1185
1186 EXTRA_DIST += $(top_srcdir)/build-aux/install-reloc
1187
1188@@ -305,9 +351,10 @@ EXTRA_DIST += $(top_srcdir)/build-aux/in
1189
1190 ## begin gnulib module safe-read
1191
1192-libicrt_a_SOURCES += safe-read.c
1193
1194-EXTRA_DIST += safe-read.h
1195+EXTRA_DIST += safe-read.c safe-read.h
1196+
1197+EXTRA_libicrt_a_SOURCES += safe-read.c
1198
1199 ## end gnulib module safe-read
1200
1201@@ -320,24 +367,20 @@ BUILT_SOURCES += signal.h
1202 signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1203 $(AM_V_GEN)rm -f $@-t $@ && \
1204 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
1205- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1206- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1207+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1208 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1209 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1210 -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
1211- -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
1212- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
1213- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
1214- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
1215+ -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \
1216+ -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \
1217+ -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \
1218 -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
1219- -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
1220 -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
1221 -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
1222 -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
1223 -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \
1224 -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
1225 -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
1226- -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
1227 -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
1228 -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
1229 -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
1230@@ -368,87 +411,6 @@ EXTRA_libicrt_a_SOURCES += sigprocmask.c
1231
1232 ## end gnulib module sigprocmask
1233
1234-## begin gnulib module snippet/_Noreturn
1235-
1236-# Because this Makefile snippet defines a variable used by other
1237-# gnulib Makefile snippets, it must be present in all Makefile.am that
1238-# need it. This is ensured by the applicability 'all' defined above.
1239-
1240-_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h
1241-
1242-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h
1243-
1244-## end gnulib module snippet/_Noreturn
1245-
1246-## begin gnulib module snippet/arg-nonnull
1247-
1248-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
1249-# statements but through direct file reference. Therefore this snippet must be
1250-# present in all Makefile.am that need it. This is ensured by the applicability
1251-# 'all' defined above.
1252-
1253-BUILT_SOURCES += arg-nonnull.h
1254-# The arg-nonnull.h that gets inserted into generated .h files is the same as
1255-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
1256-# off.
1257-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h
1258- $(AM_V_GEN)rm -f $@-t $@ && \
1259- sed -n -e '/GL_ARG_NONNULL/,$$p' \
1260- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
1261- > $@-t && \
1262- mv $@-t $@
1263-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
1264-
1265-ARG_NONNULL_H=arg-nonnull.h
1266-
1267-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h
1268-
1269-## end gnulib module snippet/arg-nonnull
1270-
1271-## begin gnulib module snippet/c++defs
1272-
1273-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
1274-# statements but through direct file reference. Therefore this snippet must be
1275-# present in all Makefile.am that need it. This is ensured by the applicability
1276-# 'all' defined above.
1277-
1278-BUILT_SOURCES += c++defs.h
1279-# The c++defs.h that gets inserted into generated .h files is the same as
1280-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
1281-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h
1282- $(AM_V_GEN)rm -f $@-t $@ && \
1283- sed -n -e '/_GL_CXXDEFS/,$$p' \
1284- < $(top_srcdir)/build-aux/snippet/c++defs.h \
1285- > $@-t && \
1286- mv $@-t $@
1287-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
1288-
1289-CXXDEFS_H=c++defs.h
1290-
1291-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h
1292-
1293-## end gnulib module snippet/c++defs
1294-
1295-## begin gnulib module snippet/warn-on-use
1296-
1297-BUILT_SOURCES += warn-on-use.h
1298-# The warn-on-use.h that gets inserted into generated .h files is the same as
1299-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
1300-# off.
1301-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
1302- $(AM_V_GEN)rm -f $@-t $@ && \
1303- sed -n -e '/^.ifndef/,$$p' \
1304- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \
1305- > $@-t && \
1306- mv $@-t $@
1307-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
1308-
1309-WARN_ON_USE_H=warn-on-use.h
1310-
1311-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h
1312-
1313-## end gnulib module snippet/warn-on-use
1314-
1315 ## begin gnulib module stat
1316
1317
1318@@ -491,8 +453,7 @@ if GL_GENERATE_STDDEF_H
1319 stddef.h: stddef.in.h $(top_builddir)/config.status
1320 $(AM_V_GEN)rm -f $@-t $@ && \
1321 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
1322- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1323- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1324+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1325 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1326 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1327 -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
1328@@ -521,8 +482,7 @@ if GL_GENERATE_STDINT_H
1329 stdint.h: stdint.in.h $(top_builddir)/config.status
1330 $(AM_V_GEN)rm -f $@-t $@ && \
1331 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
1332- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1333- -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
1334+ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
1335 -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1336 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1337 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1338@@ -570,63 +530,62 @@ BUILT_SOURCES += stdio.h
1339 stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1340 $(AM_V_GEN)rm -f $@-t $@ && \
1341 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
1342- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1343- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1344+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1345 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1346 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1347 -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
1348- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
1349- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
1350- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
1351- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
1352- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
1353- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
1354- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
1355- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
1356- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
1357- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
1358- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
1359- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
1360- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
1361- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
1362- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
1363- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
1364- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
1365- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
1366- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
1367- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
1368- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
1369- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
1370- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
1371- -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
1372- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
1373- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
1374- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
1375- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
1376- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
1377- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
1378- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
1379- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
1380- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
1381- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
1382- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
1383- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
1384- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
1385- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
1386- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
1387- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
1388- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
1389- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
1390- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
1391- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
1392- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
1393- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
1394- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
1395- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
1396- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
1397- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
1398- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
1399- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
1400+ -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
1401+ -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
1402+ -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
1403+ -e 's|@''GNULIB_FGETC''@|$(GNULIB_FGETC)|g' \
1404+ -e 's|@''GNULIB_FGETS''@|$(GNULIB_FGETS)|g' \
1405+ -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
1406+ -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
1407+ -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
1408+ -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
1409+ -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
1410+ -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
1411+ -e 's|@''GNULIB_FREAD''@|$(GNULIB_FREAD)|g' \
1412+ -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
1413+ -e 's|@''GNULIB_FSCANF''@|$(GNULIB_FSCANF)|g' \
1414+ -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
1415+ -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
1416+ -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
1417+ -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
1418+ -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
1419+ -e 's|@''GNULIB_GETC''@|$(GNULIB_GETC)|g' \
1420+ -e 's|@''GNULIB_GETCHAR''@|$(GNULIB_GETCHAR)|g' \
1421+ -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
1422+ -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
1423+ -e 's|@''GNULIB_GETS''@|$(GNULIB_GETS)|g' \
1424+ -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
1425+ -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
1426+ -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
1427+ -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
1428+ -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
1429+ -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
1430+ -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
1431+ -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
1432+ -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
1433+ -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
1434+ -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
1435+ -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
1436+ -e 's|@''GNULIB_SCANF''@|$(GNULIB_SCANF)|g' \
1437+ -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
1438+ -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
1439+ -e 's|@''GNULIB_STDIO_H_NONBLOCKING''@|$(GNULIB_STDIO_H_NONBLOCKING)|g' \
1440+ -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
1441+ -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
1442+ -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
1443+ -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
1444+ -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
1445+ -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
1446+ -e 's|@''GNULIB_VFSCANF''@|$(GNULIB_VFSCANF)|g' \
1447+ -e 's|@''GNULIB_VSCANF''@|$(GNULIB_VSCANF)|g' \
1448+ -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
1449+ -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
1450+ -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
1451+ -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
1452 < $(srcdir)/stdio.in.h | \
1453 sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
1454 -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
1455@@ -691,43 +650,41 @@ BUILT_SOURCES += stdlib.h
1456
1457 # We need the following in order to create <stdlib.h> when the system
1458 # doesn't have one that works with the given compiler.
1459-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
1460- $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1461+stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1462 $(AM_V_GEN)rm -f $@-t $@ && \
1463 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
1464- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1465- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1466+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1467 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1468 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1469 -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
1470- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
1471- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
1472- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
1473- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
1474- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
1475- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
1476- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
1477- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
1478- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
1479- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
1480- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
1481- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
1482- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
1483- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
1484- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
1485- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
1486- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
1487- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
1488- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
1489- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
1490- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
1491- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
1492- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
1493- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
1494- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
1495- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
1496- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
1497- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
1498+ -e 's|@''GNULIB__EXIT''@|$(GNULIB__EXIT)|g' \
1499+ -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
1500+ -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
1501+ -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
1502+ -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
1503+ -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
1504+ -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
1505+ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
1506+ -e 's|@''GNULIB_MBTOWC''@|$(GNULIB_MBTOWC)|g' \
1507+ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
1508+ -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
1509+ -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
1510+ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
1511+ -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
1512+ -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
1513+ -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
1514+ -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
1515+ -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
1516+ -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
1517+ -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
1518+ -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
1519+ -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
1520+ -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
1521+ -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
1522+ -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \
1523+ -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
1524+ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
1525+ -e 's|@''GNULIB_WCTOMB''@|$(GNULIB_WCTOMB)|g' \
1526 < $(srcdir)/stdlib.in.h | \
1527 sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
1528 -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
1529@@ -766,7 +723,6 @@ stdlib.h: stdlib.in.h $(top_builddir)/co
1530 -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
1531 -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
1532 -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
1533- -e '/definition of _Noreturn/r $(_NORETURN_H)' \
1534 -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
1535 -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
1536 } > $@-t && \
1537@@ -793,15 +749,6 @@ EXTRA_libicrt_a_SOURCES += strerror.c
1538
1539 ## end gnulib module strerror
1540
1541-## begin gnulib module strerror-override
1542-
1543-
1544-EXTRA_DIST += strerror-override.c strerror-override.h
1545-
1546-EXTRA_libicrt_a_SOURCES += strerror-override.c
1547-
1548-## end gnulib module strerror-override
1549-
1550 ## begin gnulib module string
1551
1552 BUILT_SOURCES += string.h
1553@@ -811,52 +758,47 @@ BUILT_SOURCES += string.h
1554 string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1555 $(AM_V_GEN)rm -f $@-t $@ && \
1556 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
1557- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1558- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1559+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1560 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1561 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1562 -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
1563- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
1564- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
1565- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
1566- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
1567- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
1568- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
1569- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
1570- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
1571- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
1572- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
1573- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
1574- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
1575- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
1576- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
1577- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
1578- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
1579- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
1580- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
1581- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
1582- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
1583- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
1584- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
1585- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
1586- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
1587- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
1588- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
1589- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
1590- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
1591- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
1592- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
1593- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
1594- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
1595- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
1596- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
1597- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
1598- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
1599- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
1600+ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
1601+ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
1602+ -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
1603+ -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
1604+ -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
1605+ -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
1606+ -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
1607+ -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
1608+ -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
1609+ -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
1610+ -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
1611+ -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
1612+ -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
1613+ -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
1614+ -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
1615+ -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
1616+ -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
1617+ -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
1618+ -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
1619+ -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
1620+ -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
1621+ -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
1622+ -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
1623+ -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
1624+ -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
1625+ -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
1626+ -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
1627+ -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
1628+ -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
1629+ -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
1630+ -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
1631+ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
1632+ -e 's|@''GNULIB_STRERROR_R''@|$(GNULIB_STRERROR_R)|g' \
1633+ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
1634+ -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
1635 < $(srcdir)/string.in.h | \
1636- sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
1637- -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
1638- -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
1639+ sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
1640 -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
1641 -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
1642 -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
1643@@ -912,23 +854,22 @@ sys/stat.h: sys_stat.in.h $(top_builddir
1644 $(AM_V_at)$(MKDIR_P) sys
1645 $(AM_V_GEN)rm -f $@-t $@ && \
1646 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
1647- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1648- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1649+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1650 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1651 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1652 -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
1653- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
1654- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
1655- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
1656- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
1657- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
1658- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
1659- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
1660- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
1661- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
1662- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
1663- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
1664- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
1665+ -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
1666+ -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
1667+ -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
1668+ -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
1669+ -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
1670+ -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
1671+ -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
1672+ -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
1673+ -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
1674+ -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
1675+ -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
1676+ -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
1677 -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
1678 -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
1679 -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
1680@@ -971,16 +912,15 @@ BUILT_SOURCES += time.h
1681 time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1682 $(AM_V_GEN)rm -f $@-t $@ && \
1683 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
1684- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1685- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1686+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1687 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1688 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1689 -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
1690- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
1691- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
1692- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
1693- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
1694- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
1695+ -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
1696+ -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
1697+ -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
1698+ -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
1699+ -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
1700 -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
1701 -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
1702 -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
1703@@ -1013,56 +953,55 @@ BUILT_SOURCES += unistd.h
1704 unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
1705 $(AM_V_GEN)rm -f $@-t $@ && \
1706 { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
1707- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
1708- -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
1709+ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
1710 -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
1711 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
1712 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
1713 -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
1714- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
1715- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
1716- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
1717- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
1718- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
1719- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
1720- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
1721- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
1722- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
1723- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
1724- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
1725- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
1726- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
1727- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
1728- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
1729- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
1730- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
1731- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
1732- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
1733- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
1734- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
1735- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
1736- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
1737- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
1738- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
1739- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
1740- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
1741- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
1742- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
1743- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
1744- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
1745- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
1746- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
1747- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
1748- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
1749- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
1750- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
1751- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/$(GNULIB_UNISTD_H_GETOPT)/g' \
1752- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
1753- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
1754- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
1755- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
1756- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
1757- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
1758+ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
1759+ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
1760+ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
1761+ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
1762+ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
1763+ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
1764+ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
1765+ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
1766+ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
1767+ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
1768+ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
1769+ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
1770+ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
1771+ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
1772+ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
1773+ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
1774+ -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
1775+ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
1776+ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
1777+ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
1778+ -e 's|@''GNULIB_GROUP_MEMBER''@|$(GNULIB_GROUP_MEMBER)|g' \
1779+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
1780+ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
1781+ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
1782+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
1783+ -e 's|@''GNULIB_PIPE''@|$(GNULIB_PIPE)|g' \
1784+ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
1785+ -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
1786+ -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
1787+ -e 's|@''GNULIB_READ''@|$(GNULIB_READ)|g' \
1788+ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
1789+ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
1790+ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
1791+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
1792+ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
1793+ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
1794+ -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
1795+ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
1796+ -e 's|@''GNULIB_UNISTD_H_NONBLOCKING''@|$(GNULIB_UNISTD_H_NONBLOCKING)|g' \
1797+ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
1798+ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
1799+ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
1800+ -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
1801+ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
1802 < $(srcdir)/unistd.in.h | \
1803 sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
1804 -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
1805@@ -1198,6 +1137,25 @@ EXTRA_DIST += verify.h
1806
1807 ## end gnulib module verify
1808
1809+## begin gnulib module warn-on-use
1810+
1811+BUILT_SOURCES += warn-on-use.h
1812+# The warn-on-use.h that gets inserted into generated .h files is the same as
1813+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
1814+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
1815+ $(AM_V_GEN)rm -f $@-t $@ && \
1816+ sed -n -e '/^.ifndef/,$$p' \
1817+ < $(top_srcdir)/build-aux/warn-on-use.h \
1818+ > $@-t && \
1819+ mv $@-t $@
1820+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
1821+
1822+WARN_ON_USE_H=warn-on-use.h
1823+
1824+EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h
1825+
1826+## end gnulib module warn-on-use
1827+
1828 ## begin gnulib module xalloc
1829
1830 libicrt_a_SOURCES += xalloc.h xmalloc.c xstrdup.c
1831diff -Naurp libiconv-1.14.org//srclib/pathmax.h libiconv-1.14/srclib/pathmax.h
1832--- libiconv-1.14.org//srclib/pathmax.h 2011-08-07 06:42:06.000000000 -0700
1833+++ libiconv-1.14/srclib/pathmax.h 2012-01-08 02:07:40.218484451 -0800
1834@@ -19,27 +19,6 @@
1835 #ifndef _PATHMAX_H
1836 # define _PATHMAX_H
1837
1838-/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename,
1839- including the terminating NUL byte.
1840- <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html>
1841- PATH_MAX is not defined on systems which have no limit on filename length,
1842- such as GNU/Hurd.
1843-
1844- This file does *not* define PATH_MAX always. Programs that use this file
1845- can handle the GNU/Hurd case in several ways:
1846- - Either with a package-wide handling, or with a per-file handling,
1847- - Either through a
1848- #ifdef PATH_MAX
1849- or through a fallback like
1850- #ifndef PATH_MAX
1851- # define PATH_MAX 8192
1852- #endif
1853- or through a fallback like
1854- #ifndef PATH_MAX
1855- # define PATH_MAX pathconf ("/", _PC_PATH_MAX)
1856- #endif
1857- */
1858-
1859 # include <unistd.h>
1860
1861 # include <limits.h>
1862@@ -48,6 +27,11 @@
1863 # define _POSIX_PATH_MAX 256
1864 # endif
1865
1866+# if !defined PATH_MAX && defined _PC_PATH_MAX && defined HAVE_PATHCONF
1867+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 \
1868+ : pathconf ("/", _PC_PATH_MAX))
1869+# endif
1870+
1871 /* Don't include sys/param.h if it already has been. */
1872 # if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
1873 # include <sys/param.h>
1874@@ -57,13 +41,8 @@
1875 # define PATH_MAX MAXPATHLEN
1876 # endif
1877
1878-# ifdef __hpux
1879-/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename,
1880- *not* including the terminating NUL byte, and is set to 1023.
1881- Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is
1882- not defined at all any more. */
1883-# undef PATH_MAX
1884-# define PATH_MAX 1024
1885+# ifndef PATH_MAX
1886+# define PATH_MAX _POSIX_PATH_MAX
1887 # endif
1888
1889 #endif /* _PATHMAX_H */
1890diff -Naurp libiconv-1.14.org//srclib/relocwrapper.c libiconv-1.14/srclib/relocwrapper.c
1891--- libiconv-1.14.org//srclib/relocwrapper.c 2011-08-07 06:42:06.000000000 -0700
1892+++ libiconv-1.14/srclib/relocwrapper.c 2012-01-08 02:07:40.282484455 -0800
1893@@ -29,6 +29,7 @@
1894 -> relocatable
1895 -> setenv
1896 -> malloca
1897+ -> strerror
1898 -> c-ctype
1899
1900 Macros that need to be set while compiling this file:
1901diff -Naurp libiconv-1.14.org//srclib/safe-read.h libiconv-1.14/srclib/safe-read.h
1902--- libiconv-1.14.org//srclib/safe-read.h 2011-08-07 06:42:06.000000000 -0700
1903+++ libiconv-1.14/srclib/safe-read.h 2012-01-08 02:07:40.298484455 -0800
1904@@ -14,19 +14,6 @@
1905 You should have received a copy of the GNU General Public License
1906 along with this program. If not, see <http://www.gnu.org/licenses/>. */
1907
1908-/* Some system calls may be interrupted and fail with errno = EINTR in the
1909- following situations:
1910- - The process is stopped and restarted (signal SIGSTOP and SIGCONT, user
1911- types Ctrl-Z) on some platforms: MacOS X.
1912- - The process receives a signal for which a signal handler was installed
1913- with sigaction() with an sa_flags field that does not contain
1914- SA_RESTART.
1915- - The process receives a signal for which a signal handler was installed
1916- with signal() and for which no call to siginterrupt(sig,0) was done,
1917- on some platforms: AIX, HP-UX, IRIX, OSF/1, Solaris.
1918-
1919- This module provides a wrapper around read() that handles EINTR. */
1920-
1921 #include <stddef.h>
1922
1923 #ifdef __cplusplus
1924diff -Naurp libiconv-1.14.org//srclib/signal.in.h libiconv-1.14/srclib/signal.in.h
1925--- libiconv-1.14.org//srclib/signal.in.h 2011-08-07 06:42:06.000000000 -0700
1926+++ libiconv-1.14/srclib/signal.in.h 2012-01-08 02:07:40.314484456 -0800
1927@@ -20,49 +20,21 @@
1928 #endif
1929 @PRAGMA_COLUMNS@
1930
1931-#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _GL_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T)
1932-/* Special invocation convention:
1933- - Inside glibc header files.
1934- - On glibc systems we have a sequence of nested includes
1935- <signal.h> -> <ucontext.h> -> <signal.h>.
1936- In this situation, the functions are not yet declared, therefore we cannot
1937- provide the C++ aliases.
1938- - On glibc systems with GCC 4.3 we have a sequence of nested includes
1939- <csignal> -> </usr/include/signal.h> -> <sys/ucontext.h> -> <signal.h>.
1940- In this situation, some of the functions are not yet declared, therefore
1941- we cannot provide the C++ aliases. */
1942+#if defined __need_sig_atomic_t || defined __need_sigset_t
1943+/* Special invocation convention inside glibc header files. */
1944
1945 # @INCLUDE_NEXT@ @NEXT_SIGNAL_H@
1946
1947 #else
1948 /* Normal invocation convention. */
1949
1950-#ifndef _@GUARD_PREFIX@_SIGNAL_H
1951-
1952-#define _GL_ALREADY_INCLUDING_SIGNAL_H
1953-
1954-/* Define pid_t, uid_t.
1955- Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.
1956- On Solaris 10, <signal.h> includes <sys/types.h>, which eventually includes
1957- us; so include <sys/types.h> now, before the second inclusion guard. */
1958-#include <sys/types.h>
1959+#ifndef _GL_SIGNAL_H
1960
1961 /* The include_next requires a split double-inclusion guard. */
1962 #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
1963
1964-#undef _GL_ALREADY_INCLUDING_SIGNAL_H
1965-
1966-#ifndef _@GUARD_PREFIX@_SIGNAL_H
1967-#define _@GUARD_PREFIX@_SIGNAL_H
1968-
1969-/* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
1970- pthread_sigmask in <pthread.h>, not in <signal.h>.
1971- But avoid namespace pollution on glibc systems.*/
1972-#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
1973- && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \
1974- && ! defined __GLIBC__
1975-# include <pthread.h>
1976-#endif
1977+#ifndef _GL_SIGNAL_H
1978+#define _GL_SIGNAL_H
1979
1980 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
1981
1982@@ -70,6 +42,10 @@
1983
1984 /* The definition of _GL_WARN_ON_USE is copied here. */
1985
1986+/* Define pid_t, uid_t.
1987+ Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */
1988+#include <sys/types.h>
1989+
1990 /* On AIX, sig_atomic_t already includes volatile. C99 requires that
1991 'volatile sig_atomic_t' ignore the extra modifier, but C89 did not.
1992 Hence, redefine this to a non-volatile type as needed. */
1993@@ -124,34 +100,6 @@ typedef void (*sighandler_t) (int);
1994 #endif
1995
1996
1997-#if @GNULIB_PTHREAD_SIGMASK@
1998-# if @REPLACE_PTHREAD_SIGMASK@
1999-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
2000-# undef pthread_sigmask
2001-# define pthread_sigmask rpl_pthread_sigmask
2002-# endif
2003-_GL_FUNCDECL_RPL (pthread_sigmask, int,
2004- (int how, const sigset_t *new_mask, sigset_t *old_mask));
2005-_GL_CXXALIAS_RPL (pthread_sigmask, int,
2006- (int how, const sigset_t *new_mask, sigset_t *old_mask));
2007-# else
2008-# if !@HAVE_PTHREAD_SIGMASK@
2009-_GL_FUNCDECL_SYS (pthread_sigmask, int,
2010- (int how, const sigset_t *new_mask, sigset_t *old_mask));
2011-# endif
2012-_GL_CXXALIAS_SYS (pthread_sigmask, int,
2013- (int how, const sigset_t *new_mask, sigset_t *old_mask));
2014-# endif
2015-_GL_CXXALIASWARN (pthread_sigmask);
2016-#elif defined GNULIB_POSIXCHECK
2017-# undef pthread_sigmask
2018-# if HAVE_RAW_DECL_PTHREAD_SIGMASK
2019-_GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - "
2020- "use gnulib module pthread_sigmask for portability");
2021-# endif
2022-#endif
2023-
2024-
2025 #if @GNULIB_SIGPROCMASK@
2026 # if !@HAVE_POSIX_SIGNALBLOCKING@
2027
2028@@ -423,6 +371,6 @@ _GL_WARN_ON_USE (sigaction, "sigaction i
2029 #endif
2030
2031
2032-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
2033-#endif /* _@GUARD_PREFIX@_SIGNAL_H */
2034+#endif /* _GL_SIGNAL_H */
2035+#endif /* _GL_SIGNAL_H */
2036 #endif
2037diff -Naurp libiconv-1.14.org//srclib/stat.c libiconv-1.14/srclib/stat.c
2038--- libiconv-1.14.org//srclib/stat.c 2011-08-07 06:42:06.000000000 -0700
2039+++ libiconv-1.14/srclib/stat.c 2012-01-08 02:07:40.330484457 -0800
2040@@ -38,7 +38,6 @@ orig_stat (const char *filename, struct
2041 #include <stdbool.h>
2042 #include <string.h>
2043 #include "dosname.h"
2044-#include "verify.h"
2045
2046 /* Store information about NAME into ST. Work around bugs with
2047 trailing slashes. Mingw has other bugs (such as st_ino always
2048@@ -64,12 +63,6 @@ rpl_stat (char const *name, struct stat
2049 }
2050 #endif /* REPLACE_FUNC_STAT_FILE */
2051 #if REPLACE_FUNC_STAT_DIR
2052- /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also
2053- have a constant PATH_MAX. */
2054-# ifndef PATH_MAX
2055-# error "Please port this replacement to your platform"
2056-# endif
2057-
2058 if (result == -1 && errno == ENOENT)
2059 {
2060 /* Due to mingw's oddities, there are some directories (like
2061@@ -84,7 +77,6 @@ rpl_stat (char const *name, struct stat
2062 char fixed_name[PATH_MAX + 1] = {0};
2063 size_t len = strlen (name);
2064 bool check_dir = false;
2065- verify (PATH_MAX <= 4096);
2066 if (PATH_MAX <= len)
2067 errno = ENAMETOOLONG;
2068 else if (len)
2069diff -Naurp libiconv-1.14.org//srclib/stddef.in.h libiconv-1.14/srclib/stddef.in.h
2070--- libiconv-1.14.org//srclib/stddef.in.h 2011-08-07 06:42:06.000000000 -0700
2071+++ libiconv-1.14/srclib/stddef.in.h 2012-01-08 02:07:40.346484458 -0800
2072@@ -38,9 +38,9 @@
2073 remember if special invocation has ever been used to obtain wint_t,
2074 in which case we need to clean up NULL yet again. */
2075
2076-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
2077+# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
2078 # ifdef __need_wint_t
2079-# undef _@GUARD_PREFIX@_STDDEF_H
2080+# undef _GL_STDDEF_H
2081 # define _GL_STDDEF_WINT_T
2082 # endif
2083 # @INCLUDE_NEXT@ @NEXT_STDDEF_H@
2084@@ -49,14 +49,14 @@
2085 #else
2086 /* Normal invocation convention. */
2087
2088-# ifndef _@GUARD_PREFIX@_STDDEF_H
2089+# ifndef _GL_STDDEF_H
2090
2091 /* The include_next requires a split double-inclusion guard. */
2092
2093 # @INCLUDE_NEXT@ @NEXT_STDDEF_H@
2094
2095-# ifndef _@GUARD_PREFIX@_STDDEF_H
2096-# define _@GUARD_PREFIX@_STDDEF_H
2097+# ifndef _GL_STDDEF_H
2098+# define _GL_STDDEF_H
2099
2100 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */
2101 #if @REPLACE_NULL@
2102@@ -82,6 +82,6 @@
2103 # define wchar_t int
2104 #endif
2105
2106-# endif /* _@GUARD_PREFIX@_STDDEF_H */
2107-# endif /* _@GUARD_PREFIX@_STDDEF_H */
2108+# endif /* _GL_STDDEF_H */
2109+# endif /* _GL_STDDEF_H */
2110 #endif /* __need_XXX */
2111diff -Naurp libiconv-1.14.org//srclib/stdint.in.h libiconv-1.14/srclib/stdint.in.h
2112--- libiconv-1.14.org//srclib/stdint.in.h 2011-08-07 06:42:06.000000000 -0700
2113+++ libiconv-1.14/srclib/stdint.in.h 2012-01-08 02:07:40.358484458 -0800
2114@@ -21,7 +21,7 @@
2115 * <http://www.opengroup.org/susv3xbd/stdint.h.html>
2116 */
2117
2118-#ifndef _@GUARD_PREFIX@_STDINT_H
2119+#ifndef _GL_STDINT_H
2120
2121 #if __GNUC__ >= 3
2122 @PRAGMA_SYSTEM_HEADER@
2123@@ -52,13 +52,13 @@
2124 /* Other systems may have an incomplete or buggy <stdint.h>.
2125 Include it before <inttypes.h>, since any "#include <stdint.h>"
2126 in <inttypes.h> would reinclude us, skipping our contents because
2127- _@GUARD_PREFIX@_STDINT_H is defined.
2128+ _GL_STDINT_H is defined.
2129 The include_next requires a split double-inclusion guard. */
2130 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
2131 #endif
2132
2133-#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
2134-#define _@GUARD_PREFIX@_STDINT_H
2135+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
2136+#define _GL_STDINT_H
2137
2138 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
2139 IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
2140@@ -270,36 +270,26 @@ typedef unsigned long int gl_uintptr_t;
2141 /* Note: These types are compiler dependent. It may be unwise to use them in
2142 public header files. */
2143
2144-/* If the system defines INTMAX_MAX, assume that intmax_t works, and
2145- similarly for UINTMAX_MAX and uintmax_t. This avoids problems with
2146- assuming one type where another is used by the system. */
2147-
2148-#ifndef INTMAX_MAX
2149-# undef INTMAX_C
2150-# undef intmax_t
2151-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
2152+#undef intmax_t
2153+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
2154 typedef long long int gl_intmax_t;
2155-# define intmax_t gl_intmax_t
2156-# elif defined GL_INT64_T
2157-# define intmax_t int64_t
2158-# else
2159+# define intmax_t gl_intmax_t
2160+#elif defined GL_INT64_T
2161+# define intmax_t int64_t
2162+#else
2163 typedef long int gl_intmax_t;
2164-# define intmax_t gl_intmax_t
2165-# endif
2166+# define intmax_t gl_intmax_t
2167 #endif
2168
2169-#ifndef UINTMAX_MAX
2170-# undef UINTMAX_C
2171-# undef uintmax_t
2172-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
2173+#undef uintmax_t
2174+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
2175 typedef unsigned long long int gl_uintmax_t;
2176-# define uintmax_t gl_uintmax_t
2177-# elif defined GL_UINT64_T
2178-# define uintmax_t uint64_t
2179-# else
2180+# define uintmax_t gl_uintmax_t
2181+#elif defined GL_UINT64_T
2182+# define uintmax_t uint64_t
2183+#else
2184 typedef unsigned long int gl_uintmax_t;
2185-# define uintmax_t gl_uintmax_t
2186-# endif
2187+# define uintmax_t gl_uintmax_t
2188 #endif
2189
2190 /* Verify that intmax_t and uintmax_t have the same size. Too much code
2191@@ -441,23 +431,21 @@ typedef int _verify_intmax_size[sizeof (
2192
2193 /* 7.18.2.5. Limits of greatest-width integer types */
2194
2195-#ifndef INTMAX_MAX
2196-# undef INTMAX_MIN
2197-# ifdef INT64_MAX
2198-# define INTMAX_MIN INT64_MIN
2199-# define INTMAX_MAX INT64_MAX
2200-# else
2201-# define INTMAX_MIN INT32_MIN
2202-# define INTMAX_MAX INT32_MAX
2203-# endif
2204+#undef INTMAX_MIN
2205+#undef INTMAX_MAX
2206+#ifdef INT64_MAX
2207+# define INTMAX_MIN INT64_MIN
2208+# define INTMAX_MAX INT64_MAX
2209+#else
2210+# define INTMAX_MIN INT32_MIN
2211+# define INTMAX_MAX INT32_MAX
2212 #endif
2213
2214-#ifndef UINTMAX_MAX
2215-# ifdef UINT64_MAX
2216-# define UINTMAX_MAX UINT64_MAX
2217-# else
2218-# define UINTMAX_MAX UINT32_MAX
2219-# endif
2220+#undef UINTMAX_MAX
2221+#ifdef UINT64_MAX
2222+# define UINTMAX_MAX UINT64_MAX
2223+#else
2224+# define UINTMAX_MAX UINT32_MAX
2225 #endif
2226
2227 /* 7.18.3. Limits of other integer types */
2228@@ -580,27 +568,25 @@ typedef int _verify_intmax_size[sizeof (
2229
2230 /* 7.18.4.2. Macros for greatest-width integer constants */
2231
2232-#ifndef INTMAX_C
2233-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
2234-# define INTMAX_C(x) x##LL
2235-# elif defined GL_INT64_T
2236-# define INTMAX_C(x) INT64_C(x)
2237-# else
2238-# define INTMAX_C(x) x##L
2239-# endif
2240+#undef INTMAX_C
2241+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
2242+# define INTMAX_C(x) x##LL
2243+#elif defined GL_INT64_T
2244+# define INTMAX_C(x) INT64_C(x)
2245+#else
2246+# define INTMAX_C(x) x##L
2247 #endif
2248
2249-#ifndef UINTMAX_C
2250-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
2251-# define UINTMAX_C(x) x##ULL
2252-# elif defined GL_UINT64_T
2253-# define UINTMAX_C(x) UINT64_C(x)
2254-# else
2255-# define UINTMAX_C(x) x##UL
2256-# endif
2257+#undef UINTMAX_C
2258+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
2259+# define UINTMAX_C(x) x##ULL
2260+#elif defined GL_UINT64_T
2261+# define UINTMAX_C(x) UINT64_C(x)
2262+#else
2263+# define UINTMAX_C(x) x##UL
2264 #endif
2265
2266 #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
2267
2268-#endif /* _@GUARD_PREFIX@_STDINT_H */
2269-#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
2270+#endif /* _GL_STDINT_H */
2271+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
2272diff -Naurp libiconv-1.14.org//srclib/stdio.in.h libiconv-1.14/srclib/stdio.in.h
2273--- libiconv-1.14.org//srclib/stdio.in.h 2011-08-07 06:42:06.000000000 -0700
2274+++ libiconv-1.14/srclib/stdio.in.h 2012-01-08 02:07:40.378484459 -0800
2275@@ -35,7 +35,7 @@
2276 #else
2277 /* Normal invocation convention. */
2278
2279-#ifndef _@GUARD_PREFIX@_STDIO_H
2280+#ifndef _GL_STDIO_H
2281
2282 #define _GL_ALREADY_INCLUDING_STDIO_H
2283
2284@@ -44,8 +44,8 @@
2285
2286 #undef _GL_ALREADY_INCLUDING_STDIO_H
2287
2288-#ifndef _@GUARD_PREFIX@_STDIO_H
2289-#define _@GUARD_PREFIX@_STDIO_H
2290+#ifndef _GL_STDIO_H
2291+#define _GL_STDIO_H
2292
2293 /* Get va_list. Needed on many systems, including glibc 2.8. */
2294 #include <stdarg.h>
2295@@ -461,6 +461,25 @@ _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp
2296 _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
2297 # endif
2298 _GL_CXXALIASWARN (fseeko);
2299+# if (@REPLACE_FSEEKO@ || !@HAVE_FSEEKO@) && !@GNULIB_FSEEK@
2300+ /* Provide an fseek function that is consistent with fseeko. */
2301+ /* In order to avoid that fseek gets defined as a macro here, the
2302+ developer can request the 'fseek' module. */
2303+# if !GNULIB_defined_fseek_function
2304+# undef fseek
2305+# define fseek rpl_fseek
2306+static inline int _GL_ARG_NONNULL ((1))
2307+rpl_fseek (FILE *fp, long offset, int whence)
2308+{
2309+# if @REPLACE_FSEEKO@
2310+ return rpl_fseeko (fp, offset, whence);
2311+# else
2312+ return fseeko (fp, offset, whence);
2313+# endif
2314+}
2315+# define GNULIB_defined_fseek_function 1
2316+# endif
2317+# endif
2318 #elif defined GNULIB_POSIXCHECK
2319 # define _GL_FSEEK_WARN /* Category 1, above. */
2320 # undef fseek
2321@@ -520,6 +539,25 @@ _GL_FUNCDECL_SYS (ftello, off_t, (FILE *
2322 _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp));
2323 # endif
2324 _GL_CXXALIASWARN (ftello);
2325+# if (@REPLACE_FTELLO@ || !@HAVE_FTELLO@) && !@GNULIB_FTELL@
2326+ /* Provide an ftell function that is consistent with ftello. */
2327+ /* In order to avoid that ftell gets defined as a macro here, the
2328+ developer can request the 'ftell' module. */
2329+# if !GNULIB_defined_ftell_function
2330+# undef ftell
2331+# define ftell rpl_ftell
2332+static inline long _GL_ARG_NONNULL ((1))
2333+rpl_ftell (FILE *f)
2334+{
2335+# if @REPLACE_FTELLO@
2336+ return rpl_ftello (f);
2337+# else
2338+ return ftello (f);
2339+# endif
2340+}
2341+# define GNULIB_defined_ftell_function 1
2342+# endif
2343+# endif
2344 #elif defined GNULIB_POSIXCHECK
2345 # define _GL_FTELL_WARN /* Category 1, above. */
2346 # undef ftell
2347@@ -1307,6 +1345,6 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is
2348 #endif
2349
2350
2351-#endif /* _@GUARD_PREFIX@_STDIO_H */
2352-#endif /* _@GUARD_PREFIX@_STDIO_H */
2353+#endif /* _GL_STDIO_H */
2354+#endif /* _GL_STDIO_H */
2355 #endif
2356diff -Naurp libiconv-1.14.org//srclib/stdlib.in.h libiconv-1.14/srclib/stdlib.in.h
2357--- libiconv-1.14.org//srclib/stdlib.in.h 2011-08-07 06:42:06.000000000 -0700
2358+++ libiconv-1.14/srclib/stdlib.in.h 2012-01-08 02:07:40.390484459 -0800
2359@@ -28,13 +28,13 @@
2360 #else
2361 /* Normal invocation convention. */
2362
2363-#ifndef _@GUARD_PREFIX@_STDLIB_H
2364+#ifndef _GL_STDLIB_H
2365
2366 /* The include_next requires a split double-inclusion guard. */
2367 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
2368
2369-#ifndef _@GUARD_PREFIX@_STDLIB_H
2370-#define _@GUARD_PREFIX@_STDLIB_H
2371+#ifndef _GL_STDLIB_H
2372+#define _GL_STDLIB_H
2373
2374 /* NetBSD 5.0 mis-defines NULL. */
2375 #include <stddef.h>
2376@@ -89,7 +89,11 @@ struct random_data
2377 # include <unistd.h>
2378 #endif
2379
2380-/* The definition of _Noreturn is copied here. */
2381+#if 3 <= __GNUC__ || __GNUC__ == 2 && 8 <= __GNUC_MINOR__
2382+# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
2383+#else
2384+# define _GL_ATTRIBUTE_NORETURN
2385+#endif
2386
2387 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
2388
2389@@ -116,7 +120,7 @@ struct random_data
2390 /* Terminate the current process with the given return code, without running
2391 the 'atexit' handlers. */
2392 # if !@HAVE__EXIT@
2393-_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
2394+_GL_FUNCDECL_SYS (_Exit, void, (int status) _GL_ATTRIBUTE_NORETURN);
2395 # endif
2396 _GL_CXXALIAS_SYS (_Exit, void, (int status));
2397 _GL_CXXALIASWARN (_Exit);
2398@@ -757,6 +761,6 @@ _GL_CXXALIASWARN (wctomb);
2399 #endif
2400
2401
2402-#endif /* _@GUARD_PREFIX@_STDLIB_H */
2403-#endif /* _@GUARD_PREFIX@_STDLIB_H */
2404+#endif /* _GL_STDLIB_H */
2405+#endif /* _GL_STDLIB_H */
2406 #endif
2407diff -Naurp libiconv-1.14.org//srclib/strerror.c libiconv-1.14/srclib/strerror.c
2408--- libiconv-1.14.org//srclib/strerror.c 2011-08-07 06:42:06.000000000 -0700
2409+++ libiconv-1.14/srclib/strerror.c 2012-01-08 02:07:40.406484461 -0800
2410@@ -17,54 +17,340 @@
2411
2412 #include <config.h>
2413
2414-/* Specification. */
2415 #include <string.h>
2416
2417-#include <errno.h>
2418-#include <stdio.h>
2419-#include <stdlib.h>
2420-#include <string.h>
2421+#if REPLACE_STRERROR
2422+
2423+# include <errno.h>
2424+# include <stdio.h>
2425+
2426+# if GNULIB_defined_ESOCK /* native Windows platforms */
2427+# if HAVE_WINSOCK2_H
2428+# include <winsock2.h>
2429+# endif
2430+# endif
2431
2432-#include "intprops.h"
2433-#include "strerror-override.h"
2434-#include "verify.h"
2435+# include "intprops.h"
2436
2437 /* Use the system functions, not the gnulib overrides in this file. */
2438-#undef sprintf
2439+# undef sprintf
2440+
2441+# undef strerror
2442+# if ! HAVE_DECL_STRERROR
2443+# define strerror(n) NULL
2444+# endif
2445
2446 char *
2447-strerror (int n)
2448-#undef strerror
2449+rpl_strerror (int n)
2450 {
2451- static char buf[STACKBUF_LEN];
2452- size_t len;
2453+ char const *msg = NULL;
2454+ /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */
2455+ switch (n)
2456+ {
2457+# if GNULIB_defined_ETXTBSY
2458+ case ETXTBSY:
2459+ msg = "Text file busy";
2460+ break;
2461+# endif
2462+
2463+# if GNULIB_defined_ESOCK /* native Windows platforms */
2464+ /* EWOULDBLOCK is the same as EAGAIN. */
2465+ case EINPROGRESS:
2466+ msg = "Operation now in progress";
2467+ break;
2468+ case EALREADY:
2469+ msg = "Operation already in progress";
2470+ break;
2471+ case ENOTSOCK:
2472+ msg = "Socket operation on non-socket";
2473+ break;
2474+ case EDESTADDRREQ:
2475+ msg = "Destination address required";
2476+ break;
2477+ case EMSGSIZE:
2478+ msg = "Message too long";
2479+ break;
2480+ case EPROTOTYPE:
2481+ msg = "Protocol wrong type for socket";
2482+ break;
2483+ case ENOPROTOOPT:
2484+ msg = "Protocol not available";
2485+ break;
2486+ case EPROTONOSUPPORT:
2487+ msg = "Protocol not supported";
2488+ break;
2489+ case ESOCKTNOSUPPORT:
2490+ msg = "Socket type not supported";
2491+ break;
2492+ case EOPNOTSUPP:
2493+ msg = "Operation not supported";
2494+ break;
2495+ case EPFNOSUPPORT:
2496+ msg = "Protocol family not supported";
2497+ break;
2498+ case EAFNOSUPPORT:
2499+ msg = "Address family not supported by protocol";
2500+ break;
2501+ case EADDRINUSE:
2502+ msg = "Address already in use";
2503+ break;
2504+ case EADDRNOTAVAIL:
2505+ msg = "Cannot assign requested address";
2506+ break;
2507+ case ENETDOWN:
2508+ msg = "Network is down";
2509+ break;
2510+ case ENETUNREACH:
2511+ msg = "Network is unreachable";
2512+ break;
2513+ case ENETRESET:
2514+ msg = "Network dropped connection on reset";
2515+ break;
2516+ case ECONNABORTED:
2517+ msg = "Software caused connection abort";
2518+ break;
2519+ case ECONNRESET:
2520+ msg = "Connection reset by peer";
2521+ break;
2522+ case ENOBUFS:
2523+ msg = "No buffer space available";
2524+ break;
2525+ case EISCONN:
2526+ msg = "Transport endpoint is already connected";
2527+ break;
2528+ case ENOTCONN:
2529+ msg = "Transport endpoint is not connected";
2530+ break;
2531+ case ESHUTDOWN:
2532+ msg = "Cannot send after transport endpoint shutdown";
2533+ break;
2534+ case ETOOMANYREFS:
2535+ msg = "Too many references: cannot splice";
2536+ break;
2537+ case ETIMEDOUT:
2538+ msg = "Connection timed out";
2539+ break;
2540+ case ECONNREFUSED:
2541+ msg = "Connection refused";
2542+ break;
2543+ case ELOOP:
2544+ msg = "Too many levels of symbolic links";
2545+ break;
2546+ case EHOSTDOWN:
2547+ msg = "Host is down";
2548+ break;
2549+ case EHOSTUNREACH:
2550+ msg = "No route to host";
2551+ break;
2552+ case EPROCLIM:
2553+ msg = "Too many processes";
2554+ break;
2555+ case EUSERS:
2556+ msg = "Too many users";
2557+ break;
2558+ case EDQUOT:
2559+ msg = "Disk quota exceeded";
2560+ break;
2561+ case ESTALE:
2562+ msg = "Stale NFS file handle";
2563+ break;
2564+ case EREMOTE:
2565+ msg = "Object is remote";
2566+ break;
2567+# if HAVE_WINSOCK2_H
2568+ /* WSA_INVALID_HANDLE maps to EBADF */
2569+ /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
2570+ /* WSA_INVALID_PARAMETER maps to EINVAL */
2571+ case WSA_OPERATION_ABORTED:
2572+ msg = "Overlapped operation aborted";
2573+ break;
2574+ case WSA_IO_INCOMPLETE:
2575+ msg = "Overlapped I/O event object not in signaled state";
2576+ break;
2577+ case WSA_IO_PENDING:
2578+ msg = "Overlapped operations will complete later";
2579+ break;
2580+ /* WSAEINTR maps to EINTR */
2581+ /* WSAEBADF maps to EBADF */
2582+ /* WSAEACCES maps to EACCES */
2583+ /* WSAEFAULT maps to EFAULT */
2584+ /* WSAEINVAL maps to EINVAL */
2585+ /* WSAEMFILE maps to EMFILE */
2586+ /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
2587+ /* WSAEINPROGRESS is EINPROGRESS */
2588+ /* WSAEALREADY is EALREADY */
2589+ /* WSAENOTSOCK is ENOTSOCK */
2590+ /* WSAEDESTADDRREQ is EDESTADDRREQ */
2591+ /* WSAEMSGSIZE is EMSGSIZE */
2592+ /* WSAEPROTOTYPE is EPROTOTYPE */
2593+ /* WSAENOPROTOOPT is ENOPROTOOPT */
2594+ /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */
2595+ /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
2596+ /* WSAEOPNOTSUPP is EOPNOTSUPP */
2597+ /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
2598+ /* WSAEAFNOSUPPORT is EAFNOSUPPORT */
2599+ /* WSAEADDRINUSE is EADDRINUSE */
2600+ /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */
2601+ /* WSAENETDOWN is ENETDOWN */
2602+ /* WSAENETUNREACH is ENETUNREACH */
2603+ /* WSAENETRESET is ENETRESET */
2604+ /* WSAECONNABORTED is ECONNABORTED */
2605+ /* WSAECONNRESET is ECONNRESET */
2606+ /* WSAENOBUFS is ENOBUFS */
2607+ /* WSAEISCONN is EISCONN */
2608+ /* WSAENOTCONN is ENOTCONN */
2609+ /* WSAESHUTDOWN is ESHUTDOWN */
2610+ /* WSAETOOMANYREFS is ETOOMANYREFS */
2611+ /* WSAETIMEDOUT is ETIMEDOUT */
2612+ /* WSAECONNREFUSED is ECONNREFUSED */
2613+ /* WSAELOOP is ELOOP */
2614+ /* WSAENAMETOOLONG maps to ENAMETOOLONG */
2615+ /* WSAEHOSTDOWN is EHOSTDOWN */
2616+ /* WSAEHOSTUNREACH is EHOSTUNREACH */
2617+ /* WSAENOTEMPTY maps to ENOTEMPTY */
2618+ /* WSAEPROCLIM is EPROCLIM */
2619+ /* WSAEUSERS is EUSERS */
2620+ /* WSAEDQUOT is EDQUOT */
2621+ /* WSAESTALE is ESTALE */
2622+ /* WSAEREMOTE is EREMOTE */
2623+ case WSASYSNOTREADY:
2624+ msg = "Network subsystem is unavailable";
2625+ break;
2626+ case WSAVERNOTSUPPORTED:
2627+ msg = "Winsock.dll version out of range";
2628+ break;
2629+ case WSANOTINITIALISED:
2630+ msg = "Successful WSAStartup not yet performed";
2631+ break;
2632+ case WSAEDISCON:
2633+ msg = "Graceful shutdown in progress";
2634+ break;
2635+ case WSAENOMORE: case WSA_E_NO_MORE:
2636+ msg = "No more results";
2637+ break;
2638+ case WSAECANCELLED: case WSA_E_CANCELLED:
2639+ msg = "Call was canceled";
2640+ break;
2641+ case WSAEINVALIDPROCTABLE:
2642+ msg = "Procedure call table is invalid";
2643+ break;
2644+ case WSAEINVALIDPROVIDER:
2645+ msg = "Service provider is invalid";
2646+ break;
2647+ case WSAEPROVIDERFAILEDINIT:
2648+ msg = "Service provider failed to initialize";
2649+ break;
2650+ case WSASYSCALLFAILURE:
2651+ msg = "System call failure";
2652+ break;
2653+ case WSASERVICE_NOT_FOUND:
2654+ msg = "Service not found";
2655+ break;
2656+ case WSATYPE_NOT_FOUND:
2657+ msg = "Class type not found";
2658+ break;
2659+ case WSAEREFUSED:
2660+ msg = "Database query was refused";
2661+ break;
2662+ case WSAHOST_NOT_FOUND:
2663+ msg = "Host not found";
2664+ break;
2665+ case WSATRY_AGAIN:
2666+ msg = "Nonauthoritative host not found";
2667+ break;
2668+ case WSANO_RECOVERY:
2669+ msg = "Nonrecoverable error";
2670+ break;
2671+ case WSANO_DATA:
2672+ msg = "Valid name, no data record of requested type";
2673+ break;
2674+ /* WSA_QOS_* omitted */
2675+# endif
2676+# endif
2677+
2678+# if GNULIB_defined_ENOMSG
2679+ case ENOMSG:
2680+ msg = "No message of desired type";
2681+ break;
2682+# endif
2683+
2684+# if GNULIB_defined_EIDRM
2685+ case EIDRM:
2686+ msg = "Identifier removed";
2687+ break;
2688+# endif
2689+
2690+# if GNULIB_defined_ENOLINK
2691+ case ENOLINK:
2692+ msg = "Link has been severed";
2693+ break;
2694+# endif
2695+
2696+# if GNULIB_defined_EPROTO
2697+ case EPROTO:
2698+ msg = "Protocol error";
2699+ break;
2700+# endif
2701+
2702+# if GNULIB_defined_EMULTIHOP
2703+ case EMULTIHOP:
2704+ msg = "Multihop attempted";
2705+ break;
2706+# endif
2707+
2708+# if GNULIB_defined_EBADMSG
2709+ case EBADMSG:
2710+ msg = "Bad message";
2711+ break;
2712+# endif
2713+
2714+# if GNULIB_defined_EOVERFLOW
2715+ case EOVERFLOW:
2716+ msg = "Value too large for defined data type";
2717+ break;
2718+# endif
2719+
2720+# if GNULIB_defined_ENOTSUP
2721+ case ENOTSUP:
2722+ msg = "Not supported";
2723+ break;
2724+# endif
2725+
2726+# if GNULIB_defined_ESTALE
2727+ case ESTALE:
2728+ msg = "Stale NFS file handle";
2729+ break;
2730+# endif
2731+
2732+# if GNULIB_defined_EDQUOT
2733+ case EDQUOT:
2734+ msg = "Disk quota exceeded";
2735+ break;
2736+# endif
2737+
2738+# if GNULIB_defined_ECANCELED
2739+ case ECANCELED:
2740+ msg = "Operation canceled";
2741+ break;
2742+# endif
2743+ }
2744
2745- /* Cast away const, due to the historical signature of strerror;
2746- callers should not be modifying the string. */
2747- const char *msg = strerror_override (n);
2748 if (msg)
2749 return (char *) msg;
2750
2751- msg = strerror (n);
2752+ {
2753+ char *result = strerror (n);
2754
2755- /* Our strerror_r implementation might use the system's strerror
2756- buffer, so all other clients of strerror have to see the error
2757- copied into a buffer that we manage. This is not thread-safe,
2758- even if the system strerror is, but portable programs shouldn't
2759- be using strerror if they care about thread-safety. */
2760- if (!msg || !*msg)
2761- {
2762- static char const fmt[] = "Unknown error %d";
2763- verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n));
2764- sprintf (buf, fmt, n);
2765- errno = EINVAL;
2766- return buf;
2767- }
2768+ if (result == NULL || result[0] == '\0')
2769+ {
2770+ static char const fmt[] = "Unknown error (%d)";
2771+ static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)];
2772+ sprintf (msg_buf, fmt, n);
2773+ return msg_buf;
2774+ }
2775
2776- /* Fix STACKBUF_LEN if this ever aborts. */
2777- len = strlen (msg);
2778- if (sizeof buf <= len)
2779- abort ();
2780-
2781- return memcpy (buf, msg, len + 1);
2782+ return result;
2783+ }
2784 }
2785+
2786+#endif
2787diff -Naurp libiconv-1.14.org//srclib/strerror-override.c libiconv-1.14/srclib/strerror-override.c
2788--- libiconv-1.14.org//srclib/strerror-override.c 2011-08-07 06:42:06.000000000 -0700
2789+++ libiconv-1.14/srclib/strerror-override.c 1969-12-31 16:00:00.000000000 -0800
2790@@ -1,279 +0,0 @@
2791-/* strerror-override.c --- POSIX compatible system error routine
2792-
2793- Copyright (C) 2010-2011 Free Software Foundation, Inc.
2794-
2795- This program is free software: you can redistribute it and/or modify
2796- it under the terms of the GNU General Public License as published by
2797- the Free Software Foundation; either version 3 of the License, or
2798- (at your option) any later version.
2799-
2800- This program is distributed in the hope that it will be useful,
2801- but WITHOUT ANY WARRANTY; without even the implied warranty of
2802- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2803- GNU General Public License for more details.
2804-
2805- You should have received a copy of the GNU General Public License
2806- along with this program. If not, see <http://www.gnu.org/licenses/>. */
2807-
2808-/* Written by Bruno Haible <bruno@clisp.org>, 2010. */
2809-
2810-#include <config.h>
2811-
2812-#include "strerror-override.h"
2813-
2814-#include <errno.h>
2815-
2816-#if GNULIB_defined_ESOCK /* native Windows platforms */
2817-# if HAVE_WINSOCK2_H
2818-# include <winsock2.h>
2819-# endif
2820-#endif
2821-
2822-/* If ERRNUM maps to an errno value defined by gnulib, return a string
2823- describing the error. Otherwise return NULL. */
2824-const char *
2825-strerror_override (int errnum)
2826-{
2827- /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */
2828- switch (errnum)
2829- {
2830-#if REPLACE_STRERROR_0
2831- case 0:
2832- return "Success";
2833-#endif
2834-
2835-#if GNULIB_defined_ETXTBSY
2836- case ETXTBSY:
2837- return "Text file busy";
2838-#endif
2839-
2840-#if GNULIB_defined_ESOCK /* native Windows platforms */
2841- /* EWOULDBLOCK is the same as EAGAIN. */
2842- case EINPROGRESS:
2843- return "Operation now in progress";
2844- case EALREADY:
2845- return "Operation already in progress";
2846- case ENOTSOCK:
2847- return "Socket operation on non-socket";
2848- case EDESTADDRREQ:
2849- return "Destination address required";
2850- case EMSGSIZE:
2851- return "Message too long";
2852- case EPROTOTYPE:
2853- return "Protocol wrong type for socket";
2854- case ENOPROTOOPT:
2855- return "Protocol not available";
2856- case EPROTONOSUPPORT:
2857- return "Protocol not supported";
2858- case ESOCKTNOSUPPORT:
2859- return "Socket type not supported";
2860- case EOPNOTSUPP:
2861- return "Operation not supported";
2862- case EPFNOSUPPORT:
2863- return "Protocol family not supported";
2864- case EAFNOSUPPORT:
2865- return "Address family not supported by protocol";
2866- case EADDRINUSE:
2867- return "Address already in use";
2868- case EADDRNOTAVAIL:
2869- return "Cannot assign requested address";
2870- case ENETDOWN:
2871- return "Network is down";
2872- case ENETUNREACH:
2873- return "Network is unreachable";
2874- case ENETRESET:
2875- return "Network dropped connection on reset";
2876- case ECONNABORTED:
2877- return "Software caused connection abort";
2878- case ECONNRESET:
2879- return "Connection reset by peer";
2880- case ENOBUFS:
2881- return "No buffer space available";
2882- case EISCONN:
2883- return "Transport endpoint is already connected";
2884- case ENOTCONN:
2885- return "Transport endpoint is not connected";
2886- case ESHUTDOWN:
2887- return "Cannot send after transport endpoint shutdown";
2888- case ETOOMANYREFS:
2889- return "Too many references: cannot splice";
2890- case ETIMEDOUT:
2891- return "Connection timed out";
2892- case ECONNREFUSED:
2893- return "Connection refused";
2894- case ELOOP:
2895- return "Too many levels of symbolic links";
2896- case EHOSTDOWN:
2897- return "Host is down";
2898- case EHOSTUNREACH:
2899- return "No route to host";
2900- case EPROCLIM:
2901- return "Too many processes";
2902- case EUSERS:
2903- return "Too many users";
2904- case EDQUOT:
2905- return "Disk quota exceeded";
2906- case ESTALE:
2907- return "Stale NFS file handle";
2908- case EREMOTE:
2909- return "Object is remote";
2910-# if HAVE_WINSOCK2_H
2911- /* WSA_INVALID_HANDLE maps to EBADF */
2912- /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */
2913- /* WSA_INVALID_PARAMETER maps to EINVAL */
2914- case WSA_OPERATION_ABORTED:
2915- return "Overlapped operation aborted";
2916- case WSA_IO_INCOMPLETE:
2917- return "Overlapped I/O event object not in signaled state";
2918- case WSA_IO_PENDING:
2919- return "Overlapped operations will complete later";
2920- /* WSAEINTR maps to EINTR */
2921- /* WSAEBADF maps to EBADF */
2922- /* WSAEACCES maps to EACCES */
2923- /* WSAEFAULT maps to EFAULT */
2924- /* WSAEINVAL maps to EINVAL */
2925- /* WSAEMFILE maps to EMFILE */
2926- /* WSAEWOULDBLOCK maps to EWOULDBLOCK */
2927- /* WSAEINPROGRESS is EINPROGRESS */
2928- /* WSAEALREADY is EALREADY */
2929- /* WSAENOTSOCK is ENOTSOCK */
2930- /* WSAEDESTADDRREQ is EDESTADDRREQ */
2931- /* WSAEMSGSIZE is EMSGSIZE */
2932- /* WSAEPROTOTYPE is EPROTOTYPE */
2933- /* WSAENOPROTOOPT is ENOPROTOOPT */
2934- /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */
2935- /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */
2936- /* WSAEOPNOTSUPP is EOPNOTSUPP */
2937- /* WSAEPFNOSUPPORT is EPFNOSUPPORT */
2938- /* WSAEAFNOSUPPORT is EAFNOSUPPORT */
2939- /* WSAEADDRINUSE is EADDRINUSE */
2940- /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */
2941- /* WSAENETDOWN is ENETDOWN */
2942- /* WSAENETUNREACH is ENETUNREACH */
2943- /* WSAENETRESET is ENETRESET */
2944- /* WSAECONNABORTED is ECONNABORTED */
2945- /* WSAECONNRESET is ECONNRESET */
2946- /* WSAENOBUFS is ENOBUFS */
2947- /* WSAEISCONN is EISCONN */
2948- /* WSAENOTCONN is ENOTCONN */
2949- /* WSAESHUTDOWN is ESHUTDOWN */
2950- /* WSAETOOMANYREFS is ETOOMANYREFS */
2951- /* WSAETIMEDOUT is ETIMEDOUT */
2952- /* WSAECONNREFUSED is ECONNREFUSED */
2953- /* WSAELOOP is ELOOP */
2954- /* WSAENAMETOOLONG maps to ENAMETOOLONG */
2955- /* WSAEHOSTDOWN is EHOSTDOWN */
2956- /* WSAEHOSTUNREACH is EHOSTUNREACH */
2957- /* WSAENOTEMPTY maps to ENOTEMPTY */
2958- /* WSAEPROCLIM is EPROCLIM */
2959- /* WSAEUSERS is EUSERS */
2960- /* WSAEDQUOT is EDQUOT */
2961- /* WSAESTALE is ESTALE */
2962- /* WSAEREMOTE is EREMOTE */
2963- case WSASYSNOTREADY:
2964- return "Network subsystem is unavailable";
2965- case WSAVERNOTSUPPORTED:
2966- return "Winsock.dll version out of range";
2967- case WSANOTINITIALISED:
2968- return "Successful WSAStartup not yet performed";
2969- case WSAEDISCON:
2970- return "Graceful shutdown in progress";
2971- case WSAENOMORE: case WSA_E_NO_MORE:
2972- return "No more results";
2973- case WSAECANCELLED: case WSA_E_CANCELLED:
2974- return "Call was canceled";
2975- case WSAEINVALIDPROCTABLE:
2976- return "Procedure call table is invalid";
2977- case WSAEINVALIDPROVIDER:
2978- return "Service provider is invalid";
2979- case WSAEPROVIDERFAILEDINIT:
2980- return "Service provider failed to initialize";
2981- case WSASYSCALLFAILURE:
2982- return "System call failure";
2983- case WSASERVICE_NOT_FOUND:
2984- return "Service not found";
2985- case WSATYPE_NOT_FOUND:
2986- return "Class type not found";
2987- case WSAEREFUSED:
2988- return "Database query was refused";
2989- case WSAHOST_NOT_FOUND:
2990- return "Host not found";
2991- case WSATRY_AGAIN:
2992- return "Nonauthoritative host not found";
2993- case WSANO_RECOVERY:
2994- return "Nonrecoverable error";
2995- case WSANO_DATA:
2996- return "Valid name, no data record of requested type";
2997- /* WSA_QOS_* omitted */
2998-# endif
2999-#endif
3000-
3001-#if GNULIB_defined_ENOMSG
3002- case ENOMSG:
3003- return "No message of desired type";
3004-#endif
3005-
3006-#if GNULIB_defined_EIDRM
3007- case EIDRM:
3008- return "Identifier removed";
3009-#endif
3010-
3011-#if GNULIB_defined_ENOLINK
3012- case ENOLINK:
3013- return "Link has been severed";
3014-#endif
3015-
3016-#if GNULIB_defined_EPROTO
3017- case EPROTO:
3018- return "Protocol error";
3019-#endif
3020-
3021-#if GNULIB_defined_EMULTIHOP
3022- case EMULTIHOP:
3023- return "Multihop attempted";
3024-#endif
3025-
3026-#if GNULIB_defined_EBADMSG
3027- case EBADMSG:
3028- return "Bad message";
3029-#endif
3030-
3031-#if GNULIB_defined_EOVERFLOW
3032- case EOVERFLOW:
3033- return "Value too large for defined data type";
3034-#endif
3035-
3036-#if GNULIB_defined_ENOTSUP
3037- case ENOTSUP:
3038- return "Not supported";
3039-#endif
3040-
3041-#if GNULIB_defined_ENETRESET
3042- case ENETRESET:
3043- return "Network dropped connection on reset";
3044-#endif
3045-
3046-#if GNULIB_defined_ECONNABORTED
3047- case ECONNABORTED:
3048- return "Software caused connection abort";
3049-#endif
3050-
3051-#if GNULIB_defined_ESTALE
3052- case ESTALE:
3053- return "Stale NFS file handle";
3054-#endif
3055-
3056-#if GNULIB_defined_EDQUOT
3057- case EDQUOT:
3058- return "Disk quota exceeded";
3059-#endif
3060-
3061-#if GNULIB_defined_ECANCELED
3062- case ECANCELED:
3063- return "Operation canceled";
3064-#endif
3065-
3066- default:
3067- return NULL;
3068- }
3069-}
3070diff -Naurp libiconv-1.14.org//srclib/strerror-override.h libiconv-1.14/srclib/strerror-override.h
3071--- libiconv-1.14.org//srclib/strerror-override.h 2011-08-07 06:42:06.000000000 -0700
3072+++ libiconv-1.14/srclib/strerror-override.h 1969-12-31 16:00:00.000000000 -0800
3073@@ -1,52 +0,0 @@
3074-/* strerror-override.h --- POSIX compatible system error routine
3075-
3076- Copyright (C) 2010-2011 Free Software Foundation, Inc.
3077-
3078- This program is free software: you can redistribute it and/or modify
3079- it under the terms of the GNU General Public License as published by
3080- the Free Software Foundation; either version 3 of the License, or
3081- (at your option) any later version.
3082-
3083- This program is distributed in the hope that it will be useful,
3084- but WITHOUT ANY WARRANTY; without even the implied warranty of
3085- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3086- GNU General Public License for more details.
3087-
3088- You should have received a copy of the GNU General Public License
3089- along with this program. If not, see <http://www.gnu.org/licenses/>. */
3090-
3091-#ifndef _GL_STRERROR_OVERRIDE_H
3092-# define _GL_STRERROR_OVERRIDE_H
3093-
3094-# include <errno.h>
3095-# include <stddef.h>
3096-
3097-/* Reasonable buffer size that should never trigger ERANGE; if this
3098- proves too small, we intentionally abort(), to remind us to fix
3099- this value. */
3100-# define STACKBUF_LEN 256
3101-
3102-/* If ERRNUM maps to an errno value defined by gnulib, return a string
3103- describing the error. Otherwise return NULL. */
3104-# if REPLACE_STRERROR_0 \
3105- || GNULIB_defined_ETXTBSY \
3106- || GNULIB_defined_ESOCK \
3107- || GNULIB_defined_ENOMSG \
3108- || GNULIB_defined_EIDRM \
3109- || GNULIB_defined_ENOLINK \
3110- || GNULIB_defined_EPROTO \
3111- || GNULIB_defined_EMULTIHOP \
3112- || GNULIB_defined_EBADMSG \
3113- || GNULIB_defined_EOVERFLOW \
3114- || GNULIB_defined_ENOTSUP \
3115- || GNULIB_defined_ENETRESET \
3116- || GNULIB_defined_ECONNABORTED \
3117- || GNULIB_defined_ESTALE \
3118- || GNULIB_defined_EDQUOT \
3119- || GNULIB_defined_ECANCELED
3120-extern const char *strerror_override (int errnum);
3121-# else
3122-# define strerror_override(ignored) NULL
3123-# endif
3124-
3125-#endif /* _GL_STRERROR_OVERRIDE_H */
3126diff -Naurp libiconv-1.14.org//srclib/string.in.h libiconv-1.14/srclib/string.in.h
3127--- libiconv-1.14.org//srclib/string.in.h 2011-08-07 06:42:06.000000000 -0700
3128+++ libiconv-1.14/srclib/string.in.h 2012-01-08 02:07:40.418484461 -0800
3129@@ -16,7 +16,7 @@
3130 along with this program; if not, write to the Free Software Foundation,
3131 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
3132
3133-#ifndef _@GUARD_PREFIX@_STRING_H
3134+#ifndef _GL_STRING_H
3135
3136 #if __GNUC__ >= 3
3137 @PRAGMA_SYSTEM_HEADER@
3138@@ -26,8 +26,8 @@
3139 /* The include_next requires a split double-inclusion guard. */
3140 #@INCLUDE_NEXT@ @NEXT_STRING_H@
3141
3142-#ifndef _@GUARD_PREFIX@_STRING_H
3143-#define _@GUARD_PREFIX@_STRING_H
3144+#ifndef _GL_STRING_H
3145+#define _GL_STRING_H
3146
3147 /* NetBSD 5.0 mis-defines NULL. */
3148 #include <stddef.h>
3149@@ -59,36 +59,6 @@
3150 /* The definition of _GL_WARN_ON_USE is copied here. */
3151
3152
3153-/* Find the index of the least-significant set bit. */
3154-#if @GNULIB_FFSL@
3155-# if !@HAVE_FFSL@
3156-_GL_FUNCDECL_SYS (ffsl, int, (long int i));
3157-# endif
3158-_GL_CXXALIAS_SYS (ffsl, int, (long int i));
3159-_GL_CXXALIASWARN (ffsl);
3160-#elif defined GNULIB_POSIXCHECK
3161-# undef ffsl
3162-# if HAVE_RAW_DECL_FFSL
3163-_GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module");
3164-# endif
3165-#endif
3166-
3167-
3168-/* Find the index of the least-significant set bit. */
3169-#if @GNULIB_FFSLL@
3170-# if !@HAVE_FFSLL@
3171-_GL_FUNCDECL_SYS (ffsll, int, (long long int i));
3172-# endif
3173-_GL_CXXALIAS_SYS (ffsll, int, (long long int i));
3174-_GL_CXXALIASWARN (ffsll);
3175-#elif defined GNULIB_POSIXCHECK
3176-# undef ffsll
3177-# if HAVE_RAW_DECL_FFSLL
3178-_GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module");
3179-# endif
3180-#endif
3181-
3182-
3183 /* Return the first instance of C within N bytes of S, or NULL. */
3184 #if @GNULIB_MEMCHR@
3185 # if @REPLACE_MEMCHR@
3186@@ -1007,5 +977,5 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp
3187 #endif
3188
3189
3190-#endif /* _@GUARD_PREFIX@_STRING_H */
3191-#endif /* _@GUARD_PREFIX@_STRING_H */
3192+#endif /* _GL_STRING_H */
3193+#endif /* _GL_STRING_H */
3194diff -Naurp libiconv-1.14.org//srclib/sys_stat.in.h libiconv-1.14/srclib/sys_stat.in.h
3195--- libiconv-1.14.org//srclib/sys_stat.in.h 2011-08-07 06:42:06.000000000 -0700
3196+++ libiconv-1.14/srclib/sys_stat.in.h 2012-01-08 02:07:40.430484461 -0800
3197@@ -34,7 +34,7 @@
3198 #else
3199 /* Normal invocation convention. */
3200
3201-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
3202+#ifndef _GL_SYS_STAT_H
3203
3204 /* Get nlink_t. */
3205 #include <sys/types.h>
3206@@ -45,8 +45,8 @@
3207 /* The include_next requires a split double-inclusion guard. */
3208 #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@
3209
3210-#ifndef _@GUARD_PREFIX@_SYS_STAT_H
3211-#define _@GUARD_PREFIX@_SYS_STAT_H
3212+#ifndef _GL_SYS_STAT_H
3213+#define _GL_SYS_STAT_H
3214
3215 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
3216
3217@@ -653,6 +653,6 @@ _GL_WARN_ON_USE (utimensat, "utimensat i
3218 #endif
3219
3220
3221-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
3222-#endif /* _@GUARD_PREFIX@_SYS_STAT_H */
3223+#endif /* _GL_SYS_STAT_H */
3224+#endif /* _GL_SYS_STAT_H */
3225 #endif
3226diff -Naurp libiconv-1.14.org//srclib/time.in.h libiconv-1.14/srclib/time.in.h
3227--- libiconv-1.14.org//srclib/time.in.h 2011-08-07 06:42:06.000000000 -0700
3228+++ libiconv-1.14/srclib/time.in.h 2012-01-08 02:07:40.438484462 -0800
3229@@ -28,13 +28,13 @@
3230 without adding our own declarations. */
3231 #if (defined __need_time_t || defined __need_clock_t \
3232 || defined __need_timespec \
3233- || defined _@GUARD_PREFIX@_TIME_H)
3234+ || defined _GL_TIME_H)
3235
3236 # @INCLUDE_NEXT@ @NEXT_TIME_H@
3237
3238 #else
3239
3240-# define _@GUARD_PREFIX@_TIME_H
3241+# define _GL_TIME_H
3242
3243 # @INCLUDE_NEXT@ @NEXT_TIME_H@
3244
3245diff -Naurp libiconv-1.14.org//srclib/unistd.in.h libiconv-1.14/srclib/unistd.in.h
3246--- libiconv-1.14.org//srclib/unistd.in.h 2011-08-07 06:42:06.000000000 -0700
3247+++ libiconv-1.14/srclib/unistd.in.h 2012-01-08 02:07:40.450484462 -0800
3248@@ -36,7 +36,7 @@
3249 # define _GL_WINSOCK2_H_WITNESS
3250
3251 /* Normal invocation. */
3252-#elif !defined _@GUARD_PREFIX@_UNISTD_H
3253+#elif !defined _GL_UNISTD_H
3254
3255 /* The include_next requires a split double-inclusion guard. */
3256 #if @HAVE_UNISTD_H@
3257@@ -51,8 +51,8 @@
3258 # undef _GL_INCLUDING_WINSOCK2_H
3259 #endif
3260
3261-#if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
3262-#define _@GUARD_PREFIX@_UNISTD_H
3263+#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
3264+#define _GL_UNISTD_H
3265
3266 /* NetBSD 5.0 mis-defines NULL. Also get size_t. */
3267 #include <stddef.h>
3268@@ -117,77 +117,78 @@
3269 /* The definition of _GL_WARN_ON_USE is copied here. */
3270
3271
3272-/* Hide some function declarations from <winsock2.h>. */
3273-
3274-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
3275-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
3276-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
3277-# undef socket
3278-# define socket socket_used_without_including_sys_socket_h
3279-# undef connect
3280-# define connect connect_used_without_including_sys_socket_h
3281-# undef accept
3282-# define accept accept_used_without_including_sys_socket_h
3283-# undef bind
3284-# define bind bind_used_without_including_sys_socket_h
3285-# undef getpeername
3286-# define getpeername getpeername_used_without_including_sys_socket_h
3287-# undef getsockname
3288-# define getsockname getsockname_used_without_including_sys_socket_h
3289-# undef getsockopt
3290-# define getsockopt getsockopt_used_without_including_sys_socket_h
3291-# undef listen
3292-# define listen listen_used_without_including_sys_socket_h
3293-# undef recv
3294-# define recv recv_used_without_including_sys_socket_h
3295-# undef send
3296-# define send send_used_without_including_sys_socket_h
3297-# undef recvfrom
3298-# define recvfrom recvfrom_used_without_including_sys_socket_h
3299-# undef sendto
3300-# define sendto sendto_used_without_including_sys_socket_h
3301-# undef setsockopt
3302-# define setsockopt setsockopt_used_without_including_sys_socket_h
3303-# undef shutdown
3304-# define shutdown shutdown_used_without_including_sys_socket_h
3305-# else
3306- _GL_WARN_ON_USE (socket,
3307- "socket() used without including <sys/socket.h>");
3308- _GL_WARN_ON_USE (connect,
3309- "connect() used without including <sys/socket.h>");
3310- _GL_WARN_ON_USE (accept,
3311- "accept() used without including <sys/socket.h>");
3312- _GL_WARN_ON_USE (bind,
3313- "bind() used without including <sys/socket.h>");
3314- _GL_WARN_ON_USE (getpeername,
3315- "getpeername() used without including <sys/socket.h>");
3316- _GL_WARN_ON_USE (getsockname,
3317- "getsockname() used without including <sys/socket.h>");
3318- _GL_WARN_ON_USE (getsockopt,
3319- "getsockopt() used without including <sys/socket.h>");
3320- _GL_WARN_ON_USE (listen,
3321- "listen() used without including <sys/socket.h>");
3322- _GL_WARN_ON_USE (recv,
3323- "recv() used without including <sys/socket.h>");
3324- _GL_WARN_ON_USE (send,
3325- "send() used without including <sys/socket.h>");
3326- _GL_WARN_ON_USE (recvfrom,
3327- "recvfrom() used without including <sys/socket.h>");
3328- _GL_WARN_ON_USE (sendto,
3329- "sendto() used without including <sys/socket.h>");
3330- _GL_WARN_ON_USE (setsockopt,
3331- "setsockopt() used without including <sys/socket.h>");
3332- _GL_WARN_ON_USE (shutdown,
3333- "shutdown() used without including <sys/socket.h>");
3334+#if @GNULIB_GETHOSTNAME@
3335+/* Get all possible declarations of gethostname(). */
3336+# if @UNISTD_H_HAVE_WINSOCK2_H@
3337+# if !defined _GL_SYS_SOCKET_H
3338+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
3339+# undef socket
3340+# define socket socket_used_without_including_sys_socket_h
3341+# undef connect
3342+# define connect connect_used_without_including_sys_socket_h
3343+# undef accept
3344+# define accept accept_used_without_including_sys_socket_h
3345+# undef bind
3346+# define bind bind_used_without_including_sys_socket_h
3347+# undef getpeername
3348+# define getpeername getpeername_used_without_including_sys_socket_h
3349+# undef getsockname
3350+# define getsockname getsockname_used_without_including_sys_socket_h
3351+# undef getsockopt
3352+# define getsockopt getsockopt_used_without_including_sys_socket_h
3353+# undef listen
3354+# define listen listen_used_without_including_sys_socket_h
3355+# undef recv
3356+# define recv recv_used_without_including_sys_socket_h
3357+# undef send
3358+# define send send_used_without_including_sys_socket_h
3359+# undef recvfrom
3360+# define recvfrom recvfrom_used_without_including_sys_socket_h
3361+# undef sendto
3362+# define sendto sendto_used_without_including_sys_socket_h
3363+# undef setsockopt
3364+# define setsockopt setsockopt_used_without_including_sys_socket_h
3365+# undef shutdown
3366+# define shutdown shutdown_used_without_including_sys_socket_h
3367+# else
3368+ _GL_WARN_ON_USE (socket,
3369+ "socket() used without including <sys/socket.h>");
3370+ _GL_WARN_ON_USE (connect,
3371+ "connect() used without including <sys/socket.h>");
3372+ _GL_WARN_ON_USE (accept,
3373+ "accept() used without including <sys/socket.h>");
3374+ _GL_WARN_ON_USE (bind,
3375+ "bind() used without including <sys/socket.h>");
3376+ _GL_WARN_ON_USE (getpeername,
3377+ "getpeername() used without including <sys/socket.h>");
3378+ _GL_WARN_ON_USE (getsockname,
3379+ "getsockname() used without including <sys/socket.h>");
3380+ _GL_WARN_ON_USE (getsockopt,
3381+ "getsockopt() used without including <sys/socket.h>");
3382+ _GL_WARN_ON_USE (listen,
3383+ "listen() used without including <sys/socket.h>");
3384+ _GL_WARN_ON_USE (recv,
3385+ "recv() used without including <sys/socket.h>");
3386+ _GL_WARN_ON_USE (send,
3387+ "send() used without including <sys/socket.h>");
3388+ _GL_WARN_ON_USE (recvfrom,
3389+ "recvfrom() used without including <sys/socket.h>");
3390+ _GL_WARN_ON_USE (sendto,
3391+ "sendto() used without including <sys/socket.h>");
3392+ _GL_WARN_ON_USE (setsockopt,
3393+ "setsockopt() used without including <sys/socket.h>");
3394+ _GL_WARN_ON_USE (shutdown,
3395+ "shutdown() used without including <sys/socket.h>");
3396+# endif
3397 # endif
3398-# endif
3399-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
3400-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
3401-# undef select
3402-# define select select_used_without_including_sys_select_h
3403-# else
3404- _GL_WARN_ON_USE (select,
3405- "select() used without including <sys/select.h>");
3406+# if !defined _GL_SYS_SELECT_H
3407+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
3408+# undef select
3409+# define select select_used_without_including_sys_select_h
3410+# else
3411+ _GL_WARN_ON_USE (select,
3412+ "select() used without including <sys/select.h>");
3413+# endif
3414 # endif
3415 # endif
3416 #endif
3417@@ -1061,7 +1062,6 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unport
3418 specification <http://www.opengroup.org/susv3xsh/pread.html>. */
3419 # if @REPLACE_PREAD@
3420 # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
3421-# undef pread
3422 # define pread rpl_pread
3423 # endif
3424 _GL_FUNCDECL_RPL (pread, ssize_t,
3425@@ -1096,7 +1096,6 @@ _GL_WARN_ON_USE (pread, "pread is unport
3426 <http://www.opengroup.org/susv3xsh/pwrite.html>. */
3427 # if @REPLACE_PWRITE@
3428 # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
3429-# undef pwrite
3430 # define pwrite rpl_pwrite
3431 # endif
3432 _GL_FUNCDECL_RPL (pwrite, ssize_t,
3433@@ -1417,5 +1416,5 @@ _GL_CXXALIASWARN (write);
3434 #endif
3435
3436
3437-#endif /* _@GUARD_PREFIX@_UNISTD_H */
3438-#endif /* _@GUARD_PREFIX@_UNISTD_H */
3439+#endif /* _GL_UNISTD_H */
3440+#endif /* _GL_UNISTD_H */
3441diff -Naurp libiconv-1.14.org//srclib/verify.h libiconv-1.14/srclib/verify.h
3442--- libiconv-1.14.org//srclib/verify.h 2011-08-07 06:42:07.000000000 -0700
3443+++ libiconv-1.14/srclib/verify.h 2012-01-08 02:07:40.494484464 -0800
3444@@ -164,13 +164,10 @@
3445 (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
3446
3447 # ifdef __cplusplus
3448-# if !GNULIB_defined_struct__gl_verify_type
3449 template <int w>
3450 struct _gl_verify_type {
3451 unsigned int _gl_verify_error_if_negative: w;
3452 };
3453-# define GNULIB_defined_struct__gl_verify_type 1
3454-# endif
3455 # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
3456 _gl_verify_type<(R) ? 1 : -1>
3457 # elif defined _GL_HAVE__STATIC_ASSERT
3458@@ -209,7 +206,7 @@ template <int w>
3459 # endif
3460 # endif
3461
3462-/* @assert.h omit start@ */
3463+# ifdef _GL_VERIFY_H
3464
3465 /* Each of these macros verifies that its argument R is nonzero. To
3466 be portable, R should be an integer constant expression. Unlike
3467@@ -221,23 +218,15 @@ template <int w>
3468 contexts, e.g., the top level. */
3469
3470 /* Verify requirement R at compile-time, as an integer constant expression.
3471- Return 1. This is equivalent to verify_expr (R, 1).
3472-
3473- verify_true is obsolescent; please use verify_expr instead. */
3474-
3475-# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
3476+ Return 1. */
3477
3478-/* Verify requirement R at compile-time. Return the value of the
3479- expression E. */
3480-
3481-# define verify_expr(R, E) \
3482- (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
3483+# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
3484
3485 /* Verify requirement R at compile-time, as a declaration without a
3486 trailing ';'. */
3487
3488-# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
3489+# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
3490
3491-/* @assert.h omit end@ */
3492+# endif
3493
3494 #endif
3495diff -Naurp libiconv-1.14.org//srcm4/canonicalize.m4 libiconv-1.14/srcm4/canonicalize.m4
3496--- libiconv-1.14.org//srcm4/canonicalize.m4 2011-08-07 06:42:07.000000000 -0700
3497+++ libiconv-1.14/srcm4/canonicalize.m4 2012-01-08 02:07:40.566484469 -0800
3498@@ -1,4 +1,4 @@
3499-# canonicalize.m4 serial 23
3500+# canonicalize.m4 serial 21
3501
3502 dnl Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc.
3503
3504@@ -10,6 +10,8 @@ dnl with or without modifications, as lo
3505 # not provide or fix realpath.
3506 AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
3507 [
3508+ AC_LIBOBJ([canonicalize])
3509+
3510 AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
3511 AC_CHECK_FUNCS_ONCE([canonicalize_file_name])
3512 AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
3513@@ -28,14 +30,16 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
3514 AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE])
3515 if test $ac_cv_func_canonicalize_file_name = no; then
3516 HAVE_CANONICALIZE_FILE_NAME=0
3517+ AC_LIBOBJ([canonicalize-lgpl])
3518 if test $ac_cv_func_realpath = no; then
3519 HAVE_REALPATH=0
3520 elif test "$gl_cv_func_realpath_works" != yes; then
3521 REPLACE_REALPATH=1
3522 fi
3523 elif test "$gl_cv_func_realpath_works" != yes; then
3524- REPLACE_CANONICALIZE_FILE_NAME=1
3525+ AC_LIBOBJ([canonicalize-lgpl])
3526 REPLACE_REALPATH=1
3527+ REPLACE_CANONICALIZE_FILE_NAME=1
3528 fi
3529 ])
3530
3531diff -Naurp libiconv-1.14.org//srcm4/errno_h.m4 libiconv-1.14/srcm4/errno_h.m4
3532--- libiconv-1.14.org//srcm4/errno_h.m4 2011-08-07 06:42:07.000000000 -0700
3533+++ libiconv-1.14/srcm4/errno_h.m4 2012-01-08 02:07:40.590484469 -0800
3534@@ -1,4 +1,4 @@
3535-# errno_h.m4 serial 10
3536+# errno_h.m4 serial 9
3537 dnl Copyright (C) 2004, 2006, 2008-2011 Free Software Foundation, Inc.
3538 dnl This file is free software; the Free Software Foundation
3539 dnl gives unlimited permission to copy and/or distribute it,
3540@@ -34,12 +34,6 @@ booboo
3541 #if !defined ENOTSUP
3542 booboo
3543 #endif
3544-#if !defined ENETRESET
3545-booboo
3546-#endif
3547-#if !defined ECONNABORTED
3548-booboo
3549-#endif
3550 #if !defined ESTALE
3551 booboo
3552 #endif
3553diff -Naurp libiconv-1.14.org//srcm4/error.m4 libiconv-1.14/srcm4/error.m4
3554--- libiconv-1.14.org//srcm4/error.m4 2011-08-07 06:42:07.000000000 -0700
3555+++ libiconv-1.14/srcm4/error.m4 2012-01-08 02:07:40.598484470 -0800
3556@@ -1,4 +1,4 @@
3557-#serial 14
3558+#serial 13
3559
3560 # Copyright (C) 1996-1998, 2001-2004, 2009-2011 Free Software Foundation, Inc.
3561 #
3562@@ -8,8 +8,16 @@
3563
3564 AC_DEFUN([gl_ERROR],
3565 [
3566- dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
3567- dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
3568+ AC_FUNC_ERROR_AT_LINE
3569+ dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
3570+ gl_PREREQ_ERROR
3571+])
3572+
3573+# Redefine AC_FUNC_ERROR_AT_LINE, because it is no longer maintained in
3574+# Autoconf.
3575+AC_DEFUN([AC_FUNC_ERROR_AT_LINE],
3576+[
3577+ AC_LIBSOURCES([error.h, error.c])dnl
3578 AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
3579 [AC_LINK_IFELSE(
3580 [AC_LANG_PROGRAM(
3581@@ -17,6 +25,9 @@ AC_DEFUN([gl_ERROR],
3582 [[error_at_line (0, 0, "", 0, "an error occurred");]])],
3583 [ac_cv_lib_error_at_line=yes],
3584 [ac_cv_lib_error_at_line=no])])
3585+ if test $ac_cv_lib_error_at_line = no; then
3586+ AC_LIBOBJ([error])
3587+ fi
3588 ])
3589
3590 # Prerequisites of lib/error.c.
3591diff -Naurp libiconv-1.14.org//srcm4/extensions.m4 libiconv-1.14/srcm4/extensions.m4
3592--- libiconv-1.14.org//srcm4/extensions.m4 2011-08-07 06:42:07.000000000 -0700
3593+++ libiconv-1.14/srcm4/extensions.m4 2012-01-08 02:07:40.606484471 -0800
3594@@ -1,4 +1,4 @@
3595-# serial 10 -*- Autoconf -*-
3596+# serial 9 -*- Autoconf -*-
3597 # Enable extensions on systems that normally disable them.
3598
3599 # Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc.
3600@@ -67,10 +67,6 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
3601 #ifndef _ALL_SOURCE
3602 # undef _ALL_SOURCE
3603 #endif
3604-/* Enable general extensions on MacOS X. */
3605-#ifndef _DARWIN_C_SOURCE
3606-# undef _DARWIN_C_SOURCE
3607-#endif
3608 /* Enable GNU extensions on systems that have them. */
3609 #ifndef _GNU_SOURCE
3610 # undef _GNU_SOURCE
3611@@ -99,7 +95,6 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
3612 test $ac_cv_safe_to_define___extensions__ = yes &&
3613 AC_DEFINE([__EXTENSIONS__])
3614 AC_DEFINE([_ALL_SOURCE])
3615- AC_DEFINE([_DARWIN_C_SOURCE])
3616 AC_DEFINE([_GNU_SOURCE])
3617 AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
3618 AC_DEFINE([_TANDEM_SOURCE])
3619diff -Naurp libiconv-1.14.org//srcm4/gnulib-cache.m4 libiconv-1.14/srcm4/gnulib-cache.m4
3620--- libiconv-1.14.org//srcm4/gnulib-cache.m4 2011-08-07 06:42:11.000000000 -0700
3621+++ libiconv-1.14/srcm4/gnulib-cache.m4 2012-01-08 02:07:43.154484593 -0800
3622@@ -15,7 +15,7 @@
3623
3624
3625 # Specification in the form of a command-line invocation:
3626-# gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc
3627+# gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc
3628
3629 # Specification in the form of a few gnulib-tool.m4 macro invocations:
3630 gl_LOCAL_DIR([gnulib-local])
3631@@ -28,6 +28,7 @@ gl_MODULES([
3632 mbstate
3633 memmove
3634 progname
3635+ relocatable
3636 relocatable-prog
3637 safe-read
3638 sigpipe
3639@@ -49,5 +50,4 @@ gl_LIB([libicrt])
3640 gl_MAKEFILE_NAME([Makefile.gnulib])
3641 gl_MACRO_PREFIX([gl])
3642 gl_PO_DOMAIN([])
3643-gl_WITNESS_C_DOMAIN([])
3644 gl_VC_FILES([false])
3645diff -Naurp libiconv-1.14.org//srcm4/gnulib-common.m4 libiconv-1.14/srcm4/gnulib-common.m4
3646--- libiconv-1.14.org//srcm4/gnulib-common.m4 2011-08-07 06:42:07.000000000 -0700
3647+++ libiconv-1.14/srcm4/gnulib-common.m4 2012-01-08 02:07:40.634484471 -0800
3648@@ -1,4 +1,4 @@
3649-# gnulib-common.m4 serial 29
3650+# gnulib-common.m4 serial 24
3651 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
3652 dnl This file is free software; the Free Software Foundation
3653 dnl gives unlimited permission to copy and/or distribute it,
3654@@ -12,19 +12,6 @@ AC_DEFUN([gl_COMMON], [
3655 AC_REQUIRE([gl_COMMON_BODY])
3656 ])
3657 AC_DEFUN([gl_COMMON_BODY], [
3658- AH_VERBATIM([_Noreturn],
3659-[/* The _Noreturn keyword of draft C1X. */
3660-#ifndef _Noreturn
3661-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
3662- || 0x5110 <= __SUNPRO_C)
3663-# define _Noreturn __attribute__ ((__noreturn__))
3664-# elif 1200 <= _MSC_VER
3665-# define _Noreturn __declspec (noreturn)
3666-# else
3667-# define _Noreturn
3668-# endif
3669-#endif
3670-])
3671 AH_VERBATIM([isoc99_inline],
3672 [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
3673 the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
3674@@ -47,20 +34,6 @@ AC_DEFUN([gl_COMMON_BODY], [
3675 /* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
3676 is a misnomer outside of parameter lists. */
3677 #define _UNUSED_PARAMETER_ _GL_UNUSED
3678-
3679-/* The __pure__ attribute was added in gcc 2.96. */
3680-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
3681-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
3682-#else
3683-# define _GL_ATTRIBUTE_PURE /* empty */
3684-#endif
3685-
3686-/* The __const__ attribute was added in gcc 2.95. */
3687-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
3688-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
3689-#else
3690-# define _GL_ATTRIBUTE_CONST /* empty */
3691-#endif
3692 ])
3693 dnl Preparation for running test programs:
3694 dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
3695@@ -74,49 +47,16 @@ AC_DEFUN([gl_COMMON_BODY], [
3696 # expands to a C preprocessor expression that evaluates to 1 or 0, depending
3697 # whether a gnulib module that has been requested shall be considered present
3698 # or not.
3699-m4_define([gl_MODULE_INDICATOR_CONDITION], [1])
3700+AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
3701
3702 # gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
3703 # sets the shell variable that indicates the presence of the given module to
3704 # a C preprocessor expression that will evaluate to 1.
3705 AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
3706 [
3707- gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
3708- [GNULIB_[]m4_translit([[$1]],
3709- [abcdefghijklmnopqrstuvwxyz./-],
3710- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
3711- [gl_MODULE_INDICATOR_CONDITION])
3712-])
3713-
3714-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable])
3715-# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION.
3716-# The shell variable's value is a C preprocessor expression that evaluates
3717-# to 0 or 1.
3718-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX],
3719-[
3720- m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
3721- [
3722- dnl Simplify the expression VALUE || 1 to 1.
3723- $1=1
3724- ],
3725- [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
3726- [gl_MODULE_INDICATOR_CONDITION])])
3727-])
3728-
3729-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition])
3730-# modifies the shell variable to include the given condition. The shell
3731-# variable's value is a C preprocessor expression that evaluates to 0 or 1.
3732-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR],
3733-[
3734- dnl Simplify the expression 1 || CONDITION to 1.
3735- if test "$[]$1" != 1; then
3736- dnl Simplify the expression 0 || CONDITION to CONDITION.
3737- if test "$[]$1" = 0; then
3738- $1=$2
3739- else
3740- $1="($[]$1 || $2)"
3741- fi
3742- fi
3743+ GNULIB_[]m4_translit([[$1]],
3744+ [abcdefghijklmnopqrstuvwxyz./-],
3745+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
3746 ])
3747
3748 # gl_MODULE_INDICATOR([modulename])
3749@@ -211,35 +151,6 @@ m4_ifndef([AS_VAR_IF],
3750 [m4_define([AS_VAR_IF],
3751 [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
3752
3753-# gl_PROG_AR_RANLIB
3754-# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
3755-AC_DEFUN([gl_PROG_AR_RANLIB],
3756-[
3757- dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
3758- dnl as "cc", and GCC as "gcc". They have different object file formats and
3759- dnl library formats. In particular, the GNU binutils programs ar, ranlib
3760- dnl produce libraries that work only with gcc, not with cc.
3761- AC_REQUIRE([AC_PROG_CC])
3762- AC_EGREP_CPP([Amsterdam],
3763- [
3764-#ifdef __ACK__
3765-Amsterdam
3766-#endif
3767- ],
3768- [AR='cc -c.a'
3769- ARFLAGS='-o'
3770- RANLIB=':'
3771- ],
3772- [dnl Use the Automake-documented default values for AR and ARFLAGS.
3773- AR='ar'
3774- ARFLAGS='cru'
3775- dnl Use the ranlib program if it is available.
3776- AC_PROG_RANLIB
3777- ])
3778- AC_SUBST([AR])
3779- AC_SUBST([ARFLAGS])
3780-])
3781-
3782 # AC_PROG_MKDIR_P
3783 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
3784 # for interoperability with automake-1.9.6 from autoconf-2.62.
3785diff -Naurp libiconv-1.14.org//srcm4/gnulib-comp.m4 libiconv-1.14/srcm4/gnulib-comp.m4
3786--- libiconv-1.14.org//srcm4/gnulib-comp.m4 2011-08-07 06:42:12.000000000 -0700
3787+++ libiconv-1.14/srcm4/gnulib-comp.m4 2012-01-08 02:07:43.922484630 -0800
3788@@ -25,12 +25,14 @@ AC_DEFUN([gl_EARLY],
3789 m4_pattern_allow([^gl_ES$])dnl a valid locale name
3790 m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
3791 m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
3792- AC_REQUIRE([gl_PROG_AR_RANLIB])
3793+ AC_REQUIRE([AC_PROG_RANLIB])
3794 AC_REQUIRE([AM_PROG_CC_C_O])
3795 # Code from module alloca-opt:
3796 # Code from module allocator:
3797 # Code from module areadlink:
3798+ # Code from module arg-nonnull:
3799 # Code from module binary-io:
3800+ # Code from module c++defs:
3801 # Code from module canonicalize-lgpl:
3802 # Code from module careadlinkat:
3803 # Code from module dosname:
3804@@ -46,7 +48,6 @@ AC_DEFUN([gl_EARLY],
3805 # Code from module havelib:
3806 # Code from module include_next:
3807 # Code from module intprops:
3808- # Code from module largefile:
3809 # Code from module libiconv-misc:
3810 # Code from module lstat:
3811 # Code from module malloca:
3812@@ -64,10 +65,6 @@ AC_DEFUN([gl_EARLY],
3813 # Code from module signal:
3814 # Code from module sigpipe:
3815 # Code from module sigprocmask:
3816- # Code from module snippet/_Noreturn:
3817- # Code from module snippet/arg-nonnull:
3818- # Code from module snippet/c++defs:
3819- # Code from module snippet/warn-on-use:
3820 # Code from module ssize_t:
3821 # Code from module stat:
3822 # Code from module stdbool:
3823@@ -77,7 +74,6 @@ AC_DEFUN([gl_EARLY],
3824 # Code from module stdlib:
3825 # Code from module streq:
3826 # Code from module strerror:
3827- # Code from module strerror-override:
3828 # Code from module string:
3829 # Code from module sys_stat:
3830 # Code from module time:
3831@@ -87,6 +83,7 @@ AC_DEFUN([gl_EARLY],
3832 # Code from module uniwidth/width:
3833 # Code from module unlocked-io:
3834 # Code from module verify:
3835+ # Code from module warn-on-use:
3836 # Code from module xalloc:
3837 # Code from module xreadlink:
3838 ])
3839@@ -109,9 +106,6 @@ AC_DEFUN([gl_INIT],
3840 gl_source_base='srclib'
3841 gl_FUNC_ALLOCA
3842 gl_CANONICALIZE_LGPL
3843-if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
3844- AC_LIBOBJ([canonicalize-lgpl])
3845-fi
3846 gl_MODULE_INDICATOR([canonicalize-lgpl])
3847 gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
3848 gl_STDLIB_MODULE_INDICATOR([realpath])
3849@@ -121,10 +115,6 @@ gl_ENVIRON
3850 gl_UNISTD_MODULE_INDICATOR([environ])
3851 gl_HEADER_ERRNO_H
3852 gl_ERROR
3853-if test $ac_cv_lib_error_at_line = no; then
3854- AC_LIBOBJ([error])
3855- gl_PREREQ_ERROR
3856-fi
3857 m4_ifdef([AM_XGETTEXT_OPTION],
3858 [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
3859 AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
3860@@ -134,43 +124,26 @@ AM_GNU_GETTEXT_VERSION([0.18.1])
3861 AC_SUBST([LIBINTL])
3862 AC_SUBST([LTLIBINTL])
3863 gl_FUNC_LSTAT
3864-if test $REPLACE_LSTAT = 1; then
3865- AC_LIBOBJ([lstat])
3866- gl_PREREQ_LSTAT
3867-fi
3868 gl_SYS_STAT_MODULE_INDICATOR([lstat])
3869 gl_MALLOCA
3870 AC_TYPE_MBSTATE_T
3871 gl_FUNC_MEMMOVE
3872-if test $ac_cv_func_memmove = no; then
3873- AC_LIBOBJ([memmove])
3874- gl_PREREQ_MEMMOVE
3875-fi
3876 gl_MULTIARCH
3877 gl_PATHMAX
3878 AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
3879 AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
3880 gl_FUNC_READ
3881-if test $REPLACE_READ = 1; then
3882- AC_LIBOBJ([read])
3883-fi
3884 gl_UNISTD_MODULE_INDICATOR([read])
3885 gl_FUNC_READLINK
3886-if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
3887- AC_LIBOBJ([readlink])
3888- gl_PREREQ_READLINK
3889-fi
3890 gl_UNISTD_MODULE_INDICATOR([readlink])
3891 gl_RELOCATABLE([$gl_source_base])
3892-if test $RELOCATABLE = yes; then
3893- AC_LIBOBJ([progreloc])
3894-fi
3895 gl_FUNC_READLINK_SEPARATE
3896 gl_CANONICALIZE_LGPL_SEPARATE
3897 gl_MALLOCA
3898-gl_RELOCATABLE_LIBRARY
3899+gl_RELOCATABLE_LIBRARY_SEPARATE
3900 gl_FUNC_SETENV_SEPARATE
3901-gl_PREREQ_SAFE_READ
3902+gl_FUNC_STRERROR_SEPARATE
3903+gl_SAFE_READ
3904 gl_SIGNAL_H
3905 gl_SIGNAL_SIGPIPE
3906 dnl Define the C macro GNULIB_SIGPIPE to 1.
3907@@ -186,17 +159,9 @@ dnl Define the substituted variable GNUL
3908 AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
3909 GNULIB_UNISTD_H_SIGPIPE=1
3910 gl_SIGNALBLOCKING
3911-if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
3912- AC_LIBOBJ([sigprocmask])
3913- gl_PREREQ_SIGPROCMASK
3914-fi
3915 gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
3916 gt_TYPE_SSIZE_T
3917 gl_FUNC_STAT
3918-if test $REPLACE_STAT = 1; then
3919- AC_LIBOBJ([stat])
3920- gl_PREREQ_STAT
3921-fi
3922 gl_SYS_STAT_MODULE_INDICATOR([stat])
3923 AM_STDBOOL_H
3924 gl_STDDEF_H
3925@@ -204,17 +169,7 @@ gl_STDINT_H
3926 gl_STDIO_H
3927 gl_STDLIB_H
3928 gl_FUNC_STRERROR
3929-if test $REPLACE_STRERROR = 1; then
3930- AC_LIBOBJ([strerror])
3931-fi
3932-gl_MODULE_INDICATOR([strerror])
3933 gl_STRING_MODULE_INDICATOR([strerror])
3934-AC_REQUIRE([gl_HEADER_ERRNO_H])
3935-AC_REQUIRE([gl_FUNC_STRERROR_0])
3936-if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
3937- AC_LIBOBJ([strerror-override])
3938- gl_PREREQ_SYS_H_WINSOCK2
3939-fi
3940 gl_HEADER_STRING_H
3941 gl_HEADER_SYS_STAT_H
3942 AC_PROG_MKDIR_P
3943@@ -364,14 +319,13 @@ AC_DEFUN([gltests_LIBSOURCES], [
3944 # This macro records the list of files which have been installed by
3945 # gnulib-tool and may be removed by future gnulib-tool invocations.
3946 AC_DEFUN([gl_FILE_LIST], [
3947+ build-aux/arg-nonnull.h
3948+ build-aux/c++defs.h
3949 build-aux/config.libpath
3950 build-aux/config.rpath
3951 build-aux/install-reloc
3952 build-aux/reloc-ldflags
3953- build-aux/snippet/_Noreturn.h
3954- build-aux/snippet/arg-nonnull.h
3955- build-aux/snippet/c++defs.h
3956- build-aux/snippet/warn-on-use.h
3957+ build-aux/warn-on-use.h
3958 doc/relocatable.texi
3959 lib/alloca.in.h
3960 lib/allocator.c
3961@@ -419,8 +373,6 @@ AC_DEFUN([gl_FILE_LIST], [
3962 lib/stdio.in.h
3963 lib/stdlib.in.h
3964 lib/streq.h
3965- lib/strerror-override.c
3966- lib/strerror-override.h
3967 lib/strerror.c
3968 lib/string.in.h
3969 lib/sys_stat.in.h
3970@@ -463,7 +415,6 @@ AC_DEFUN([gl_FILE_LIST], [
3971 m4/intmax.m4
3972 m4/inttypes-pri.m4
3973 m4/inttypes_h.m4
3974- m4/largefile.m4
3975 m4/lcmessage.m4
3976 m4/lib-ld.m4
3977 m4/lib-link.m4
3978@@ -502,7 +453,6 @@ AC_DEFUN([gl_FILE_LIST], [
3979 m4/stdlib_h.m4
3980 m4/strerror.m4
3981 m4/string_h.m4
3982- m4/sys_socket_h.m4
3983 m4/sys_stat_h.m4
3984 m4/threadlib.m4
3985 m4/time_h.m4
3986diff -Naurp libiconv-1.14.org//srcm4/include_next.m4 libiconv-1.14/srcm4/include_next.m4
3987--- libiconv-1.14.org//srcm4/include_next.m4 2011-08-07 06:42:07.000000000 -0700
3988+++ libiconv-1.14/srcm4/include_next.m4 2012-01-08 02:07:40.650484472 -0800
3989@@ -1,4 +1,4 @@
3990-# include_next.m4 serial 20
3991+# include_next.m4 serial 18
3992 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
3993 dnl This file is free software; the Free Software Foundation
3994 dnl gives unlimited permission to copy and/or distribute it,
3995@@ -175,13 +175,11 @@ AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
3996 [AC_CHECK_HEADERS_ONCE([$1])
3997 ])
3998
3999-dnl FIXME: gl_next_header and gl_header_exists must be used unquoted
4000-dnl until we can assume autoconf 2.64 or newer.
4001 m4_foreach_w([gl_HEADER_NAME], [$1],
4002 [AS_VAR_PUSHDEF([gl_next_header],
4003 [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
4004 if test $gl_cv_have_include_next = yes; then
4005- AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
4006+ AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
4007 else
4008 AC_CACHE_CHECK(
4009 [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
4010@@ -210,7 +208,7 @@ dnl until we can assume autoconf 2.64 or
4011 dnl eval is necessary to expand gl_absname_cpp.
4012 dnl Ultrix and Pyramid sh refuse to redirect output of eval,
4013 dnl so use subshell.
4014- AS_VAR_SET(gl_next_header,
4015+ AS_VAR_SET([gl_next_header],
4016 ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
4017 sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
4018 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
4019@@ -220,20 +218,20 @@ dnl until we can assume autoconf 2.64 or
4020 }'`'"'])
4021 m4_if([$2], [check],
4022 [else
4023- AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
4024+ AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
4025 fi
4026 ])
4027 ])
4028 fi
4029 AC_SUBST(
4030 AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
4031- [AS_VAR_GET(gl_next_header)])
4032+ [AS_VAR_GET([gl_next_header])])
4033 if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
4034 # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
4035 gl_next_as_first_directive='<'gl_HEADER_NAME'>'
4036 else
4037 # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
4038- gl_next_as_first_directive=AS_VAR_GET(gl_next_header)
4039+ gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
4040 fi
4041 AC_SUBST(
4042 AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
4043diff -Naurp libiconv-1.14.org//srcm4/largefile.m4 libiconv-1.14/srcm4/largefile.m4
4044--- libiconv-1.14.org//srcm4/largefile.m4 2011-08-07 06:42:07.000000000 -0700
4045+++ libiconv-1.14/srcm4/largefile.m4 1969-12-31 16:00:00.000000000 -0800
4046@@ -1,104 +0,0 @@
4047-# Enable large files on systems where this is not the default.
4048-
4049-# Copyright 1992-1996, 1998-2011 Free Software Foundation, Inc.
4050-# This file is free software; the Free Software Foundation
4051-# gives unlimited permission to copy and/or distribute it,
4052-# with or without modifications, as long as this notice is preserved.
4053-
4054-# The following implementation works around a problem in autoconf <= 2.68;
4055-# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5.
4056-m4_version_prereq([2.69], [] ,[
4057-
4058-# _AC_SYS_LARGEFILE_TEST_INCLUDES
4059-# -------------------------------
4060-m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
4061-[@%:@include <sys/types.h>
4062- /* Check that off_t can represent 2**63 - 1 correctly.
4063- We can't simply define LARGE_OFF_T to be 9223372036854775807,
4064- since some C++ compilers masquerading as C compilers
4065- incorrectly reject 9223372036854775807. */
4066-@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
4067- int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
4068- && LARGE_OFF_T % 2147483647 == 1)
4069- ? 1 : -1]];[]dnl
4070-])
4071-
4072-
4073-# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
4074-# CACHE-VAR,
4075-# DESCRIPTION,
4076-# PROLOGUE, [FUNCTION-BODY])
4077-# --------------------------------------------------------
4078-m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
4079-[AC_CACHE_CHECK([for $1 value needed for large files], [$3],
4080-[while :; do
4081- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
4082- [AC_LANG_PROGRAM([$5], [$6])],
4083- [$3=no; break])
4084- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
4085- [AC_LANG_PROGRAM([@%:@define $1 $2
4086-$5], [$6])],
4087- [$3=$2; break])
4088- $3=unknown
4089- break
4090-done])
4091-case $$3 in #(
4092- no | unknown) ;;
4093- *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);;
4094-esac
4095-rm -rf conftest*[]dnl
4096-])# _AC_SYS_LARGEFILE_MACRO_VALUE
4097-
4098-
4099-# AC_SYS_LARGEFILE
4100-# ----------------
4101-# By default, many hosts won't let programs access large files;
4102-# one must use special compiler options to get large-file access to work.
4103-# For more details about this brain damage please see:
4104-# http://www.unix-systems.org/version2/whatsnew/lfs20mar.html
4105-AC_DEFUN([AC_SYS_LARGEFILE],
4106-[AC_ARG_ENABLE(largefile,
4107- [ --disable-largefile omit support for large files])
4108-if test "$enable_largefile" != no; then
4109-
4110- AC_CACHE_CHECK([for special C compiler options needed for large files],
4111- ac_cv_sys_largefile_CC,
4112- [ac_cv_sys_largefile_CC=no
4113- if test "$GCC" != yes; then
4114- ac_save_CC=$CC
4115- while :; do
4116- # IRIX 6.2 and later do not support large files by default,
4117- # so use the C compiler's -n32 option if that helps.
4118- AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
4119- AC_COMPILE_IFELSE([], [break])
4120- CC="$CC -n32"
4121- AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
4122- break
4123- done
4124- CC=$ac_save_CC
4125- rm -f conftest.$ac_ext
4126- fi])
4127- if test "$ac_cv_sys_largefile_CC" != no; then
4128- CC=$CC$ac_cv_sys_largefile_CC
4129- fi
4130-
4131- _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
4132- ac_cv_sys_file_offset_bits,
4133- [Number of bits in a file offset, on hosts where this is settable.],
4134- [_AC_SYS_LARGEFILE_TEST_INCLUDES])
4135- if test $ac_cv_sys_file_offset_bits = unknown; then
4136- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
4137- ac_cv_sys_large_files,
4138- [Define for large files, on AIX-style hosts.],
4139- [_AC_SYS_LARGEFILE_TEST_INCLUDES])
4140- fi
4141-
4142- AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],
4143-[/* Enable large inode numbers on Mac OS X. */
4144-#ifndef _DARWIN_USE_64_BIT_INODE
4145-# define _DARWIN_USE_64_BIT_INODE 1
4146-#endif])
4147-fi
4148-])# AC_SYS_LARGEFILE
4149-
4150-])# m4_version_prereq 2.69
4151diff -Naurp libiconv-1.14.org//srcm4/lstat.m4 libiconv-1.14/srcm4/lstat.m4
4152--- libiconv-1.14.org//srcm4/lstat.m4 2011-08-07 06:42:07.000000000 -0700
4153+++ libiconv-1.14/srcm4/lstat.m4 2012-01-08 02:07:40.722484476 -0800
4154@@ -1,4 +1,4 @@
4155-# serial 23
4156+# serial 21
4157
4158 # Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc.
4159 #
4160@@ -15,28 +15,24 @@ AC_DEFUN([gl_FUNC_LSTAT],
4161 dnl "#define lstat stat", and lstat.c is a no-op.
4162 AC_CHECK_FUNCS_ONCE([lstat])
4163 if test $ac_cv_func_lstat = yes; then
4164- AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
4165- if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then
4166+ AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
4167+ if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
4168+ dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ([lstat]).
4169 REPLACE_LSTAT=1
4170 fi
4171+ # Prerequisites of lib/lstat.c.
4172+ AC_REQUIRE([AC_C_INLINE])
4173 else
4174 HAVE_LSTAT=0
4175 fi
4176 ])
4177
4178-# Prerequisites of lib/lstat.c.
4179-AC_DEFUN([gl_PREREQ_LSTAT],
4180+# Redefine AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK, because it is no longer
4181+# maintained in Autoconf.
4182+AC_DEFUN([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
4183 [
4184- AC_REQUIRE([AC_C_INLINE])
4185- :
4186-])
4187-
4188-AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
4189-[
4190- dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it
4191- dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ.
4192 AC_CACHE_CHECK([whether lstat correctly handles trailing slash],
4193- [gl_cv_func_lstat_dereferences_slashed_symlink],
4194+ [ac_cv_func_lstat_dereferences_slashed_symlink],
4195 [rm -f conftest.sym conftest.file
4196 echo >conftest.file
4197 if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
4198@@ -49,22 +45,25 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_
4199 have to compile and use the lstat wrapper. */
4200 return lstat ("conftest.sym/", &sbuf) == 0;
4201 ]])],
4202- [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
4203- [gl_cv_func_lstat_dereferences_slashed_symlink=no],
4204+ [ac_cv_func_lstat_dereferences_slashed_symlink=yes],
4205+ [ac_cv_func_lstat_dereferences_slashed_symlink=no],
4206 [# When cross-compiling, be pessimistic so we will end up using the
4207 # replacement version of lstat that checks for trailing slashes and
4208 # calls lstat a second time when necessary.
4209- gl_cv_func_lstat_dereferences_slashed_symlink=no
4210+ ac_cv_func_lstat_dereferences_slashed_symlink=no
4211 ])
4212 else
4213 # If the 'ln -s' command failed, then we probably don't even
4214 # have an lstat function.
4215- gl_cv_func_lstat_dereferences_slashed_symlink=no
4216+ ac_cv_func_lstat_dereferences_slashed_symlink=no
4217 fi
4218 rm -f conftest.sym conftest.file
4219 ])
4220- test $gl_cv_func_lstat_dereferences_slashed_symlink = yes &&
4221+ test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
4222 AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
4223 [Define to 1 if `lstat' dereferences a symlink specified
4224 with a trailing slash.])
4225+ if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
4226+ AC_LIBOBJ([lstat])
4227+ fi
4228 ])
4229diff -Naurp libiconv-1.14.org//srcm4/memmove.m4 libiconv-1.14/srcm4/memmove.m4
4230--- libiconv-1.14.org//srcm4/memmove.m4 2011-08-07 06:42:07.000000000 -0700
4231+++ libiconv-1.14/srcm4/memmove.m4 2012-01-08 02:07:40.738484477 -0800
4232@@ -1,4 +1,4 @@
4233-# memmove.m4 serial 4
4234+# memmove.m4 serial 3
4235 dnl Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc.
4236 dnl This file is free software; the Free Software Foundation
4237 dnl gives unlimited permission to copy and/or distribute it,
4238@@ -6,7 +6,10 @@ dnl with or without modifications, as lo
4239
4240 AC_DEFUN([gl_FUNC_MEMMOVE],
4241 [
4242- AC_CHECK_FUNCS([memmove])
4243+ AC_REPLACE_FUNCS([memmove])
4244+ if test $ac_cv_func_memmove = no; then
4245+ gl_PREREQ_MEMMOVE
4246+ fi
4247 ])
4248
4249 # Prerequisites of lib/memmove.c.
4250diff -Naurp libiconv-1.14.org//srcm4/pathmax.m4 libiconv-1.14/srcm4/pathmax.m4
4251--- libiconv-1.14.org//srcm4/pathmax.m4 2011-08-07 06:42:07.000000000 -0700
4252+++ libiconv-1.14/srcm4/pathmax.m4 2012-01-08 02:07:40.758484478 -0800
4253@@ -1,4 +1,4 @@
4254-# pathmax.m4 serial 9
4255+# pathmax.m4 serial 8
4256 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation,
4257 dnl Inc.
4258 dnl This file is free software; the Free Software Foundation
4259@@ -8,5 +8,6 @@ dnl with or without modifications, as lo
4260 AC_DEFUN([gl_PATHMAX],
4261 [
4262 dnl Prerequisites of lib/pathmax.h.
4263+ AC_CHECK_FUNCS_ONCE([pathconf])
4264 AC_CHECK_HEADERS_ONCE([sys/param.h])
4265 ])
4266diff -Naurp libiconv-1.14.org//srcm4/po.m4 libiconv-1.14/srcm4/po.m4
4267--- libiconv-1.14.org//srcm4/po.m4 2011-08-07 06:42:07.000000000 -0700
4268+++ libiconv-1.14/srcm4/po.m4 2012-01-08 02:07:40.766484477 -0800
4269@@ -1,4 +1,4 @@
4270-# po.m4 serial 17a
4271+# po.m4 serial 17 (gettext-0.18)
4272 dnl Copyright (C) 1995-2011 Free Software Foundation, Inc.
4273 dnl This file is free software; the Free Software Foundation
4274 dnl gives unlimited permission to copy and/or distribute it,
4275@@ -118,8 +118,7 @@ changequote([,])dnl
4276 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
4277 rm -f "$ac_dir/POTFILES"
4278 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
4279- gt_tab=`printf '\t'`
4280- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
4281+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
4282 POMAKEFILEDEPS="POTFILES.in"
4283 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
4284 # on $ac_dir but don't depend on user-specified configuration
4285@@ -255,7 +254,6 @@ EOT
4286 fi
4287
4288 # A sed script that extracts the value of VARIABLE from a Makefile.
4289- tab=`printf '\t'`
4290 sed_x_variable='
4291 # Test if the hold space is empty.
4292 x
4293@@ -263,9 +261,9 @@ s/P/P/
4294 x
4295 ta
4296 # Yes it was empty. Look if we have the expected variable definition.
4297-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
4298+/^[ ]*VARIABLE[ ]*=/{
4299 # Seen the first line of the variable definition.
4300- s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
4301+ s/^[ ]*VARIABLE[ ]*=//
4302 ba
4303 }
4304 bd
4305@@ -407,15 +405,14 @@ changequote([,])dnl
4306 fi
4307
4308 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
4309- tab=`printf '\t'`
4310 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
4311 # Add dependencies that cannot be formulated as a simple suffix rule.
4312 for lang in $ALL_LINGUAS; do
4313 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
4314 cat >> "$ac_file.tmp" <<EOF
4315 $frobbedlang.msg: $lang.po
4316-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
4317-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4318+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
4319+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4320 EOF
4321 done
4322 fi
4323@@ -425,8 +422,8 @@ EOF
4324 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
4325 cat >> "$ac_file.tmp" <<EOF
4326 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
4327-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
4328-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4329+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
4330+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4331 EOF
4332 done
4333 fi
4334diff -Naurp libiconv-1.14.org//srcm4/readlink.m4 libiconv-1.14/srcm4/readlink.m4
4335--- libiconv-1.14.org//srcm4/readlink.m4 2011-08-07 06:42:07.000000000 -0700
4336+++ libiconv-1.14/srcm4/readlink.m4 2012-01-08 02:07:40.790484479 -0800
4337@@ -1,4 +1,4 @@
4338-# readlink.m4 serial 11
4339+# readlink.m4 serial 10
4340 dnl Copyright (C) 2003, 2007, 2009-2011 Free Software Foundation, Inc.
4341 dnl This file is free software; the Free Software Foundation
4342 dnl gives unlimited permission to copy and/or distribute it,
4343@@ -10,6 +10,8 @@ AC_DEFUN([gl_FUNC_READLINK],
4344 AC_CHECK_FUNCS_ONCE([readlink])
4345 if test $ac_cv_func_readlink = no; then
4346 HAVE_READLINK=0
4347+ AC_LIBOBJ([readlink])
4348+ gl_PREREQ_READLINK
4349 else
4350 AC_CACHE_CHECK([whether readlink signature is correct],
4351 [gl_cv_decl_readlink_works],
4352@@ -38,8 +40,10 @@ AC_DEFUN([gl_FUNC_READLINK],
4353 AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
4354 fails to recognize a trailing slash.])
4355 REPLACE_READLINK=1
4356+ AC_LIBOBJ([readlink])
4357 elif test "$gl_cv_decl_readlink_works" != yes; then
4358 REPLACE_READLINK=1
4359+ AC_LIBOBJ([readlink])
4360 fi
4361 fi
4362 ])
4363diff -Naurp libiconv-1.14.org//srcm4/read.m4 libiconv-1.14/srcm4/read.m4
4364--- libiconv-1.14.org//srcm4/read.m4 2011-08-07 06:42:07.000000000 -0700
4365+++ libiconv-1.14/srcm4/read.m4 2012-01-08 02:07:40.782484478 -0800
4366@@ -1,4 +1,4 @@
4367-# read.m4 serial 2
4368+# read.m4 serial 1
4369 dnl Copyright (C) 2011 Free Software Foundation, Inc.
4370 dnl This file is free software; the Free Software Foundation
4371 dnl gives unlimited permission to copy and/or distribute it,
4372@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_READ],
4373 gl_NONBLOCKING_IO
4374 if test $gl_cv_have_nonblocking != yes; then
4375 REPLACE_READ=1
4376+ AC_LIBOBJ([read])
4377 fi
4378 ])
4379 ])
4380diff -Naurp libiconv-1.14.org//srcm4/relocatable-lib.m4 libiconv-1.14/srcm4/relocatable-lib.m4
4381--- libiconv-1.14.org//srcm4/relocatable-lib.m4 2011-08-07 06:42:07.000000000 -0700
4382+++ libiconv-1.14/srcm4/relocatable-lib.m4 2012-01-08 02:07:40.798484480 -0800
4383@@ -1,4 +1,4 @@
4384-# relocatable-lib.m4 serial 6
4385+# relocatable-lib.m4 serial 5
4386 dnl Copyright (C) 2003, 2005-2007, 2009-2011 Free Software Foundation, Inc.
4387 dnl This file is free software; the Free Software Foundation
4388 dnl gives unlimited permission to copy and/or distribute it,
4389@@ -10,6 +10,9 @@ dnl Support for relocatable libraries.
4390 AC_DEFUN([gl_RELOCATABLE_LIBRARY],
4391 [
4392 AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
4393+ if test $RELOCATABLE = yes; then
4394+ AC_LIBOBJ([relocatable])
4395+ fi
4396 ])
4397 AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
4398 [
4399@@ -29,6 +32,13 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
4400 fi
4401 ])
4402
4403+dnl Like gl_RELOCATABLE_LIBRARY, except prepare for separate compilation
4404+dnl (no AC_LIBOBJ).
4405+AC_DEFUN([gl_RELOCATABLE_LIBRARY_SEPARATE],
4406+[
4407+ AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
4408+])
4409+
4410 dnl Support for relocatable packages for which it is a nop.
4411 AC_DEFUN([gl_RELOCATABLE_NOP],
4412 [
4413diff -Naurp libiconv-1.14.org//srcm4/relocatable.m4 libiconv-1.14/srcm4/relocatable.m4
4414--- libiconv-1.14.org//srcm4/relocatable.m4 2011-08-07 06:42:07.000000000 -0700
4415+++ libiconv-1.14/srcm4/relocatable.m4 2012-01-08 02:07:40.802484479 -0800
4416@@ -1,4 +1,4 @@
4417-# relocatable.m4 serial 17
4418+# relocatable.m4 serial 16
4419 dnl Copyright (C) 2003, 2005-2007, 2009-2011 Free Software Foundation, Inc.
4420 dnl This file is free software; the Free Software Foundation
4421 dnl gives unlimited permission to copy and/or distribute it,
4422@@ -14,6 +14,9 @@ AC_DEFUN([gl_RELOCATABLE],
4423 [
4424 AC_REQUIRE([gl_RELOCATABLE_BODY])
4425 gl_RELOCATABLE_LIBRARY
4426+ if test $RELOCATABLE = yes; then
4427+ AC_LIBOBJ([progreloc])
4428+ fi
4429 : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
4430 RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
4431 RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
4432diff -Naurp libiconv-1.14.org//srcm4/safe-read.m4 libiconv-1.14/srcm4/safe-read.m4
4433--- libiconv-1.14.org//srcm4/safe-read.m4 2011-08-07 06:42:07.000000000 -0700
4434+++ libiconv-1.14/srcm4/safe-read.m4 2012-01-08 02:07:40.810484480 -0800
4435@@ -1,10 +1,17 @@
4436-# safe-read.m4 serial 6
4437+# safe-read.m4 serial 5
4438 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation,
4439 dnl Inc.
4440 dnl This file is free software; the Free Software Foundation
4441 dnl gives unlimited permission to copy and/or distribute it,
4442 dnl with or without modifications, as long as this notice is preserved.
4443
4444+AC_DEFUN([gl_SAFE_READ],
4445+[
4446+ AC_LIBOBJ([safe-read])
4447+
4448+ gl_PREREQ_SAFE_READ
4449+])
4450+
4451 # Prerequisites of lib/safe-read.c.
4452 AC_DEFUN([gl_PREREQ_SAFE_READ],
4453 [
4454diff -Naurp libiconv-1.14.org//srcm4/setenv.m4 libiconv-1.14/srcm4/setenv.m4
4455--- libiconv-1.14.org//srcm4/setenv.m4 2011-08-07 06:42:07.000000000 -0700
4456+++ libiconv-1.14/srcm4/setenv.m4 2012-01-08 02:07:40.818484481 -0800
4457@@ -1,4 +1,4 @@
4458-# setenv.m4 serial 24
4459+# setenv.m4 serial 22
4460 dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
4461 dnl This file is free software; the Free Software Foundation
4462 dnl gives unlimited permission to copy and/or distribute it,
4463@@ -38,6 +38,9 @@ AC_DEFUN([gl_FUNC_SETENV],
4464 REPLACE_SETENV=1
4465 fi
4466 fi
4467+ if test $HAVE_SETENV$REPLACE_SETENV != 10; then
4468+ AC_LIBOBJ([setenv])
4469+ fi
4470 ])
4471
4472 # Like gl_FUNC_SETENV, except prepare for separate compilation
4473@@ -62,9 +65,9 @@ AC_DEFUN([gl_FUNC_UNSETENV],
4474 fi
4475 AC_CHECK_FUNCS([unsetenv])
4476 if test $ac_cv_func_unsetenv = no; then
4477- HAVE_UNSETENV=0
4478+ AC_LIBOBJ([unsetenv])
4479+ gl_PREREQ_UNSETENV
4480 else
4481- HAVE_UNSETENV=1
4482 dnl Some BSDs return void, failing to do error checking.
4483 AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret],
4484 [AC_COMPILE_IFELSE(
4485@@ -90,6 +93,7 @@ int unsetenv();
4486 AC_DEFINE([VOID_UNSETENV], [1], [Define to 1 if unsetenv returns void
4487 instead of int.])
4488 REPLACE_UNSETENV=1
4489+ AC_LIBOBJ([unsetenv])
4490 fi
4491
4492 dnl Solaris 10 unsetenv does not remove all copies of a name.
4493@@ -122,6 +126,7 @@ int unsetenv();
4494 [gl_cv_func_unsetenv_works="guessing no"])])
4495 if test "$gl_cv_func_unsetenv_works" != yes; then
4496 REPLACE_UNSETENV=1
4497+ AC_LIBOBJ([unsetenv])
4498 fi
4499 fi
4500 ])
4501diff -Naurp libiconv-1.14.org//srcm4/signalblocking.m4 libiconv-1.14/srcm4/signalblocking.m4
4502--- libiconv-1.14.org//srcm4/signalblocking.m4 2011-08-07 06:42:07.000000000 -0700
4503+++ libiconv-1.14/srcm4/signalblocking.m4 2012-01-08 02:07:40.834484482 -0800
4504@@ -1,4 +1,4 @@
4505-# signalblocking.m4 serial 12
4506+# signalblocking.m4 serial 10
4507 dnl Copyright (C) 2001-2002, 2006-2011 Free Software Foundation, Inc.
4508 dnl This file is free software; the Free Software Foundation
4509 dnl gives unlimited permission to copy and/or distribute it,
4510@@ -12,14 +12,31 @@ dnl with or without modifications, as lo
4511 AC_DEFUN([gl_SIGNALBLOCKING],
4512 [
4513 AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
4514- AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
4515- if test $gl_cv_type_sigset_t = yes; then
4516+ signals_not_posix=
4517+ AC_EGREP_HEADER([sigset_t], [signal.h], , [signals_not_posix=1])
4518+ if test -z "$signals_not_posix"; then
4519 AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1])
4520 fi
4521 if test -z "$gl_cv_func_sigprocmask"; then
4522 HAVE_POSIX_SIGNALBLOCKING=0
4523+ AC_LIBOBJ([sigprocmask])
4524+ gl_PREREQ_SIGPROCMASK
4525 fi
4526 ])
4527
4528-# Prerequisites of lib/sigprocmask.c.
4529-AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])
4530+# Prerequisites of the part of lib/signal.in.h and of lib/sigprocmask.c.
4531+AC_DEFUN([gl_PREREQ_SIGPROCMASK],
4532+[
4533+ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
4534+ AC_CHECK_TYPES([sigset_t],
4535+ [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
4536+ [#include <signal.h>
4537+/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */
4538+#include <sys/types.h>])
4539+ if test $gl_cv_type_sigset_t != yes; then
4540+ HAVE_SIGSET_T=0
4541+ fi
4542+ dnl HAVE_SIGSET_T is 1 if the system lacks the sigprocmask function but has
4543+ dnl the sigset_t type.
4544+ AC_SUBST([HAVE_SIGSET_T])
4545+])
4546diff -Naurp libiconv-1.14.org//srcm4/signal_h.m4 libiconv-1.14/srcm4/signal_h.m4
4547--- libiconv-1.14.org//srcm4/signal_h.m4 2011-08-07 06:42:07.000000000 -0700
4548+++ libiconv-1.14/srcm4/signal_h.m4 2012-01-08 02:07:40.826484480 -0800
4549@@ -1,4 +1,4 @@
4550-# signal_h.m4 serial 16
4551+# signal_h.m4 serial 12
4552 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
4553 dnl This file is free software; the Free Software Foundation
4554 dnl gives unlimited permission to copy and/or distribute it,
4555@@ -7,7 +7,6 @@ dnl with or without modifications, as lo
4556 AC_DEFUN([gl_SIGNAL_H],
4557 [
4558 AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
4559- AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
4560 gl_NEXT_HEADERS([signal.h])
4561
4562 # AIX declares sig_atomic_t to already include volatile, and C89 compilers
4563@@ -28,25 +27,10 @@ AC_DEFUN([gl_SIGNAL_H],
4564 dnl Check for declarations of anything we want to poison if the
4565 dnl corresponding gnulib module is not in use.
4566 gl_WARN_ON_USE_PREPARE([[#include <signal.h>
4567- ]], [pthread_sigmask sigaction
4568- sigaddset sigdelset sigemptyset sigfillset sigismember
4569+ ]], [sigaction sigaddset sigdelset sigemptyset sigfillset sigismember
4570 sigpending sigprocmask])
4571 ])
4572
4573-AC_DEFUN([gl_CHECK_TYPE_SIGSET_T],
4574-[
4575- AC_CHECK_TYPES([sigset_t],
4576- [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
4577- [[
4578- #include <signal.h>
4579- /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */
4580- #include <sys/types.h>
4581- ]])
4582- if test $gl_cv_type_sigset_t != yes; then
4583- HAVE_SIGSET_T=0
4584- fi
4585-])
4586-
4587 AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR],
4588 [
4589 dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
4590@@ -58,13 +42,11 @@ AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR],
4591
4592 AC_DEFUN([gl_SIGNAL_H_DEFAULTS],
4593 [
4594- GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK])
4595 GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE])
4596 GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK])
4597 GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION])
4598 dnl Assume proper GNU behavior unless another module says otherwise.
4599 HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING])
4600- HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK])
4601 HAVE_SIGSET_T=1; AC_SUBST([HAVE_SIGSET_T])
4602 HAVE_SIGINFO_T=1; AC_SUBST([HAVE_SIGINFO_T])
4603 HAVE_SIGACTION=1; AC_SUBST([HAVE_SIGACTION])
4604@@ -73,5 +55,4 @@ AC_DEFUN([gl_SIGNAL_H_DEFAULTS],
4605 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
4606 AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T])
4607 HAVE_SIGHANDLER_T=1; AC_SUBST([HAVE_SIGHANDLER_T])
4608- REPLACE_PTHREAD_SIGMASK=0; AC_SUBST([REPLACE_PTHREAD_SIGMASK])
4609 ])
4610diff -Naurp libiconv-1.14.org//srcm4/stat.m4 libiconv-1.14/srcm4/stat.m4
4611--- libiconv-1.14.org//srcm4/stat.m4 2011-08-07 06:42:07.000000000 -0700
4612+++ libiconv-1.14/srcm4/stat.m4 2012-01-08 02:07:40.854484483 -0800
4613@@ -1,4 +1,4 @@
4614-# serial 8
4615+# serial 7
4616
4617 # Copyright (C) 2009-2011 Free Software Foundation, Inc.
4618 #
4619@@ -58,11 +58,9 @@ AC_DEFUN([gl_FUNC_STAT],
4620 AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
4621 help when passed a file name with a trailing slash]);;
4622 esac
4623-])
4624-
4625-# Prerequisites of lib/stat.c.
4626-AC_DEFUN([gl_PREREQ_STAT],
4627-[
4628- AC_REQUIRE([AC_C_INLINE])
4629- :
4630+ if test $REPLACE_STAT = 1; then
4631+ AC_LIBOBJ([stat])
4632+ dnl Prerequisites of lib/stat.c.
4633+ AC_REQUIRE([AC_C_INLINE])
4634+ fi
4635 ])
4636diff -Naurp libiconv-1.14.org//srcm4/strerror.m4 libiconv-1.14/srcm4/strerror.m4
4637--- libiconv-1.14.org//srcm4/strerror.m4 2011-08-07 06:42:07.000000000 -0700
4638+++ libiconv-1.14/srcm4/strerror.m4 2012-01-08 02:07:40.890484484 -0800
4639@@ -1,4 +1,4 @@
4640-# strerror.m4 serial 16
4641+# strerror.m4 serial 9
4642 dnl Copyright (C) 2002, 2007-2011 Free Software Foundation, Inc.
4643 dnl This file is free software; the Free Software Foundation
4644 dnl gives unlimited permission to copy and/or distribute it,
4645@@ -6,73 +6,63 @@ dnl with or without modifications, as lo
4646
4647 AC_DEFUN([gl_FUNC_STRERROR],
4648 [
4649+ AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE])
4650+ if test $REPLACE_STRERROR = 1; then
4651+ AC_LIBOBJ([strerror])
4652+ AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR],
4653+ [Define this to 1 if strerror is broken.])
4654+ fi
4655+])
4656+
4657+# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ).
4658+AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
4659+[
4660 AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
4661 AC_REQUIRE([gl_HEADER_ERRNO_H])
4662- AC_REQUIRE([gl_FUNC_STRERROR_0])
4663- m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
4664- AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS])
4665- ])
4666- if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
4667+ if test -z "$ERRNO_H"; then
4668 AC_CACHE_CHECK([for working strerror function],
4669 [gl_cv_func_working_strerror],
4670 [AC_RUN_IFELSE(
4671 [AC_LANG_PROGRAM(
4672 [[#include <string.h>
4673 ]],
4674- [[if (!*strerror (-2)) return 1;]])],
4675+ [[return !*strerror (-2);]])],
4676 [gl_cv_func_working_strerror=yes],
4677 [gl_cv_func_working_strerror=no],
4678- [dnl Be pessimistic on cross-compiles for now.
4679- gl_cv_func_working_strerror="guessing no"])
4680+ [dnl Assume crossbuild works if it compiles.
4681+ AC_COMPILE_IFELSE(
4682+ [AC_LANG_PROGRAM(
4683+ [[#include <string.h>
4684+ ]],
4685+ [[return !*strerror (-2);]])],
4686+ [gl_cv_func_working_strerror=yes],
4687+ [gl_cv_func_working_strerror=no])
4688+ ])
4689 ])
4690- if test "$gl_cv_func_working_strerror" != yes; then
4691+ if test $gl_cv_func_working_strerror = no; then
4692 dnl The system's strerror() fails to return a string for out-of-range
4693 dnl integers. Replace it.
4694 REPLACE_STRERROR=1
4695 fi
4696- m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
4697- dnl If the system's strerror_r or __xpg_strerror_r clobbers strerror's
4698- dnl buffer, we must replace strerror.
4699- case "$gl_cv_func_strerror_r_works" in
4700- *no) REPLACE_STRERROR=1 ;;
4701- esac
4702- ])
4703 else
4704 dnl The system's strerror() cannot know about the new errno values we add
4705- dnl to <errno.h>, or any fix for strerror(0). Replace it.
4706+ dnl to <errno.h>. Replace it.
4707 REPLACE_STRERROR=1
4708 fi
4709+ if test $REPLACE_STRERROR = 1; then
4710+ gl_PREREQ_STRERROR
4711+ fi
4712 ])
4713
4714-dnl Detect if strerror(0) passes (that is, does not set errno, and does not
4715-dnl return a string that matches strerror(-1)).
4716-AC_DEFUN([gl_FUNC_STRERROR_0],
4717-[
4718- REPLACE_STRERROR_0=0
4719- AC_CACHE_CHECK([whether strerror(0) succeeds],
4720- [gl_cv_func_strerror_0_works],
4721- [AC_RUN_IFELSE(
4722- [AC_LANG_PROGRAM(
4723- [[#include <string.h>
4724- #include <errno.h>
4725- ]],
4726- [[int result = 0;
4727- char *str;
4728- errno = 0;
4729- str = strerror (0);
4730- if (!*str) result |= 1;
4731- if (errno) result |= 2;
4732- if (strstr (str, "nknown") || strstr (str, "ndefined"))
4733- result |= 4;
4734- return result;]])],
4735- [gl_cv_func_strerror_0_works=yes],
4736- [gl_cv_func_strerror_0_works=no],
4737- [dnl Be pessimistic on cross-compiles for now.
4738- gl_cv_func_strerror_0_works="guessing no"])
4739- ])
4740- if test "$gl_cv_func_strerror_0_works" != yes; then
4741- REPLACE_STRERROR_0=1
4742- AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0)
4743- does not return a message implying success.])
4744+# Prerequisites of lib/strerror.c.
4745+AC_DEFUN([gl_PREREQ_STRERROR], [
4746+ AC_CHECK_DECLS([strerror])
4747+ AC_CHECK_HEADERS_ONCE([sys/socket.h])
4748+ if test $ac_cv_header_sys_socket_h != yes; then
4749+ dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
4750+ dnl the check for those headers unconditional; yet cygwin reports
4751+ dnl that the headers are present but cannot be compiled (since on
4752+ dnl cygwin, all socket information should come from sys/socket.h).
4753+ AC_CHECK_HEADERS([winsock2.h])
4754 fi
4755 ])
4756diff -Naurp libiconv-1.14.org//srcm4/string_h.m4 libiconv-1.14/srcm4/string_h.m4
4757--- libiconv-1.14.org//srcm4/string_h.m4 2011-08-07 06:42:07.000000000 -0700
4758+++ libiconv-1.14/srcm4/string_h.m4 2012-01-08 02:07:40.894484485 -0800
4759@@ -5,7 +5,7 @@
4760 # gives unlimited permission to copy and/or distribute it,
4761 # with or without modifications, as long as this notice is preserved.
4762
4763-# serial 21
4764+# serial 20
4765
4766 # Written by Paul Eggert.
4767
4768@@ -27,9 +27,9 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY],
4769 dnl guaranteed by C89.
4770 gl_WARN_ON_USE_PREPARE([[#include <string.h>
4771 ]],
4772- [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul
4773- strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r
4774- strerror_r strsignal strverscmp])
4775+ [memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup
4776+ strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r
4777+ strsignal strverscmp])
4778 ])
4779
4780 AC_DEFUN([gl_STRING_MODULE_INDICATOR],
4781@@ -43,8 +43,6 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR],
4782
4783 AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
4784 [
4785- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL])
4786- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL])
4787 GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR])
4788 GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM])
4789 GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY])
4790@@ -82,8 +80,6 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
4791 GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP])
4792 HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN])
4793 dnl Assume proper GNU behavior unless another module says otherwise.
4794- HAVE_FFSL=1; AC_SUBST([HAVE_FFSL])
4795- HAVE_FFSLL=1; AC_SUBST([HAVE_FFSLL])
4796 HAVE_MEMCHR=1; AC_SUBST([HAVE_MEMCHR])
4797 HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM])
4798 HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY])
4799diff -Naurp libiconv-1.14.org//srcm4/sys_socket_h.m4 libiconv-1.14/srcm4/sys_socket_h.m4
4800--- libiconv-1.14.org//srcm4/sys_socket_h.m4 2011-08-07 06:42:07.000000000 -0700
4801+++ libiconv-1.14/srcm4/sys_socket_h.m4 1969-12-31 16:00:00.000000000 -0800
4802@@ -1,177 +0,0 @@
4803-# sys_socket_h.m4 serial 22
4804-dnl Copyright (C) 2005-2011 Free Software Foundation, Inc.
4805-dnl This file is free software; the Free Software Foundation
4806-dnl gives unlimited permission to copy and/or distribute it,
4807-dnl with or without modifications, as long as this notice is preserved.
4808-
4809-dnl From Simon Josefsson.
4810-
4811-AC_DEFUN([gl_HEADER_SYS_SOCKET],
4812-[
4813- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
4814- AC_REQUIRE([AC_CANONICAL_HOST])
4815- AC_REQUIRE([AC_C_INLINE])
4816-
4817- dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
4818- dnl old-style declarations (with return type 'int' instead of 'ssize_t')
4819- dnl unless _POSIX_PII_SOCKET is defined.
4820- case "$host_os" in
4821- osf*)
4822- AC_DEFINE([_POSIX_PII_SOCKET], [1],
4823- [Define to 1 in order to get the POSIX compatible declarations
4824- of socket functions.])
4825- ;;
4826- esac
4827-
4828- AC_CACHE_CHECK([whether <sys/socket.h> is self-contained],
4829- [gl_cv_header_sys_socket_h_selfcontained],
4830- [
4831- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[]])],
4832- [gl_cv_header_sys_socket_h_selfcontained=yes],
4833- [gl_cv_header_sys_socket_h_selfcontained=no])
4834- ])
4835- if test $gl_cv_header_sys_socket_h_selfcontained = yes; then
4836- dnl If the shutdown function exists, <sys/socket.h> should define
4837- dnl SHUT_RD, SHUT_WR, SHUT_RDWR.
4838- AC_CHECK_FUNCS([shutdown])
4839- if test $ac_cv_func_shutdown = yes; then
4840- AC_CACHE_CHECK([whether <sys/socket.h> defines the SHUT_* macros],
4841- [gl_cv_header_sys_socket_h_shut],
4842- [
4843- AC_COMPILE_IFELSE(
4844- [AC_LANG_PROGRAM([[#include <sys/socket.h>]],
4845- [[int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };]])],
4846- [gl_cv_header_sys_socket_h_shut=yes],
4847- [gl_cv_header_sys_socket_h_shut=no])
4848- ])
4849- if test $gl_cv_header_sys_socket_h_shut = no; then
4850- SYS_SOCKET_H='sys/socket.h'
4851- fi
4852- fi
4853- fi
4854- # We need to check for ws2tcpip.h now.
4855- gl_PREREQ_SYS_H_SOCKET
4856- AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[
4857- /* sys/types.h is not needed according to POSIX, but the
4858- sys/socket.h in i386-unknown-freebsd4.10 and
4859- powerpc-apple-darwin5.5 required it. */
4860-#include <sys/types.h>
4861-#ifdef HAVE_SYS_SOCKET_H
4862-#include <sys/socket.h>
4863-#endif
4864-#ifdef HAVE_WS2TCPIP_H
4865-#include <ws2tcpip.h>
4866-#endif
4867-])
4868- if test $ac_cv_type_struct_sockaddr_storage = no; then
4869- HAVE_STRUCT_SOCKADDR_STORAGE=0
4870- fi
4871- if test $ac_cv_type_sa_family_t = no; then
4872- HAVE_SA_FAMILY_T=0
4873- fi
4874- if test $ac_cv_type_struct_sockaddr_storage != no; then
4875- AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
4876- [],
4877- [HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0],
4878- [#include <sys/types.h>
4879- #ifdef HAVE_SYS_SOCKET_H
4880- #include <sys/socket.h>
4881- #endif
4882- #ifdef HAVE_WS2TCPIP_H
4883- #include <ws2tcpip.h>
4884- #endif
4885- ])
4886- fi
4887- if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \
4888- || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then
4889- SYS_SOCKET_H='sys/socket.h'
4890- fi
4891- gl_PREREQ_SYS_H_WINSOCK2
4892-
4893- dnl Check for declarations of anything we want to poison if the
4894- dnl corresponding gnulib module is not in use.
4895- gl_WARN_ON_USE_PREPARE([[
4896-/* Some systems require prerequisite headers. */
4897-#include <sys/types.h>
4898-#include <sys/socket.h>
4899- ]], [socket connect accept bind getpeername getsockname getsockopt
4900- listen recv send recvfrom sendto setsockopt shutdown accept4])
4901-])
4902-
4903-AC_DEFUN([gl_PREREQ_SYS_H_SOCKET],
4904-[
4905- dnl Check prerequisites of the <sys/socket.h> replacement.
4906- AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
4907- gl_CHECK_NEXT_HEADERS([sys/socket.h])
4908- if test $ac_cv_header_sys_socket_h = yes; then
4909- HAVE_SYS_SOCKET_H=1
4910- HAVE_WS2TCPIP_H=0
4911- else
4912- HAVE_SYS_SOCKET_H=0
4913- if test $ac_cv_header_ws2tcpip_h = yes; then
4914- HAVE_WS2TCPIP_H=1
4915- else
4916- HAVE_WS2TCPIP_H=0
4917- fi
4918- fi
4919- AC_SUBST([HAVE_SYS_SOCKET_H])
4920- AC_SUBST([HAVE_WS2TCPIP_H])
4921-])
4922-
4923-# Common prerequisites of the <sys/socket.h> replacement and of the
4924-# <sys/select.h> replacement.
4925-# Sets and substitutes HAVE_WINSOCK2_H.
4926-AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2],
4927-[
4928- m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
4929- m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
4930- AC_CHECK_HEADERS_ONCE([sys/socket.h])
4931- if test $ac_cv_header_sys_socket_h != yes; then
4932- dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
4933- dnl the check for those headers unconditional; yet cygwin reports
4934- dnl that the headers are present but cannot be compiled (since on
4935- dnl cygwin, all socket information should come from sys/socket.h).
4936- AC_CHECK_HEADERS([winsock2.h])
4937- fi
4938- if test "$ac_cv_header_winsock2_h" = yes; then
4939- HAVE_WINSOCK2_H=1
4940- UNISTD_H_HAVE_WINSOCK2_H=1
4941- SYS_IOCTL_H_HAVE_WINSOCK2_H=1
4942- else
4943- HAVE_WINSOCK2_H=0
4944- fi
4945- AC_SUBST([HAVE_WINSOCK2_H])
4946-])
4947-
4948-AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR],
4949-[
4950- dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
4951- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
4952- gl_MODULE_INDICATOR_SET_VARIABLE([$1])
4953- dnl Define it also as a C macro, for the benefit of the unit tests.
4954- gl_MODULE_INDICATOR_FOR_TESTS([$1])
4955-])
4956-
4957-AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS],
4958-[
4959- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET])
4960- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT])
4961- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT])
4962- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND])
4963- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME])
4964- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME])
4965- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT])
4966- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN])
4967- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV])
4968- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND])
4969- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM])
4970- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO])
4971- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT])
4972- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN])
4973- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4])
4974- HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
4975- HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
4976- AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
4977- HAVE_SA_FAMILY_T=1; AC_SUBST([HAVE_SA_FAMILY_T])
4978- HAVE_ACCEPT4=1; AC_SUBST([HAVE_ACCEPT4])
4979-])
4980diff -Naurp libiconv-1.14.org//srcm4/warn-on-use.m4 libiconv-1.14/srcm4/warn-on-use.m4
4981--- libiconv-1.14.org//srcm4/warn-on-use.m4 2011-08-07 06:42:07.000000000 -0700
4982+++ libiconv-1.14/srcm4/warn-on-use.m4 2012-01-08 02:07:40.934484487 -0800
4983@@ -1,4 +1,4 @@
4984-# warn-on-use.m4 serial 4
4985+# warn-on-use.m4 serial 2
4986 dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
4987 dnl This file is free software; the Free Software Foundation
4988 dnl gives unlimited permission to copy and/or distribute it,
4989@@ -27,8 +27,6 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE],
4990 [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
4991 [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
4992 undefining macros.])])dnl
4993-dnl FIXME: gl_Symbol must be used unquoted until we can assume
4994-dnl autoconf 2.64 or newer.
4995 for gl_func in m4_flatten([$2]); do
4996 AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
4997 AC_CACHE_CHECK([whether $gl_func is declared without a macro],
4998@@ -37,8 +35,8 @@ dnl autoconf 2.64 or newer.
4999 [@%:@undef $gl_func
5000 (void) $gl_func;])],
5001 [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
5002- AS_VAR_IF(gl_Symbol, [yes],
5003- [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
5004+ AS_VAR_IF(gl_Symbol, [yes],
5005+ [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
5006 dnl shortcut - if the raw declaration exists, then set a cache
5007 dnl variable to allow skipping any later AC_CHECK_DECL efforts
5008 eval ac_cv_have_decl_$gl_func=yes])
diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb
index 5eea823054..af33d6bc95 100644
--- a/meta/recipes-support/libiconv/libiconv_1.14.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.14.bb
@@ -4,13 +4,14 @@ HOMEPAGE = "http://www.gnu.org/software/libiconv"
4SECTION = "libs" 4SECTION = "libs"
5NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" 5NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
6PROVIDES = "virtual/libiconv" 6PROVIDES = "virtual/libiconv"
7PR = "r0" 7PR = "r1"
8LICENSE = "LGPLv3" 8LICENSE = "LGPLv3"
9LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ 9LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
10 file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" 10 file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
11 11
12SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 12SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
13 file://autoconf.patch \ 13 file://autoconf.patch \
14 file://add-relocatable-module.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6" 17SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6"
@@ -27,3 +28,8 @@ LEAD_SONAME = "libiconv.so"
27do_configure_prepend () { 28do_configure_prepend () {
28 rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 libcharset/m4/libtool.m4 libcharset/m4/ltoptions.m4 libcharset/m4/ltsugar.m4 libcharset/m4/ltversion.m4 libcharset/m4/lt~obsolete.m4 29 rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 libcharset/m4/libtool.m4 libcharset/m4/ltoptions.m4 libcharset/m4/ltsugar.m4 libcharset/m4/ltversion.m4 libcharset/m4/lt~obsolete.m4
29} 30}
31
32do_install_append () {
33 rm -rf ${D}${libdir}/preloadable_libiconv.so
34 rm -rf ${D}${libdir}/charset.alias
35}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 11:59:55 +0000