diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-02 12:24:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-02 12:30:01 +0000 |
commit | 8ba70a1c28a4e0ee73db5308b38abc923b0be44d (patch) | |
tree | 0ed9bff8e4bd70766c81dbb559d32781bdd93ce8 /recipes-devtools/patch | |
download | meta-gplv2-8ba70a1c28a4e0ee73db5308b38abc923b0be44d.tar.gz |
Create meta-gplv2 from files from OE-Core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'recipes-devtools/patch')
-rw-r--r-- | recipes-devtools/patch/patch.inc | 14 | ||||
-rw-r--r-- | recipes-devtools/patch/patch/debian.patch | 10426 | ||||
-rw-r--r-- | recipes-devtools/patch/patch/global-reject-file.diff | 203 | ||||
-rw-r--r-- | recipes-devtools/patch/patch/install.patch | 43 | ||||
-rw-r--r-- | recipes-devtools/patch/patch/unified-reject-files.diff | 307 | ||||
-rw-r--r-- | recipes-devtools/patch/patch_2.5.9.bb | 12 |
6 files changed, 11005 insertions, 0 deletions
diff --git a/recipes-devtools/patch/patch.inc b/recipes-devtools/patch/patch.inc new file mode 100644 index 0000000..cbfb8cf --- /dev/null +++ b/recipes-devtools/patch/patch.inc | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "Tool for applying a patch file" | ||
2 | DESCRIPTION = "patch takes a patch file containing a difference listing \ | ||
3 | produced by the diff program and applies those differences to one or more \ | ||
4 | original files, producing patched versions." | ||
5 | SECTION = "utils" | ||
6 | HOMEPAGE = "http://savannah.gnu.org/projects/patch/" | ||
7 | |||
8 | SRC_URI = "${GNU_MIRROR}/patch/patch-${PV}.tar.gz" | ||
9 | S = "${WORKDIR}/patch-${PV}" | ||
10 | |||
11 | inherit autotools update-alternatives | ||
12 | |||
13 | ALTERNATIVE_${PN} = "patch" | ||
14 | ALTERNATIVE_PRIORITY = "100" | ||
diff --git a/recipes-devtools/patch/patch/debian.patch b/recipes-devtools/patch/patch/debian.patch new file mode 100644 index 0000000..1a07646 --- /dev/null +++ b/recipes-devtools/patch/patch/debian.patch | |||
@@ -0,0 +1,10426 @@ | |||
1 | Upstream-Status: Inappropriate [debian patch] | ||
2 | |||
3 | --- patch-2.5.9.orig/m4/hash.m4 | ||
4 | +++ patch-2.5.9/m4/hash.m4 | ||
5 | @@ -0,0 +1,15 @@ | ||
6 | +# hash.m4 serial 1 | ||
7 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
8 | +dnl This file is free software, distributed under the terms of the GNU | ||
9 | +dnl General Public License. As a special exception to the GNU General | ||
10 | +dnl Public License, this file may be distributed as part of a program | ||
11 | +dnl that contains a configuration script generated by Autoconf, under | ||
12 | +dnl the same distribution terms as the rest of that program. | ||
13 | + | ||
14 | +AC_DEFUN([gl_HASH], | ||
15 | +[ | ||
16 | + dnl Prerequisites of lib/hash.c. | ||
17 | + AC_CHECK_HEADERS_ONCE(stdlib.h) | ||
18 | + AC_HEADER_STDBOOL | ||
19 | + AC_CHECK_DECLS_ONCE(free malloc) | ||
20 | +]) | ||
21 | --- patch-2.5.9.orig/m4/nanosecond_stat.m4 | ||
22 | +++ patch-2.5.9/m4/nanosecond_stat.m4 | ||
23 | @@ -0,0 +1,35 @@ | ||
24 | +AC_DEFUN([ag_CHECK_NANOSECOND_STAT], | ||
25 | + [AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
26 | + [ac_cv_stat_nsec], | ||
27 | + [AC_TRY_COMPILE( | ||
28 | + [ | ||
29 | + #include <sys/types.h> | ||
30 | + #include <sys/stat.h> | ||
31 | + #include <unistd.h> | ||
32 | + struct stat st; | ||
33 | + ], | ||
34 | + [ return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; ], | ||
35 | + [ac_cv_stat_nsec=yes], | ||
36 | + [ac_cv_stat_nsec=no]) | ||
37 | + ]) | ||
38 | + if test $ac_cv_stat_nsec = yes; then | ||
39 | + AC_DEFINE(HAVE_STAT_NSEC, 1, [Define to 1 if struct stat has nanosecond timestamps.]) | ||
40 | + fi | ||
41 | + | ||
42 | + AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
43 | + [ac_cv_stat_timeval], | ||
44 | + [AC_TRY_COMPILE( | ||
45 | + [ | ||
46 | + #include <time.h> | ||
47 | + #include <sys/types.h> | ||
48 | + #include <sys/stat.h> | ||
49 | + #include <unistd.h> | ||
50 | + struct stat st; | ||
51 | + ], | ||
52 | + [ return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; ], | ||
53 | + [ac_cv_stat_timeval=yes], | ||
54 | + [ac_cv_stat_timeval=no]) | ||
55 | + ]) | ||
56 | + if test $ac_cv_stat_timeval = yes; then | ||
57 | + AC_DEFINE(HAVE_STAT_TIMEVAL, 1, [Define to 1 if struct stat comtains struct timeval's.]) | ||
58 | + fi]) | ||
59 | --- patch-2.5.9.orig/Makefile.in | ||
60 | +++ patch-2.5.9/Makefile.in | ||
61 | @@ -62,7 +62,7 @@ | ||
62 | SHELL = /bin/sh | ||
63 | |||
64 | LIBSRCS = error.c malloc.c memchr.c mkdir.c \ | ||
65 | - realloc.c rmdir.c strcasecmp.c strncasecmp.c | ||
66 | + realloc.c rmdir.c strcasecmp.c strncasecmp.c hash.c | ||
67 | SRCS = $(LIBSRCS) \ | ||
68 | addext.c argmatch.c backupfile.c \ | ||
69 | basename.c dirname.c \ | ||
70 | @@ -78,12 +78,12 @@ | ||
71 | maketime.$(OBJEXT) partime.$(OBJEXT) \ | ||
72 | patch.$(OBJEXT) pch.$(OBJEXT) \ | ||
73 | quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \ | ||
74 | - util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) | ||
75 | + util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) hash.$(OBJEXT) | ||
76 | HDRS = argmatch.h backupfile.h common.h dirname.h \ | ||
77 | error.h getopt.h gettext.h \ | ||
78 | inp.h maketime.h partime.h pch.h \ | ||
79 | quote.h quotearg.h quotesys.h \ | ||
80 | - unlocked-io.h util.h version.h xalloc.h | ||
81 | + unlocked-io.h util.h version.h xalloc.h hash.h | ||
82 | MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \ | ||
83 | aclocal.m4 \ | ||
84 | config.hin configure configure.ac \ | ||
85 | --- patch-2.5.9.orig/aclocal.m4 | ||
86 | +++ patch-2.5.9/aclocal.m4 | ||
87 | @@ -1,3 +1,1058 @@ | ||
88 | +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 | ||
89 | + | ||
90 | +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. | ||
91 | +dnl This file is free software; the Free Software Foundation | ||
92 | +dnl gives unlimited permission to copy and/or distribute it, | ||
93 | +dnl with or without modifications, as long as this notice is preserved. | ||
94 | + | ||
95 | +dnl This program is distributed in the hope that it will be useful, | ||
96 | +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
97 | +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
98 | +dnl PARTICULAR PURPOSE. | ||
99 | + | ||
100 | +# lib-prefix.m4 serial 3 (gettext-0.13) | ||
101 | +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
102 | +dnl This file is free software, distributed under the terms of the GNU | ||
103 | +dnl General Public License. As a special exception to the GNU General | ||
104 | +dnl Public License, this file may be distributed as part of a program | ||
105 | +dnl that contains a configuration script generated by Autoconf, under | ||
106 | +dnl the same distribution terms as the rest of that program. | ||
107 | + | ||
108 | +dnl From Bruno Haible. | ||
109 | + | ||
110 | +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and | ||
111 | +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't | ||
112 | +dnl require excessive bracketing. | ||
113 | +ifdef([AC_HELP_STRING], | ||
114 | +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], | ||
115 | +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) | ||
116 | + | ||
117 | +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed | ||
118 | +dnl to access previously installed libraries. The basic assumption is that | ||
119 | +dnl a user will want packages to use other packages he previously installed | ||
120 | +dnl with the same --prefix option. | ||
121 | +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate | ||
122 | +dnl libraries, but is otherwise very convenient. | ||
123 | +AC_DEFUN([AC_LIB_PREFIX], | ||
124 | +[ | ||
125 | + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) | ||
126 | + AC_REQUIRE([AC_PROG_CC]) | ||
127 | + AC_REQUIRE([AC_CANONICAL_HOST]) | ||
128 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
129 | + dnl By default, look in $includedir and $libdir. | ||
130 | + use_additional=yes | ||
131 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
132 | + eval additional_includedir=\"$includedir\" | ||
133 | + eval additional_libdir=\"$libdir\" | ||
134 | + ]) | ||
135 | + AC_LIB_ARG_WITH([lib-prefix], | ||
136 | +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib | ||
137 | + --without-lib-prefix don't search for libraries in includedir and libdir], | ||
138 | +[ | ||
139 | + if test "X$withval" = "Xno"; then | ||
140 | + use_additional=no | ||
141 | + else | ||
142 | + if test "X$withval" = "X"; then | ||
143 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
144 | + eval additional_includedir=\"$includedir\" | ||
145 | + eval additional_libdir=\"$libdir\" | ||
146 | + ]) | ||
147 | + else | ||
148 | + additional_includedir="$withval/include" | ||
149 | + additional_libdir="$withval/lib" | ||
150 | + fi | ||
151 | + fi | ||
152 | +]) | ||
153 | + if test $use_additional = yes; then | ||
154 | + dnl Potentially add $additional_includedir to $CPPFLAGS. | ||
155 | + dnl But don't add it | ||
156 | + dnl 1. if it's the standard /usr/include, | ||
157 | + dnl 2. if it's already present in $CPPFLAGS, | ||
158 | + dnl 3. if it's /usr/local/include and we are using GCC on Linux, | ||
159 | + dnl 4. if it doesn't exist as a directory. | ||
160 | + if test "X$additional_includedir" != "X/usr/include"; then | ||
161 | + haveit= | ||
162 | + for x in $CPPFLAGS; do | ||
163 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
164 | + if test "X$x" = "X-I$additional_includedir"; then | ||
165 | + haveit=yes | ||
166 | + break | ||
167 | + fi | ||
168 | + done | ||
169 | + if test -z "$haveit"; then | ||
170 | + if test "X$additional_includedir" = "X/usr/local/include"; then | ||
171 | + if test -n "$GCC"; then | ||
172 | + case $host_os in | ||
173 | + linux*) haveit=yes;; | ||
174 | + esac | ||
175 | + fi | ||
176 | + fi | ||
177 | + if test -z "$haveit"; then | ||
178 | + if test -d "$additional_includedir"; then | ||
179 | + dnl Really add $additional_includedir to $CPPFLAGS. | ||
180 | + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" | ||
181 | + fi | ||
182 | + fi | ||
183 | + fi | ||
184 | + fi | ||
185 | + dnl Potentially add $additional_libdir to $LDFLAGS. | ||
186 | + dnl But don't add it | ||
187 | + dnl 1. if it's the standard /usr/lib, | ||
188 | + dnl 2. if it's already present in $LDFLAGS, | ||
189 | + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, | ||
190 | + dnl 4. if it doesn't exist as a directory. | ||
191 | + if test "X$additional_libdir" != "X/usr/lib"; then | ||
192 | + haveit= | ||
193 | + for x in $LDFLAGS; do | ||
194 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
195 | + if test "X$x" = "X-L$additional_libdir"; then | ||
196 | + haveit=yes | ||
197 | + break | ||
198 | + fi | ||
199 | + done | ||
200 | + if test -z "$haveit"; then | ||
201 | + if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
202 | + if test -n "$GCC"; then | ||
203 | + case $host_os in | ||
204 | + linux*) haveit=yes;; | ||
205 | + esac | ||
206 | + fi | ||
207 | + fi | ||
208 | + if test -z "$haveit"; then | ||
209 | + if test -d "$additional_libdir"; then | ||
210 | + dnl Really add $additional_libdir to $LDFLAGS. | ||
211 | + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" | ||
212 | + fi | ||
213 | + fi | ||
214 | + fi | ||
215 | + fi | ||
216 | + fi | ||
217 | +]) | ||
218 | + | ||
219 | +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, | ||
220 | +dnl acl_final_exec_prefix, containing the values to which $prefix and | ||
221 | +dnl $exec_prefix will expand at the end of the configure script. | ||
222 | +AC_DEFUN([AC_LIB_PREPARE_PREFIX], | ||
223 | +[ | ||
224 | + dnl Unfortunately, prefix and exec_prefix get only finally determined | ||
225 | + dnl at the end of configure. | ||
226 | + if test "X$prefix" = "XNONE"; then | ||
227 | + acl_final_prefix="$ac_default_prefix" | ||
228 | + else | ||
229 | + acl_final_prefix="$prefix" | ||
230 | + fi | ||
231 | + if test "X$exec_prefix" = "XNONE"; then | ||
232 | + acl_final_exec_prefix='${prefix}' | ||
233 | + else | ||
234 | + acl_final_exec_prefix="$exec_prefix" | ||
235 | + fi | ||
236 | + acl_save_prefix="$prefix" | ||
237 | + prefix="$acl_final_prefix" | ||
238 | + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" | ||
239 | + prefix="$acl_save_prefix" | ||
240 | +]) | ||
241 | + | ||
242 | +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the | ||
243 | +dnl variables prefix and exec_prefix bound to the values they will have | ||
244 | +dnl at the end of the configure script. | ||
245 | +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], | ||
246 | +[ | ||
247 | + acl_save_prefix="$prefix" | ||
248 | + prefix="$acl_final_prefix" | ||
249 | + acl_save_exec_prefix="$exec_prefix" | ||
250 | + exec_prefix="$acl_final_exec_prefix" | ||
251 | + $1 | ||
252 | + exec_prefix="$acl_save_exec_prefix" | ||
253 | + prefix="$acl_save_prefix" | ||
254 | +]) | ||
255 | + | ||
256 | +# lib-link.m4 serial 4 (gettext-0.12) | ||
257 | +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
258 | +dnl This file is free software, distributed under the terms of the GNU | ||
259 | +dnl General Public License. As a special exception to the GNU General | ||
260 | +dnl Public License, this file may be distributed as part of a program | ||
261 | +dnl that contains a configuration script generated by Autoconf, under | ||
262 | +dnl the same distribution terms as the rest of that program. | ||
263 | + | ||
264 | +dnl From Bruno Haible. | ||
265 | + | ||
266 | +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | ||
267 | +dnl the libraries corresponding to explicit and implicit dependencies. | ||
268 | +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | ||
269 | +dnl augments the CPPFLAGS variable. | ||
270 | +AC_DEFUN([AC_LIB_LINKFLAGS], | ||
271 | +[ | ||
272 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
273 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
274 | + define([Name],[translit([$1],[./-], [___])]) | ||
275 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
276 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
277 | + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ | ||
278 | + AC_LIB_LINKFLAGS_BODY([$1], [$2]) | ||
279 | + ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ||
280 | + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" | ||
281 | + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" | ||
282 | + ]) | ||
283 | + LIB[]NAME="$ac_cv_lib[]Name[]_libs" | ||
284 | + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" | ||
285 | + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" | ||
286 | + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
287 | + AC_SUBST([LIB]NAME) | ||
288 | + AC_SUBST([LTLIB]NAME) | ||
289 | + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the | ||
290 | + dnl results of this search when this library appears as a dependency. | ||
291 | + HAVE_LIB[]NAME=yes | ||
292 | + undefine([Name]) | ||
293 | + undefine([NAME]) | ||
294 | +]) | ||
295 | + | ||
296 | +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) | ||
297 | +dnl searches for libname and the libraries corresponding to explicit and | ||
298 | +dnl implicit dependencies, together with the specified include files and | ||
299 | +dnl the ability to compile and link the specified testcode. If found, it | ||
300 | +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and | ||
301 | +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and | ||
302 | +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs | ||
303 | +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. | ||
304 | +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | ||
305 | +[ | ||
306 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
307 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
308 | + define([Name],[translit([$1],[./-], [___])]) | ||
309 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
310 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
311 | + | ||
312 | + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME | ||
313 | + dnl accordingly. | ||
314 | + AC_LIB_LINKFLAGS_BODY([$1], [$2]) | ||
315 | + | ||
316 | + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, | ||
317 | + dnl because if the user has installed lib[]Name and not disabled its use | ||
318 | + dnl via --without-lib[]Name-prefix, he wants to use it. | ||
319 | + ac_save_CPPFLAGS="$CPPFLAGS" | ||
320 | + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
321 | + | ||
322 | + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ | ||
323 | + ac_save_LIBS="$LIBS" | ||
324 | + LIBS="$LIBS $LIB[]NAME" | ||
325 | + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) | ||
326 | + LIBS="$ac_save_LIBS" | ||
327 | + ]) | ||
328 | + if test "$ac_cv_lib[]Name" = yes; then | ||
329 | + HAVE_LIB[]NAME=yes | ||
330 | + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) | ||
331 | + AC_MSG_CHECKING([how to link with lib[]$1]) | ||
332 | + AC_MSG_RESULT([$LIB[]NAME]) | ||
333 | + else | ||
334 | + HAVE_LIB[]NAME=no | ||
335 | + dnl If $LIB[]NAME didn't lead to a usable library, we don't need | ||
336 | + dnl $INC[]NAME either. | ||
337 | + CPPFLAGS="$ac_save_CPPFLAGS" | ||
338 | + LIB[]NAME= | ||
339 | + LTLIB[]NAME= | ||
340 | + fi | ||
341 | + AC_SUBST([HAVE_LIB]NAME) | ||
342 | + AC_SUBST([LIB]NAME) | ||
343 | + AC_SUBST([LTLIB]NAME) | ||
344 | + undefine([Name]) | ||
345 | + undefine([NAME]) | ||
346 | +]) | ||
347 | + | ||
348 | +dnl Determine the platform dependent parameters needed to use rpath: | ||
349 | +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | ||
350 | +dnl hardcode_direct, hardcode_minus_L. | ||
351 | +AC_DEFUN([AC_LIB_RPATH], | ||
352 | +[ | ||
353 | + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS | ||
354 | + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld | ||
355 | + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host | ||
356 | + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir | ||
357 | + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ | ||
358 | + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ | ||
359 | + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh | ||
360 | + . ./conftest.sh | ||
361 | + rm -f ./conftest.sh | ||
362 | + acl_cv_rpath=done | ||
363 | + ]) | ||
364 | + wl="$acl_cv_wl" | ||
365 | + libext="$acl_cv_libext" | ||
366 | + shlibext="$acl_cv_shlibext" | ||
367 | + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
368 | + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
369 | + hardcode_direct="$acl_cv_hardcode_direct" | ||
370 | + hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
371 | + dnl Determine whether the user wants rpath handling at all. | ||
372 | + AC_ARG_ENABLE(rpath, | ||
373 | + [ --disable-rpath do not hardcode runtime library paths], | ||
374 | + :, enable_rpath=yes) | ||
375 | +]) | ||
376 | + | ||
377 | +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and | ||
378 | +dnl the libraries corresponding to explicit and implicit dependencies. | ||
379 | +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. | ||
380 | +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | ||
381 | +[ | ||
382 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
383 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
384 | + dnl By default, look in $includedir and $libdir. | ||
385 | + use_additional=yes | ||
386 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
387 | + eval additional_includedir=\"$includedir\" | ||
388 | + eval additional_libdir=\"$libdir\" | ||
389 | + ]) | ||
390 | + AC_LIB_ARG_WITH([lib$1-prefix], | ||
391 | +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
392 | + --without-lib$1-prefix don't search for lib$1 in includedir and libdir], | ||
393 | +[ | ||
394 | + if test "X$withval" = "Xno"; then | ||
395 | + use_additional=no | ||
396 | + else | ||
397 | + if test "X$withval" = "X"; then | ||
398 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
399 | + eval additional_includedir=\"$includedir\" | ||
400 | + eval additional_libdir=\"$libdir\" | ||
401 | + ]) | ||
402 | + else | ||
403 | + additional_includedir="$withval/include" | ||
404 | + additional_libdir="$withval/lib" | ||
405 | + fi | ||
406 | + fi | ||
407 | +]) | ||
408 | + dnl Search the library and its dependencies in $additional_libdir and | ||
409 | + dnl $LDFLAGS. Using breadth-first-seach. | ||
410 | + LIB[]NAME= | ||
411 | + LTLIB[]NAME= | ||
412 | + INC[]NAME= | ||
413 | + rpathdirs= | ||
414 | + ltrpathdirs= | ||
415 | + names_already_handled= | ||
416 | + names_next_round='$1 $2' | ||
417 | + while test -n "$names_next_round"; do | ||
418 | + names_this_round="$names_next_round" | ||
419 | + names_next_round= | ||
420 | + for name in $names_this_round; do | ||
421 | + already_handled= | ||
422 | + for n in $names_already_handled; do | ||
423 | + if test "$n" = "$name"; then | ||
424 | + already_handled=yes | ||
425 | + break | ||
426 | + fi | ||
427 | + done | ||
428 | + if test -z "$already_handled"; then | ||
429 | + names_already_handled="$names_already_handled $name" | ||
430 | + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS | ||
431 | + dnl or AC_LIB_HAVE_LINKFLAGS call. | ||
432 | + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` | ||
433 | + eval value=\"\$HAVE_LIB$uppername\" | ||
434 | + if test -n "$value"; then | ||
435 | + if test "$value" = yes; then | ||
436 | + eval value=\"\$LIB$uppername\" | ||
437 | + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" | ||
438 | + eval value=\"\$LTLIB$uppername\" | ||
439 | + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" | ||
440 | + else | ||
441 | + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined | ||
442 | + dnl that this library doesn't exist. So just drop it. | ||
443 | + : | ||
444 | + fi | ||
445 | + else | ||
446 | + dnl Search the library lib$name in $additional_libdir and $LDFLAGS | ||
447 | + dnl and the already constructed $LIBNAME/$LTLIBNAME. | ||
448 | + found_dir= | ||
449 | + found_la= | ||
450 | + found_so= | ||
451 | + found_a= | ||
452 | + if test $use_additional = yes; then | ||
453 | + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then | ||
454 | + found_dir="$additional_libdir" | ||
455 | + found_so="$additional_libdir/lib$name.$shlibext" | ||
456 | + if test -f "$additional_libdir/lib$name.la"; then | ||
457 | + found_la="$additional_libdir/lib$name.la" | ||
458 | + fi | ||
459 | + else | ||
460 | + if test -f "$additional_libdir/lib$name.$libext"; then | ||
461 | + found_dir="$additional_libdir" | ||
462 | + found_a="$additional_libdir/lib$name.$libext" | ||
463 | + if test -f "$additional_libdir/lib$name.la"; then | ||
464 | + found_la="$additional_libdir/lib$name.la" | ||
465 | + fi | ||
466 | + fi | ||
467 | + fi | ||
468 | + fi | ||
469 | + if test "X$found_dir" = "X"; then | ||
470 | + for x in $LDFLAGS $LTLIB[]NAME; do | ||
471 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
472 | + case "$x" in | ||
473 | + -L*) | ||
474 | + dir=`echo "X$x" | sed -e 's/^X-L//'` | ||
475 | + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then | ||
476 | + found_dir="$dir" | ||
477 | + found_so="$dir/lib$name.$shlibext" | ||
478 | + if test -f "$dir/lib$name.la"; then | ||
479 | + found_la="$dir/lib$name.la" | ||
480 | + fi | ||
481 | + else | ||
482 | + if test -f "$dir/lib$name.$libext"; then | ||
483 | + found_dir="$dir" | ||
484 | + found_a="$dir/lib$name.$libext" | ||
485 | + if test -f "$dir/lib$name.la"; then | ||
486 | + found_la="$dir/lib$name.la" | ||
487 | + fi | ||
488 | + fi | ||
489 | + fi | ||
490 | + ;; | ||
491 | + esac | ||
492 | + if test "X$found_dir" != "X"; then | ||
493 | + break | ||
494 | + fi | ||
495 | + done | ||
496 | + fi | ||
497 | + if test "X$found_dir" != "X"; then | ||
498 | + dnl Found the library. | ||
499 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" | ||
500 | + if test "X$found_so" != "X"; then | ||
501 | + dnl Linking with a shared library. We attempt to hardcode its | ||
502 | + dnl directory into the executable's runpath, unless it's the | ||
503 | + dnl standard /usr/lib. | ||
504 | + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then | ||
505 | + dnl No hardcoding is needed. | ||
506 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
507 | + else | ||
508 | + dnl Use an explicit option to hardcode DIR into the resulting | ||
509 | + dnl binary. | ||
510 | + dnl Potentially add DIR to ltrpathdirs. | ||
511 | + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. | ||
512 | + haveit= | ||
513 | + for x in $ltrpathdirs; do | ||
514 | + if test "X$x" = "X$found_dir"; then | ||
515 | + haveit=yes | ||
516 | + break | ||
517 | + fi | ||
518 | + done | ||
519 | + if test -z "$haveit"; then | ||
520 | + ltrpathdirs="$ltrpathdirs $found_dir" | ||
521 | + fi | ||
522 | + dnl The hardcoding into $LIBNAME is system dependent. | ||
523 | + if test "$hardcode_direct" = yes; then | ||
524 | + dnl Using DIR/libNAME.so during linking hardcodes DIR into the | ||
525 | + dnl resulting binary. | ||
526 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
527 | + else | ||
528 | + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | ||
529 | + dnl Use an explicit option to hardcode DIR into the resulting | ||
530 | + dnl binary. | ||
531 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
532 | + dnl Potentially add DIR to rpathdirs. | ||
533 | + dnl The rpathdirs will be appended to $LIBNAME at the end. | ||
534 | + haveit= | ||
535 | + for x in $rpathdirs; do | ||
536 | + if test "X$x" = "X$found_dir"; then | ||
537 | + haveit=yes | ||
538 | + break | ||
539 | + fi | ||
540 | + done | ||
541 | + if test -z "$haveit"; then | ||
542 | + rpathdirs="$rpathdirs $found_dir" | ||
543 | + fi | ||
544 | + else | ||
545 | + dnl Rely on "-L$found_dir". | ||
546 | + dnl But don't add it if it's already contained in the LDFLAGS | ||
547 | + dnl or the already constructed $LIBNAME | ||
548 | + haveit= | ||
549 | + for x in $LDFLAGS $LIB[]NAME; do | ||
550 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
551 | + if test "X$x" = "X-L$found_dir"; then | ||
552 | + haveit=yes | ||
553 | + break | ||
554 | + fi | ||
555 | + done | ||
556 | + if test -z "$haveit"; then | ||
557 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" | ||
558 | + fi | ||
559 | + if test "$hardcode_minus_L" != no; then | ||
560 | + dnl FIXME: Not sure whether we should use | ||
561 | + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
562 | + dnl here. | ||
563 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
564 | + else | ||
565 | + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH | ||
566 | + dnl here, because this doesn't fit in flags passed to the | ||
567 | + dnl compiler. So give up. No hardcoding. This affects only | ||
568 | + dnl very old systems. | ||
569 | + dnl FIXME: Not sure whether we should use | ||
570 | + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
571 | + dnl here. | ||
572 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" | ||
573 | + fi | ||
574 | + fi | ||
575 | + fi | ||
576 | + fi | ||
577 | + else | ||
578 | + if test "X$found_a" != "X"; then | ||
579 | + dnl Linking with a static library. | ||
580 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" | ||
581 | + else | ||
582 | + dnl We shouldn't come here, but anyway it's good to have a | ||
583 | + dnl fallback. | ||
584 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" | ||
585 | + fi | ||
586 | + fi | ||
587 | + dnl Assume the include files are nearby. | ||
588 | + additional_includedir= | ||
589 | + case "$found_dir" in | ||
590 | + */lib | */lib/) | ||
591 | + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` | ||
592 | + additional_includedir="$basedir/include" | ||
593 | + ;; | ||
594 | + esac | ||
595 | + if test "X$additional_includedir" != "X"; then | ||
596 | + dnl Potentially add $additional_includedir to $INCNAME. | ||
597 | + dnl But don't add it | ||
598 | + dnl 1. if it's the standard /usr/include, | ||
599 | + dnl 2. if it's /usr/local/include and we are using GCC on Linux, | ||
600 | + dnl 3. if it's already present in $CPPFLAGS or the already | ||
601 | + dnl constructed $INCNAME, | ||
602 | + dnl 4. if it doesn't exist as a directory. | ||
603 | + if test "X$additional_includedir" != "X/usr/include"; then | ||
604 | + haveit= | ||
605 | + if test "X$additional_includedir" = "X/usr/local/include"; then | ||
606 | + if test -n "$GCC"; then | ||
607 | + case $host_os in | ||
608 | + linux*) haveit=yes;; | ||
609 | + esac | ||
610 | + fi | ||
611 | + fi | ||
612 | + if test -z "$haveit"; then | ||
613 | + for x in $CPPFLAGS $INC[]NAME; do | ||
614 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
615 | + if test "X$x" = "X-I$additional_includedir"; then | ||
616 | + haveit=yes | ||
617 | + break | ||
618 | + fi | ||
619 | + done | ||
620 | + if test -z "$haveit"; then | ||
621 | + if test -d "$additional_includedir"; then | ||
622 | + dnl Really add $additional_includedir to $INCNAME. | ||
623 | + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" | ||
624 | + fi | ||
625 | + fi | ||
626 | + fi | ||
627 | + fi | ||
628 | + fi | ||
629 | + dnl Look for dependencies. | ||
630 | + if test -n "$found_la"; then | ||
631 | + dnl Read the .la file. It defines the variables | ||
632 | + dnl dlname, library_names, old_library, dependency_libs, current, | ||
633 | + dnl age, revision, installed, dlopen, dlpreopen, libdir. | ||
634 | + save_libdir="$libdir" | ||
635 | + case "$found_la" in | ||
636 | + */* | *\\*) . "$found_la" ;; | ||
637 | + *) . "./$found_la" ;; | ||
638 | + esac | ||
639 | + libdir="$save_libdir" | ||
640 | + dnl We use only dependency_libs. | ||
641 | + for dep in $dependency_libs; do | ||
642 | + case "$dep" in | ||
643 | + -L*) | ||
644 | + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` | ||
645 | + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. | ||
646 | + dnl But don't add it | ||
647 | + dnl 1. if it's the standard /usr/lib, | ||
648 | + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, | ||
649 | + dnl 3. if it's already present in $LDFLAGS or the already | ||
650 | + dnl constructed $LIBNAME, | ||
651 | + dnl 4. if it doesn't exist as a directory. | ||
652 | + if test "X$additional_libdir" != "X/usr/lib"; then | ||
653 | + haveit= | ||
654 | + if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
655 | + if test -n "$GCC"; then | ||
656 | + case $host_os in | ||
657 | + linux*) haveit=yes;; | ||
658 | + esac | ||
659 | + fi | ||
660 | + fi | ||
661 | + if test -z "$haveit"; then | ||
662 | + haveit= | ||
663 | + for x in $LDFLAGS $LIB[]NAME; do | ||
664 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
665 | + if test "X$x" = "X-L$additional_libdir"; then | ||
666 | + haveit=yes | ||
667 | + break | ||
668 | + fi | ||
669 | + done | ||
670 | + if test -z "$haveit"; then | ||
671 | + if test -d "$additional_libdir"; then | ||
672 | + dnl Really add $additional_libdir to $LIBNAME. | ||
673 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" | ||
674 | + fi | ||
675 | + fi | ||
676 | + haveit= | ||
677 | + for x in $LDFLAGS $LTLIB[]NAME; do | ||
678 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
679 | + if test "X$x" = "X-L$additional_libdir"; then | ||
680 | + haveit=yes | ||
681 | + break | ||
682 | + fi | ||
683 | + done | ||
684 | + if test -z "$haveit"; then | ||
685 | + if test -d "$additional_libdir"; then | ||
686 | + dnl Really add $additional_libdir to $LTLIBNAME. | ||
687 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" | ||
688 | + fi | ||
689 | + fi | ||
690 | + fi | ||
691 | + fi | ||
692 | + ;; | ||
693 | + -R*) | ||
694 | + dir=`echo "X$dep" | sed -e 's/^X-R//'` | ||
695 | + if test "$enable_rpath" != no; then | ||
696 | + dnl Potentially add DIR to rpathdirs. | ||
697 | + dnl The rpathdirs will be appended to $LIBNAME at the end. | ||
698 | + haveit= | ||
699 | + for x in $rpathdirs; do | ||
700 | + if test "X$x" = "X$dir"; then | ||
701 | + haveit=yes | ||
702 | + break | ||
703 | + fi | ||
704 | + done | ||
705 | + if test -z "$haveit"; then | ||
706 | + rpathdirs="$rpathdirs $dir" | ||
707 | + fi | ||
708 | + dnl Potentially add DIR to ltrpathdirs. | ||
709 | + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. | ||
710 | + haveit= | ||
711 | + for x in $ltrpathdirs; do | ||
712 | + if test "X$x" = "X$dir"; then | ||
713 | + haveit=yes | ||
714 | + break | ||
715 | + fi | ||
716 | + done | ||
717 | + if test -z "$haveit"; then | ||
718 | + ltrpathdirs="$ltrpathdirs $dir" | ||
719 | + fi | ||
720 | + fi | ||
721 | + ;; | ||
722 | + -l*) | ||
723 | + dnl Handle this in the next round. | ||
724 | + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` | ||
725 | + ;; | ||
726 | + *.la) | ||
727 | + dnl Handle this in the next round. Throw away the .la's | ||
728 | + dnl directory; it is already contained in a preceding -L | ||
729 | + dnl option. | ||
730 | + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` | ||
731 | + ;; | ||
732 | + *) | ||
733 | + dnl Most likely an immediate library name. | ||
734 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" | ||
735 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" | ||
736 | + ;; | ||
737 | + esac | ||
738 | + done | ||
739 | + fi | ||
740 | + else | ||
741 | + dnl Didn't find the library; assume it is in the system directories | ||
742 | + dnl known to the linker and runtime loader. (All the system | ||
743 | + dnl directories known to the linker should also be known to the | ||
744 | + dnl runtime loader, otherwise the system is severely misconfigured.) | ||
745 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" | ||
746 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" | ||
747 | + fi | ||
748 | + fi | ||
749 | + fi | ||
750 | + done | ||
751 | + done | ||
752 | + if test "X$rpathdirs" != "X"; then | ||
753 | + if test -n "$hardcode_libdir_separator"; then | ||
754 | + dnl Weird platform: only the last -rpath option counts, the user must | ||
755 | + dnl pass all path elements in one option. We can arrange that for a | ||
756 | + dnl single library, but not when more than one $LIBNAMEs are used. | ||
757 | + alldirs= | ||
758 | + for found_dir in $rpathdirs; do | ||
759 | + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" | ||
760 | + done | ||
761 | + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. | ||
762 | + acl_save_libdir="$libdir" | ||
763 | + libdir="$alldirs" | ||
764 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
765 | + libdir="$acl_save_libdir" | ||
766 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
767 | + else | ||
768 | + dnl The -rpath options are cumulative. | ||
769 | + for found_dir in $rpathdirs; do | ||
770 | + acl_save_libdir="$libdir" | ||
771 | + libdir="$found_dir" | ||
772 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
773 | + libdir="$acl_save_libdir" | ||
774 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
775 | + done | ||
776 | + fi | ||
777 | + fi | ||
778 | + if test "X$ltrpathdirs" != "X"; then | ||
779 | + dnl When using libtool, the option that works for both libraries and | ||
780 | + dnl executables is -R. The -R options are cumulative. | ||
781 | + for found_dir in $ltrpathdirs; do | ||
782 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" | ||
783 | + done | ||
784 | + fi | ||
785 | +]) | ||
786 | + | ||
787 | +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, | ||
788 | +dnl unless already present in VAR. | ||
789 | +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes | ||
790 | +dnl contains two or three consecutive elements that belong together. | ||
791 | +AC_DEFUN([AC_LIB_APPENDTOVAR], | ||
792 | +[ | ||
793 | + for element in [$2]; do | ||
794 | + haveit= | ||
795 | + for x in $[$1]; do | ||
796 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
797 | + if test "X$x" = "X$element"; then | ||
798 | + haveit=yes | ||
799 | + break | ||
800 | + fi | ||
801 | + done | ||
802 | + if test -z "$haveit"; then | ||
803 | + [$1]="${[$1]}${[$1]:+ }$element" | ||
804 | + fi | ||
805 | + done | ||
806 | +]) | ||
807 | + | ||
808 | +# lib-ld.m4 serial 3 (gettext-0.13) | ||
809 | +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. | ||
810 | +dnl This file is free software, distributed under the terms of the GNU | ||
811 | +dnl General Public License. As a special exception to the GNU General | ||
812 | +dnl Public License, this file may be distributed as part of a program | ||
813 | +dnl that contains a configuration script generated by Autoconf, under | ||
814 | +dnl the same distribution terms as the rest of that program. | ||
815 | + | ||
816 | +dnl Subroutines of libtool.m4, | ||
817 | +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision | ||
818 | +dnl with libtool.m4. | ||
819 | + | ||
820 | +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. | ||
821 | +AC_DEFUN([AC_LIB_PROG_LD_GNU], | ||
822 | +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, | ||
823 | +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. | ||
824 | +case `$LD -v 2>&1 </dev/null` in | ||
825 | +*GNU* | *'with BFD'*) | ||
826 | + acl_cv_prog_gnu_ld=yes ;; | ||
827 | +*) | ||
828 | + acl_cv_prog_gnu_ld=no ;; | ||
829 | +esac]) | ||
830 | +with_gnu_ld=$acl_cv_prog_gnu_ld | ||
831 | +]) | ||
832 | + | ||
833 | +dnl From libtool-1.4. Sets the variable LD. | ||
834 | +AC_DEFUN([AC_LIB_PROG_LD], | ||
835 | +[AC_ARG_WITH(gnu-ld, | ||
836 | +[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], | ||
837 | +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) | ||
838 | +AC_REQUIRE([AC_PROG_CC])dnl | ||
839 | +AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
840 | +# Prepare PATH_SEPARATOR. | ||
841 | +# The user is always right. | ||
842 | +if test "${PATH_SEPARATOR+set}" != set; then | ||
843 | + echo "#! /bin/sh" >conf$$.sh | ||
844 | + echo "exit 0" >>conf$$.sh | ||
845 | + chmod +x conf$$.sh | ||
846 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
847 | + PATH_SEPARATOR=';' | ||
848 | + else | ||
849 | + PATH_SEPARATOR=: | ||
850 | + fi | ||
851 | + rm -f conf$$.sh | ||
852 | +fi | ||
853 | +ac_prog=ld | ||
854 | +if test "$GCC" = yes; then | ||
855 | + # Check if gcc -print-prog-name=ld gives a path. | ||
856 | + AC_MSG_CHECKING([for ld used by GCC]) | ||
857 | + case $host in | ||
858 | + *-*-mingw*) | ||
859 | + # gcc leaves a trailing carriage return which upsets mingw | ||
860 | + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; | ||
861 | + *) | ||
862 | + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; | ||
863 | + esac | ||
864 | + case $ac_prog in | ||
865 | + # Accept absolute paths. | ||
866 | + [[\\/]* | [A-Za-z]:[\\/]*)] | ||
867 | + [re_direlt='/[^/][^/]*/\.\./'] | ||
868 | + # Canonicalize the path of ld | ||
869 | + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` | ||
870 | + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do | ||
871 | + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` | ||
872 | + done | ||
873 | + test -z "$LD" && LD="$ac_prog" | ||
874 | + ;; | ||
875 | + "") | ||
876 | + # If it fails, then pretend we aren't using GCC. | ||
877 | + ac_prog=ld | ||
878 | + ;; | ||
879 | + *) | ||
880 | + # If it is relative, then search for the first ld in PATH. | ||
881 | + with_gnu_ld=unknown | ||
882 | + ;; | ||
883 | + esac | ||
884 | +elif test "$with_gnu_ld" = yes; then | ||
885 | + AC_MSG_CHECKING([for GNU ld]) | ||
886 | +else | ||
887 | + AC_MSG_CHECKING([for non-GNU ld]) | ||
888 | +fi | ||
889 | +AC_CACHE_VAL(acl_cv_path_LD, | ||
890 | +[if test -z "$LD"; then | ||
891 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" | ||
892 | + for ac_dir in $PATH; do | ||
893 | + test -z "$ac_dir" && ac_dir=. | ||
894 | + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then | ||
895 | + acl_cv_path_LD="$ac_dir/$ac_prog" | ||
896 | + # Check to see if the program is GNU ld. I'd rather use --version, | ||
897 | + # but apparently some GNU ld's only accept -v. | ||
898 | + # Break only if it was the GNU/non-GNU ld that we prefer. | ||
899 | + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in | ||
900 | + *GNU* | *'with BFD'*) | ||
901 | + test "$with_gnu_ld" != no && break ;; | ||
902 | + *) | ||
903 | + test "$with_gnu_ld" != yes && break ;; | ||
904 | + esac | ||
905 | + fi | ||
906 | + done | ||
907 | + IFS="$ac_save_ifs" | ||
908 | +else | ||
909 | + acl_cv_path_LD="$LD" # Let the user override the test with a path. | ||
910 | +fi]) | ||
911 | +LD="$acl_cv_path_LD" | ||
912 | +if test -n "$LD"; then | ||
913 | + AC_MSG_RESULT($LD) | ||
914 | +else | ||
915 | + AC_MSG_RESULT(no) | ||
916 | +fi | ||
917 | +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) | ||
918 | +AC_LIB_PROG_LD_GNU | ||
919 | +]) | ||
920 | + | ||
921 | +# isc-posix.m4 serial 2 (gettext-0.11.2) | ||
922 | +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. | ||
923 | +dnl This file is free software, distributed under the terms of the GNU | ||
924 | +dnl General Public License. As a special exception to the GNU General | ||
925 | +dnl Public License, this file may be distributed as part of a program | ||
926 | +dnl that contains a configuration script generated by Autoconf, under | ||
927 | +dnl the same distribution terms as the rest of that program. | ||
928 | + | ||
929 | +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. | ||
930 | + | ||
931 | +# This test replaces the one in autoconf. | ||
932 | +# Currently this macro should have the same name as the autoconf macro | ||
933 | +# because gettext's gettext.m4 (distributed in the automake package) | ||
934 | +# still uses it. Otherwise, the use in gettext.m4 makes autoheader | ||
935 | +# give these diagnostics: | ||
936 | +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX | ||
937 | +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX | ||
938 | + | ||
939 | +undefine([AC_ISC_POSIX]) | ||
940 | + | ||
941 | +AC_DEFUN([AC_ISC_POSIX], | ||
942 | + [ | ||
943 | + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. | ||
944 | + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) | ||
945 | + ] | ||
946 | +) | ||
947 | + | ||
948 | +# Check for stdbool.h that conforms to C99. | ||
949 | + | ||
950 | +# Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
951 | + | ||
952 | +# This program is free software; you can redistribute it and/or modify | ||
953 | +# it under the terms of the GNU General Public License as published by | ||
954 | +# the Free Software Foundation; either version 2, or (at your option) | ||
955 | +# any later version. | ||
956 | + | ||
957 | +# This program is distributed in the hope that it will be useful, | ||
958 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
959 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
960 | +# GNU General Public License for more details. | ||
961 | + | ||
962 | +# You should have received a copy of the GNU General Public License | ||
963 | +# along with this program; if not, write to the Free Software | ||
964 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
965 | +# 02111-1307, USA. | ||
966 | + | ||
967 | +# Prepare for substituting <stdbool.h> if it is not supported. | ||
968 | + | ||
969 | +AC_DEFUN([AM_STDBOOL_H], | ||
970 | +[ | ||
971 | + AC_REQUIRE([AC_HEADER_STDBOOL]) | ||
972 | + | ||
973 | + # Define two additional variables used in the Makefile substitution. | ||
974 | + | ||
975 | + if test "$ac_cv_header_stdbool_h" = yes; then | ||
976 | + STDBOOL_H='' | ||
977 | + else | ||
978 | + STDBOOL_H='stdbool.h' | ||
979 | + fi | ||
980 | + AC_SUBST([STDBOOL_H]) | ||
981 | + | ||
982 | + if test "$ac_cv_type__Bool" = yes; then | ||
983 | + HAVE__BOOL=1 | ||
984 | + else | ||
985 | + HAVE__BOOL=0 | ||
986 | + fi | ||
987 | + AC_SUBST([HAVE__BOOL]) | ||
988 | +]) | ||
989 | + | ||
990 | +# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf | ||
991 | +# have this macro built-in. | ||
992 | + | ||
993 | +AC_DEFUN([AC_HEADER_STDBOOL], | ||
994 | + [AC_CACHE_CHECK([for stdbool.h that conforms to C99], | ||
995 | + [ac_cv_header_stdbool_h], | ||
996 | + [AC_TRY_COMPILE( | ||
997 | + [ | ||
998 | + #include <stdbool.h> | ||
999 | + #ifndef bool | ||
1000 | + "error: bool is not defined" | ||
1001 | + #endif | ||
1002 | + #ifndef false | ||
1003 | + "error: false is not defined" | ||
1004 | + #endif | ||
1005 | + #if false | ||
1006 | + "error: false is not 0" | ||
1007 | + #endif | ||
1008 | + #ifndef true | ||
1009 | + "error: false is not defined" | ||
1010 | + #endif | ||
1011 | + #if true != 1 | ||
1012 | + "error: true is not 1" | ||
1013 | + #endif | ||
1014 | + #ifndef __bool_true_false_are_defined | ||
1015 | + "error: __bool_true_false_are_defined is not defined" | ||
1016 | + #endif | ||
1017 | + | ||
1018 | + struct s { _Bool s: 1; _Bool t; } s; | ||
1019 | + | ||
1020 | + char a[true == 1 ? 1 : -1]; | ||
1021 | + char b[false == 0 ? 1 : -1]; | ||
1022 | + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
1023 | + char d[(bool) -0.5 == true ? 1 : -1]; | ||
1024 | + bool e = &s; | ||
1025 | + char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
1026 | + char g[true]; | ||
1027 | + char h[sizeof (_Bool)]; | ||
1028 | + char i[sizeof s.t]; | ||
1029 | + ], | ||
1030 | + [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ], | ||
1031 | + [ac_cv_header_stdbool_h=yes], | ||
1032 | + [ac_cv_header_stdbool_h=no])]) | ||
1033 | + AC_CHECK_TYPES([_Bool]) | ||
1034 | + if test $ac_cv_header_stdbool_h = yes; then | ||
1035 | + AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) | ||
1036 | + fi]) | ||
1037 | + | ||
1038 | +#serial 5 | ||
1039 | + | ||
1040 | +dnl From Jim Meyering | ||
1041 | + | ||
1042 | +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- | ||
1043 | +dnl usually in <utime.h>. | ||
1044 | +dnl Some systems have utime.h but don't declare the struct anywhere. | ||
1045 | + | ||
1046 | +AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF], | ||
1047 | +[ | ||
1048 | + AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) | ||
1049 | + AC_REQUIRE([AC_HEADER_TIME]) | ||
1050 | + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, | ||
1051 | + [AC_TRY_COMPILE( | ||
1052 | + [ | ||
1053 | +#ifdef TIME_WITH_SYS_TIME | ||
1054 | +# include <sys/time.h> | ||
1055 | +# include <time.h> | ||
1056 | +#else | ||
1057 | +# ifdef HAVE_SYS_TIME_H | ||
1058 | +# include <sys/time.h> | ||
1059 | +# else | ||
1060 | +# include <time.h> | ||
1061 | +# endif | ||
1062 | +#endif | ||
1063 | +#ifdef HAVE_UTIME_H | ||
1064 | +# include <utime.h> | ||
1065 | +#endif | ||
1066 | + ], | ||
1067 | + [static struct utimbuf x; x.actime = x.modtime;], | ||
1068 | + fu_cv_sys_struct_utimbuf=yes, | ||
1069 | + fu_cv_sys_struct_utimbuf=no) | ||
1070 | + ]) | ||
1071 | + | ||
1072 | + if test $fu_cv_sys_struct_utimbuf = yes; then | ||
1073 | + AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, | ||
1074 | + [Define if struct utimbuf is declared -- usually in <utime.h>. | ||
1075 | + Some systems have utime.h but don't declare the struct anywhere. ]) | ||
1076 | + fi | ||
1077 | +]) | ||
1078 | + | ||
1079 | +# onceonly.m4 serial 3 | ||
1080 | +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. | ||
1081 | +dnl This file is free software, distributed under the terms of the GNU | ||
1082 | +dnl General Public License. As a special exception to the GNU General | ||
1083 | +dnl Public License, this file may be distributed as part of a program | ||
1084 | +dnl that contains a configuration script generated by Autoconf, under | ||
1085 | +dnl the same distribution terms as the rest of that program. | ||
1086 | + | ||
1087 | +dnl This file defines some "once only" variants of standard autoconf macros. | ||
1088 | +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS | ||
1089 | +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS | ||
1090 | +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS | ||
1091 | +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC | ||
1092 | +dnl The advantage is that the check for each of the headers/functions/decls | ||
1093 | +dnl will be put only once into the 'configure' file. It keeps the size of | ||
1094 | +dnl the 'configure' file down, and avoids redundant output when 'configure' | ||
1095 | +dnl is run. | ||
1096 | +dnl The drawback is that the checks cannot be conditionalized. If you write | ||
1097 | +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi | ||
1098 | +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to | ||
1099 | +dnl empty, and the check will be inserted before the body of the AC_DEFUNed | ||
1100 | +dnl function. | ||
1101 | + | ||
1102 | +dnl Autoconf version 2.57 or newer is recommended. | ||
1103 | +AC_PREREQ(2.54) | ||
1104 | + | ||
1105 | +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of | ||
1106 | +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). | ||
1107 | +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ | ||
1108 | + : | ||
1109 | + AC_FOREACH([gl_HEADER_NAME], [$1], [ | ||
1110 | + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]), | ||
1111 | + [-./], [___])), [ | ||
1112 | + AC_CHECK_HEADERS(gl_HEADER_NAME) | ||
1113 | + ]) | ||
1114 | + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, | ||
1115 | + [-./], [___]))) | ||
1116 | + ]) | ||
1117 | +]) | ||
1118 | + | ||
1119 | +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of | ||
1120 | +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). | ||
1121 | +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ | ||
1122 | + : | ||
1123 | + AC_FOREACH([gl_FUNC_NAME], [$1], [ | ||
1124 | + AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [ | ||
1125 | + AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME])) | ||
1126 | + ]) | ||
1127 | + AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME])) | ||
1128 | + ]) | ||
1129 | +]) | ||
1130 | + | ||
1131 | +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of | ||
1132 | +# AC_CHECK_DECLS(DECL1, DECL2, ...). | ||
1133 | +AC_DEFUN([AC_CHECK_DECLS_ONCE], [ | ||
1134 | + : | ||
1135 | + AC_FOREACH([gl_DECL_NAME], [$1], [ | ||
1136 | + AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [ | ||
1137 | + AC_CHECK_DECLS(m4_defn([gl_DECL_NAME])) | ||
1138 | + ]) | ||
1139 | + AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME])) | ||
1140 | + ]) | ||
1141 | +]) | ||
1142 | + | ||
1143 | # backupfile.m4 serial 1 | ||
1144 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1145 | dnl This file is free software, distributed under the terms of the GNU | ||
1146 | @@ -21,6 +1076,7 @@ | ||
1147 | AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h) | ||
1148 | AC_CHECK_FUNCS(pathconf) | ||
1149 | ]) | ||
1150 | + | ||
1151 | #serial 5 | ||
1152 | |||
1153 | dnl From Jim Meyering. | ||
1154 | @@ -63,31 +1119,7 @@ | ||
1155 | fi | ||
1156 | ] | ||
1157 | ) | ||
1158 | -# dirname.m4 serial 1 | ||
1159 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1160 | -dnl This file is free software, distributed under the terms of the GNU | ||
1161 | -dnl General Public License. As a special exception to the GNU General | ||
1162 | -dnl Public License, this file may be distributed as part of a program | ||
1163 | -dnl that contains a configuration script generated by Autoconf, under | ||
1164 | -dnl the same distribution terms as the rest of that program. | ||
1165 | |||
1166 | -AC_DEFUN([gl_DIRNAME], | ||
1167 | -[ | ||
1168 | - dnl Prerequisites of lib/dirname.h. | ||
1169 | - AC_REQUIRE([jm_AC_DOS]) | ||
1170 | - | ||
1171 | - dnl Prerequisites of lib/dirname.c. | ||
1172 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1173 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1174 | - | ||
1175 | - dnl Prerequisites of lib/basename.c. | ||
1176 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1177 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1178 | - | ||
1179 | - dnl Prerequisites of lib/stripslash.c. | ||
1180 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1181 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1182 | -]) | ||
1183 | #serial 5 | ||
1184 | |||
1185 | # Define some macros required for proper operation of code in lib/*.c | ||
1186 | @@ -141,6 +1173,33 @@ | ||
1187 | [Define if the backslash character may also serve as a file name | ||
1188 | component separator.]) | ||
1189 | ]) | ||
1190 | + | ||
1191 | +# dirname.m4 serial 1 | ||
1192 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1193 | +dnl This file is free software, distributed under the terms of the GNU | ||
1194 | +dnl General Public License. As a special exception to the GNU General | ||
1195 | +dnl Public License, this file may be distributed as part of a program | ||
1196 | +dnl that contains a configuration script generated by Autoconf, under | ||
1197 | +dnl the same distribution terms as the rest of that program. | ||
1198 | + | ||
1199 | +AC_DEFUN([gl_DIRNAME], | ||
1200 | +[ | ||
1201 | + dnl Prerequisites of lib/dirname.h. | ||
1202 | + AC_REQUIRE([jm_AC_DOS]) | ||
1203 | + | ||
1204 | + dnl Prerequisites of lib/dirname.c. | ||
1205 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1206 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1207 | + | ||
1208 | + dnl Prerequisites of lib/basename.c. | ||
1209 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1210 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1211 | + | ||
1212 | + dnl Prerequisites of lib/stripslash.c. | ||
1213 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1214 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1215 | +]) | ||
1216 | + | ||
1217 | #serial 7 | ||
1218 | |||
1219 | AC_DEFUN([gl_ERROR], | ||
1220 | @@ -159,7 +1218,67 @@ | ||
1221 | AC_CHECK_DECLS([strerror]) | ||
1222 | AC_FUNC_STRERROR_R | ||
1223 | ]) | ||
1224 | -# getopt.m4 serial 1 | ||
1225 | + | ||
1226 | +# memchr.m4 serial 1 | ||
1227 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1228 | +dnl This file is free software, distributed under the terms of the GNU | ||
1229 | +dnl General Public License. As a special exception to the GNU General | ||
1230 | +dnl Public License, this file may be distributed as part of a program | ||
1231 | +dnl that contains a configuration script generated by Autoconf, under | ||
1232 | +dnl the same distribution terms as the rest of that program. | ||
1233 | + | ||
1234 | +AC_DEFUN([gl_FUNC_MEMCHR], | ||
1235 | +[ | ||
1236 | + AC_REPLACE_FUNCS(memchr) | ||
1237 | + if test $ac_cv_func_memchr = no; then | ||
1238 | + jm_PREREQ_MEMCHR | ||
1239 | + fi | ||
1240 | +]) | ||
1241 | + | ||
1242 | +# Prerequisites of lib/memchr.c. | ||
1243 | +AC_DEFUN([jm_PREREQ_MEMCHR], [ | ||
1244 | + AC_CHECK_HEADERS_ONCE(limits.h stdlib.h) | ||
1245 | + AC_CHECK_HEADERS(bp-sym.h) | ||
1246 | +]) | ||
1247 | + | ||
1248 | +# rmdir.m4 serial 1 | ||
1249 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1250 | +dnl This file is free software, distributed under the terms of the GNU | ||
1251 | +dnl General Public License. As a special exception to the GNU General | ||
1252 | +dnl Public License, this file may be distributed as part of a program | ||
1253 | +dnl that contains a configuration script generated by Autoconf, under | ||
1254 | +dnl the same distribution terms as the rest of that program. | ||
1255 | + | ||
1256 | +AC_DEFUN([gl_FUNC_RMDIR], | ||
1257 | +[ | ||
1258 | + AC_REPLACE_FUNCS(rmdir) | ||
1259 | + if test $ac_cv_func_rmdir = no; then | ||
1260 | + gl_PREREQ_RMDIR | ||
1261 | + fi | ||
1262 | +]) | ||
1263 | + | ||
1264 | +# Prerequisites of lib/rmdir.c. | ||
1265 | +AC_DEFUN([gl_PREREQ_RMDIR], [ | ||
1266 | + AC_REQUIRE([AC_HEADER_STAT]) | ||
1267 | + : | ||
1268 | +]) | ||
1269 | + | ||
1270 | + | ||
1271 | +# getopt.m4 serial 1 | ||
1272 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1273 | +dnl This file is free software, distributed under the terms of the GNU | ||
1274 | +dnl General Public License. As a special exception to the GNU General | ||
1275 | +dnl Public License, this file may be distributed as part of a program | ||
1276 | +dnl that contains a configuration script generated by Autoconf, under | ||
1277 | +dnl the same distribution terms as the rest of that program. | ||
1278 | + | ||
1279 | +AC_DEFUN([gl_GETOPT], | ||
1280 | +[ | ||
1281 | + dnl Prerequisites of lib/getopt.c. | ||
1282 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1283 | +]) | ||
1284 | + | ||
1285 | +# xalloc.m4 serial 1 | ||
1286 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1287 | dnl This file is free software, distributed under the terms of the GNU | ||
1288 | dnl General Public License. As a special exception to the GNU General | ||
1289 | @@ -167,11 +1286,25 @@ | ||
1290 | dnl that contains a configuration script generated by Autoconf, under | ||
1291 | dnl the same distribution terms as the rest of that program. | ||
1292 | |||
1293 | -AC_DEFUN([gl_GETOPT], | ||
1294 | +AC_DEFUN([gl_XALLOC], | ||
1295 | [ | ||
1296 | - dnl Prerequisites of lib/getopt.c. | ||
1297 | + gl_PREREQ_XMALLOC | ||
1298 | + gl_PREREQ_XSTRDUP | ||
1299 | +]) | ||
1300 | + | ||
1301 | +# Prerequisites of lib/xmalloc.c. | ||
1302 | +AC_DEFUN([gl_PREREQ_XMALLOC], [ | ||
1303 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1304 | + AC_REQUIRE([jm_FUNC_MALLOC]) | ||
1305 | + AC_REQUIRE([jm_FUNC_REALLOC]) | ||
1306 | +]) | ||
1307 | + | ||
1308 | +# Prerequisites of lib/xstrdup.c. | ||
1309 | +AC_DEFUN([gl_PREREQ_XSTRDUP], [ | ||
1310 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1311 | AC_CHECK_HEADERS_ONCE(string.h) | ||
1312 | ]) | ||
1313 | + | ||
1314 | # malloc.m4 serial 7 | ||
1315 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1316 | dnl This file is free software, distributed under the terms of the GNU | ||
1317 | @@ -197,66 +1330,8 @@ | ||
1318 | AC_DEFUN([gl_PREREQ_MALLOC], [ | ||
1319 | : | ||
1320 | ]) | ||
1321 | -# mbrtowc.m4 serial 5 | ||
1322 | -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. | ||
1323 | -dnl This file is free software, distributed under the terms of the GNU | ||
1324 | -dnl General Public License. As a special exception to the GNU General | ||
1325 | -dnl Public License, this file may be distributed as part of a program | ||
1326 | -dnl that contains a configuration script generated by Autoconf, under | ||
1327 | -dnl the same distribution terms as the rest of that program. | ||
1328 | - | ||
1329 | -dnl From Paul Eggert | ||
1330 | - | ||
1331 | -dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with | ||
1332 | -dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere. | ||
1333 | - | ||
1334 | -AC_DEFUN([jm_FUNC_MBRTOWC], | ||
1335 | -[ | ||
1336 | - AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], | ||
1337 | - jm_cv_func_mbrtowc, | ||
1338 | - [AC_TRY_LINK( | ||
1339 | - [#include <wchar.h>], | ||
1340 | - [mbstate_t state; return ! (sizeof state && mbrtowc);], | ||
1341 | - jm_cv_func_mbrtowc=yes, | ||
1342 | - jm_cv_func_mbrtowc=no)]) | ||
1343 | - if test $jm_cv_func_mbrtowc = yes; then | ||
1344 | - AC_DEFINE(HAVE_MBRTOWC, 1, | ||
1345 | - [Define to 1 if mbrtowc and mbstate_t are properly declared.]) | ||
1346 | - fi | ||
1347 | -]) | ||
1348 | -# mbstate_t.m4 serial 9 | ||
1349 | -dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. | ||
1350 | -dnl This file is free software, distributed under the terms of the GNU | ||
1351 | -dnl General Public License. As a special exception to the GNU General | ||
1352 | -dnl Public License, this file may be distributed as part of a program | ||
1353 | -dnl that contains a configuration script generated by Autoconf, under | ||
1354 | -dnl the same distribution terms as the rest of that program. | ||
1355 | - | ||
1356 | -# From Paul Eggert. | ||
1357 | - | ||
1358 | -# BeOS 5 has <wchar.h> but does not define mbstate_t, | ||
1359 | -# so you can't declare an object of that type. | ||
1360 | -# Check for this incompatibility with Standard C. | ||
1361 | |||
1362 | -# AC_TYPE_MBSTATE_T | ||
1363 | -# ----------------- | ||
1364 | -AC_DEFUN([AC_TYPE_MBSTATE_T], | ||
1365 | - [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, | ||
1366 | - [AC_COMPILE_IFELSE( | ||
1367 | - [AC_LANG_PROGRAM( | ||
1368 | - [AC_INCLUDES_DEFAULT | ||
1369 | -# include <wchar.h>], | ||
1370 | - [mbstate_t x; return sizeof x;])], | ||
1371 | - [ac_cv_type_mbstate_t=yes], | ||
1372 | - [ac_cv_type_mbstate_t=no])]) | ||
1373 | - if test $ac_cv_type_mbstate_t = yes; then | ||
1374 | - AC_DEFINE([HAVE_MBSTATE_T], 1, | ||
1375 | - [Define to 1 if <wchar.h> declares mbstate_t.]) | ||
1376 | - else | ||
1377 | - AC_DEFINE([mbstate_t], int, | ||
1378 | - [Define to a type if <wchar.h> does not define.]) | ||
1379 | - fi]) | ||
1380 | -# memchr.m4 serial 1 | ||
1381 | +# realloc.m4 serial 7 | ||
1382 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1383 | dnl This file is free software, distributed under the terms of the GNU | ||
1384 | dnl General Public License. As a special exception to the GNU General | ||
1385 | @@ -264,116 +1339,24 @@ | ||
1386 | dnl that contains a configuration script generated by Autoconf, under | ||
1387 | dnl the same distribution terms as the rest of that program. | ||
1388 | |||
1389 | -AC_DEFUN([gl_FUNC_MEMCHR], | ||
1390 | +dnl From Jim Meyering. | ||
1391 | +dnl Determine whether realloc works when both arguments are 0. | ||
1392 | +dnl If it doesn't, arrange to use the replacement function. | ||
1393 | + | ||
1394 | +AC_DEFUN([jm_FUNC_REALLOC], | ||
1395 | [ | ||
1396 | - AC_REPLACE_FUNCS(memchr) | ||
1397 | - if test $ac_cv_func_memchr = no; then | ||
1398 | - jm_PREREQ_MEMCHR | ||
1399 | + AC_REQUIRE([AC_FUNC_REALLOC]) | ||
1400 | + dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works. | ||
1401 | + if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then | ||
1402 | + gl_PREREQ_REALLOC | ||
1403 | fi | ||
1404 | ]) | ||
1405 | |||
1406 | -# Prerequisites of lib/memchr.c. | ||
1407 | -AC_DEFUN([jm_PREREQ_MEMCHR], [ | ||
1408 | - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h) | ||
1409 | - AC_CHECK_HEADERS(bp-sym.h) | ||
1410 | -]) | ||
1411 | -#serial 1 | ||
1412 | - | ||
1413 | -dnl From Mumit Khan and Paul Eggert | ||
1414 | -dnl Determine whether mkdir accepts only one argument instead of the usual two. | ||
1415 | - | ||
1416 | -AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG], | ||
1417 | - [AC_CHECK_FUNCS(mkdir) | ||
1418 | - AC_CACHE_CHECK([whether mkdir takes only one argument], | ||
1419 | - patch_cv_mkdir_takes_one_arg, | ||
1420 | - [patch_cv_mkdir_takes_one_arg=no | ||
1421 | - if test $ac_cv_func_mkdir = yes; then | ||
1422 | - AC_TRY_COMPILE([ | ||
1423 | -#include <sys/types.h> | ||
1424 | -#include <sys/stat.h> | ||
1425 | - ], | ||
1426 | - [mkdir (".", 0);], | ||
1427 | - , | ||
1428 | - [AC_TRY_COMPILE([ | ||
1429 | -#include <sys/types.h> | ||
1430 | -#include <sys/stat.h> | ||
1431 | - ], | ||
1432 | - [mkdir (".");], | ||
1433 | - patch_cv_mkdir_takes_one_arg=yes | ||
1434 | - )] | ||
1435 | - ) | ||
1436 | - fi | ||
1437 | - ] | ||
1438 | - ) | ||
1439 | - if test $patch_cv_mkdir_takes_one_arg = yes; then | ||
1440 | - AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, | ||
1441 | - [Define if mkdir takes only one argument.]) | ||
1442 | - fi | ||
1443 | - ] | ||
1444 | -) | ||
1445 | -# onceonly.m4 serial 3 | ||
1446 | -dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. | ||
1447 | -dnl This file is free software, distributed under the terms of the GNU | ||
1448 | -dnl General Public License. As a special exception to the GNU General | ||
1449 | -dnl Public License, this file may be distributed as part of a program | ||
1450 | -dnl that contains a configuration script generated by Autoconf, under | ||
1451 | -dnl the same distribution terms as the rest of that program. | ||
1452 | - | ||
1453 | -dnl This file defines some "once only" variants of standard autoconf macros. | ||
1454 | -dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS | ||
1455 | -dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS | ||
1456 | -dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS | ||
1457 | -dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC | ||
1458 | -dnl The advantage is that the check for each of the headers/functions/decls | ||
1459 | -dnl will be put only once into the 'configure' file. It keeps the size of | ||
1460 | -dnl the 'configure' file down, and avoids redundant output when 'configure' | ||
1461 | -dnl is run. | ||
1462 | -dnl The drawback is that the checks cannot be conditionalized. If you write | ||
1463 | -dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi | ||
1464 | -dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to | ||
1465 | -dnl empty, and the check will be inserted before the body of the AC_DEFUNed | ||
1466 | -dnl function. | ||
1467 | - | ||
1468 | -dnl Autoconf version 2.57 or newer is recommended. | ||
1469 | -AC_PREREQ(2.54) | ||
1470 | - | ||
1471 | -# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of | ||
1472 | -# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). | ||
1473 | -AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ | ||
1474 | - : | ||
1475 | - AC_FOREACH([gl_HEADER_NAME], [$1], [ | ||
1476 | - AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]), | ||
1477 | - [-./], [___])), [ | ||
1478 | - AC_CHECK_HEADERS(gl_HEADER_NAME) | ||
1479 | - ]) | ||
1480 | - AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, | ||
1481 | - [-./], [___]))) | ||
1482 | - ]) | ||
1483 | -]) | ||
1484 | - | ||
1485 | -# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of | ||
1486 | -# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). | ||
1487 | -AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ | ||
1488 | +# Prerequisites of lib/realloc.c. | ||
1489 | +AC_DEFUN([gl_PREREQ_REALLOC], [ | ||
1490 | : | ||
1491 | - AC_FOREACH([gl_FUNC_NAME], [$1], [ | ||
1492 | - AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [ | ||
1493 | - AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME])) | ||
1494 | - ]) | ||
1495 | - AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME])) | ||
1496 | - ]) | ||
1497 | ]) | ||
1498 | |||
1499 | -# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of | ||
1500 | -# AC_CHECK_DECLS(DECL1, DECL2, ...). | ||
1501 | -AC_DEFUN([AC_CHECK_DECLS_ONCE], [ | ||
1502 | - : | ||
1503 | - AC_FOREACH([gl_DECL_NAME], [$1], [ | ||
1504 | - AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [ | ||
1505 | - AC_CHECK_DECLS(m4_defn([gl_DECL_NAME])) | ||
1506 | - ]) | ||
1507 | - AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME])) | ||
1508 | - ]) | ||
1509 | -]) | ||
1510 | # quote.m4 serial 1 | ||
1511 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1512 | dnl This file is free software, distributed under the terms of the GNU | ||
1513 | @@ -387,6 +1370,7 @@ | ||
1514 | dnl Prerequisites of lib/quote.c. | ||
1515 | AC_CHECK_HEADERS_ONCE(stddef.h) | ||
1516 | ]) | ||
1517 | + | ||
1518 | # quotearg.m4 serial 1 | ||
1519 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1520 | dnl This file is free software, distributed under the terms of the GNU | ||
1521 | @@ -403,32 +1387,69 @@ | ||
1522 | AC_TYPE_MBSTATE_T | ||
1523 | jm_FUNC_MBRTOWC | ||
1524 | ]) | ||
1525 | -# realloc.m4 serial 7 | ||
1526 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1527 | + | ||
1528 | +# mbstate_t.m4 serial 9 | ||
1529 | +dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. | ||
1530 | dnl This file is free software, distributed under the terms of the GNU | ||
1531 | dnl General Public License. As a special exception to the GNU General | ||
1532 | dnl Public License, this file may be distributed as part of a program | ||
1533 | dnl that contains a configuration script generated by Autoconf, under | ||
1534 | dnl the same distribution terms as the rest of that program. | ||
1535 | |||
1536 | -dnl From Jim Meyering. | ||
1537 | -dnl Determine whether realloc works when both arguments are 0. | ||
1538 | -dnl If it doesn't, arrange to use the replacement function. | ||
1539 | +# From Paul Eggert. | ||
1540 | |||
1541 | -AC_DEFUN([jm_FUNC_REALLOC], | ||
1542 | +# BeOS 5 has <wchar.h> but does not define mbstate_t, | ||
1543 | +# so you can't declare an object of that type. | ||
1544 | +# Check for this incompatibility with Standard C. | ||
1545 | + | ||
1546 | +# AC_TYPE_MBSTATE_T | ||
1547 | +# ----------------- | ||
1548 | +AC_DEFUN([AC_TYPE_MBSTATE_T], | ||
1549 | + [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, | ||
1550 | + [AC_COMPILE_IFELSE( | ||
1551 | + [AC_LANG_PROGRAM( | ||
1552 | + [AC_INCLUDES_DEFAULT | ||
1553 | +# include <wchar.h>], | ||
1554 | + [mbstate_t x; return sizeof x;])], | ||
1555 | + [ac_cv_type_mbstate_t=yes], | ||
1556 | + [ac_cv_type_mbstate_t=no])]) | ||
1557 | + if test $ac_cv_type_mbstate_t = yes; then | ||
1558 | + AC_DEFINE([HAVE_MBSTATE_T], 1, | ||
1559 | + [Define to 1 if <wchar.h> declares mbstate_t.]) | ||
1560 | + else | ||
1561 | + AC_DEFINE([mbstate_t], int, | ||
1562 | + [Define to a type if <wchar.h> does not define.]) | ||
1563 | + fi]) | ||
1564 | + | ||
1565 | +# mbrtowc.m4 serial 5 | ||
1566 | +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. | ||
1567 | +dnl This file is free software, distributed under the terms of the GNU | ||
1568 | +dnl General Public License. As a special exception to the GNU General | ||
1569 | +dnl Public License, this file may be distributed as part of a program | ||
1570 | +dnl that contains a configuration script generated by Autoconf, under | ||
1571 | +dnl the same distribution terms as the rest of that program. | ||
1572 | + | ||
1573 | +dnl From Paul Eggert | ||
1574 | + | ||
1575 | +dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with | ||
1576 | +dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere. | ||
1577 | + | ||
1578 | +AC_DEFUN([jm_FUNC_MBRTOWC], | ||
1579 | [ | ||
1580 | - AC_REQUIRE([AC_FUNC_REALLOC]) | ||
1581 | - dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works. | ||
1582 | - if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then | ||
1583 | - gl_PREREQ_REALLOC | ||
1584 | + AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], | ||
1585 | + jm_cv_func_mbrtowc, | ||
1586 | + [AC_TRY_LINK( | ||
1587 | + [#include <wchar.h>], | ||
1588 | + [mbstate_t state; return ! (sizeof state && mbrtowc);], | ||
1589 | + jm_cv_func_mbrtowc=yes, | ||
1590 | + jm_cv_func_mbrtowc=no)]) | ||
1591 | + if test $jm_cv_func_mbrtowc = yes; then | ||
1592 | + AC_DEFINE(HAVE_MBRTOWC, 1, | ||
1593 | + [Define to 1 if mbrtowc and mbstate_t are properly declared.]) | ||
1594 | fi | ||
1595 | ]) | ||
1596 | |||
1597 | -# Prerequisites of lib/realloc.c. | ||
1598 | -AC_DEFUN([gl_PREREQ_REALLOC], [ | ||
1599 | - : | ||
1600 | -]) | ||
1601 | -# rmdir.m4 serial 1 | ||
1602 | +# hash.m4 serial 1 | ||
1603 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1604 | dnl This file is free software, distributed under the terms of the GNU | ||
1605 | dnl General Public License. As a special exception to the GNU General | ||
1606 | @@ -436,18 +1457,71 @@ | ||
1607 | dnl that contains a configuration script generated by Autoconf, under | ||
1608 | dnl the same distribution terms as the rest of that program. | ||
1609 | |||
1610 | -AC_DEFUN([gl_FUNC_RMDIR], | ||
1611 | +AC_DEFUN([gl_HASH], | ||
1612 | [ | ||
1613 | - AC_REPLACE_FUNCS(rmdir) | ||
1614 | - if test $ac_cv_func_rmdir = no; then | ||
1615 | - gl_PREREQ_RMDIR | ||
1616 | - fi | ||
1617 | + dnl Prerequisites of lib/hash.c. | ||
1618 | + AC_CHECK_HEADERS_ONCE(stdlib.h) | ||
1619 | + AC_HEADER_STDBOOL | ||
1620 | + AC_CHECK_DECLS_ONCE(free malloc) | ||
1621 | ]) | ||
1622 | |||
1623 | -# Prerequisites of lib/rmdir.c. | ||
1624 | -AC_DEFUN([gl_PREREQ_RMDIR], [ | ||
1625 | - AC_REQUIRE([AC_HEADER_STAT]) | ||
1626 | - : | ||
1627 | +AC_DEFUN([ag_CHECK_NANOSECOND_STAT], | ||
1628 | + [AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
1629 | + [ac_cv_stat_nsec], | ||
1630 | + [AC_TRY_COMPILE( | ||
1631 | + [ | ||
1632 | + #include <sys/types.h> | ||
1633 | + #include <sys/stat.h> | ||
1634 | + #include <unistd.h> | ||
1635 | + struct stat st; | ||
1636 | + ], | ||
1637 | + [ return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; ], | ||
1638 | + [ac_cv_stat_nsec=yes], | ||
1639 | + [ac_cv_stat_nsec=no]) | ||
1640 | + ]) | ||
1641 | + if test $ac_cv_stat_nsec = yes; then | ||
1642 | + AC_DEFINE(HAVE_STAT_NSEC, 1, [Define to 1 if struct stat has nanosecond timestamps.]) | ||
1643 | + fi | ||
1644 | + | ||
1645 | + AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
1646 | + [ac_cv_stat_timeval], | ||
1647 | + [AC_TRY_COMPILE( | ||
1648 | + [ | ||
1649 | + #include <time.h> | ||
1650 | + #include <sys/types.h> | ||
1651 | + #include <sys/stat.h> | ||
1652 | + #include <unistd.h> | ||
1653 | + struct stat st; | ||
1654 | + ], | ||
1655 | + [ return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; ], | ||
1656 | + [ac_cv_stat_timeval=yes], | ||
1657 | + [ac_cv_stat_timeval=no]) | ||
1658 | + ]) | ||
1659 | + if test $ac_cv_stat_timeval = yes; then | ||
1660 | + AC_DEFINE(HAVE_STAT_TIMEVAL, 1, [Define to 1 if struct stat comtains struct timeval's.]) | ||
1661 | + fi]) | ||
1662 | + | ||
1663 | +#serial 7 -*- autoconf -*- | ||
1664 | + | ||
1665 | +dnl From Jim Meyering. | ||
1666 | +dnl | ||
1667 | +dnl See if the glibc *_unlocked I/O macros or functions are available. | ||
1668 | +dnl Use only those *_unlocked macros or functions that are declared | ||
1669 | +dnl (because some of them were declared in Solaris 2.5.1 but were removed | ||
1670 | +dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run | ||
1671 | +dnl on Solaris 2.6). | ||
1672 | + | ||
1673 | +AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], | ||
1674 | +[ | ||
1675 | + dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked() | ||
1676 | + dnl etc. | ||
1677 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
1678 | + | ||
1679 | + AC_CHECK_DECLS_ONCE( | ||
1680 | + [clearerr_unlocked feof_unlocked ferror_unlocked | ||
1681 | + fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked | ||
1682 | + fread_unlocked fwrite_unlocked getc_unlocked | ||
1683 | + getchar_unlocked putc_unlocked putchar_unlocked]) | ||
1684 | ]) | ||
1685 | |||
1686 | # Check for setmode, DOS style. | ||
1687 | @@ -488,180 +1562,39 @@ | ||
1688 | AC_DEFINE(HAVE_SETMODE_DOS, 1, | ||
1689 | [Define to 1 if you have the DOS-style `setmode' function.]) | ||
1690 | fi]) | ||
1691 | -# Check for stdbool.h that conforms to C99. | ||
1692 | - | ||
1693 | -# Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
1694 | - | ||
1695 | -# This program is free software; you can redistribute it and/or modify | ||
1696 | -# it under the terms of the GNU General Public License as published by | ||
1697 | -# the Free Software Foundation; either version 2, or (at your option) | ||
1698 | -# any later version. | ||
1699 | - | ||
1700 | -# This program is distributed in the hope that it will be useful, | ||
1701 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1702 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1703 | -# GNU General Public License for more details. | ||
1704 | - | ||
1705 | -# You should have received a copy of the GNU General Public License | ||
1706 | -# along with this program; if not, write to the Free Software | ||
1707 | -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
1708 | -# 02111-1307, USA. | ||
1709 | - | ||
1710 | -# Prepare for substituting <stdbool.h> if it is not supported. | ||
1711 | - | ||
1712 | -AC_DEFUN([AM_STDBOOL_H], | ||
1713 | -[ | ||
1714 | - AC_REQUIRE([AC_HEADER_STDBOOL]) | ||
1715 | - | ||
1716 | - # Define two additional variables used in the Makefile substitution. | ||
1717 | - | ||
1718 | - if test "$ac_cv_header_stdbool_h" = yes; then | ||
1719 | - STDBOOL_H='' | ||
1720 | - else | ||
1721 | - STDBOOL_H='stdbool.h' | ||
1722 | - fi | ||
1723 | - AC_SUBST([STDBOOL_H]) | ||
1724 | - | ||
1725 | - if test "$ac_cv_type__Bool" = yes; then | ||
1726 | - HAVE__BOOL=1 | ||
1727 | - else | ||
1728 | - HAVE__BOOL=0 | ||
1729 | - fi | ||
1730 | - AC_SUBST([HAVE__BOOL]) | ||
1731 | -]) | ||
1732 | - | ||
1733 | -# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf | ||
1734 | -# have this macro built-in. | ||
1735 | - | ||
1736 | -AC_DEFUN([AC_HEADER_STDBOOL], | ||
1737 | - [AC_CACHE_CHECK([for stdbool.h that conforms to C99], | ||
1738 | - [ac_cv_header_stdbool_h], | ||
1739 | - [AC_TRY_COMPILE( | ||
1740 | - [ | ||
1741 | - #include <stdbool.h> | ||
1742 | - #ifndef bool | ||
1743 | - "error: bool is not defined" | ||
1744 | - #endif | ||
1745 | - #ifndef false | ||
1746 | - "error: false is not defined" | ||
1747 | - #endif | ||
1748 | - #if false | ||
1749 | - "error: false is not 0" | ||
1750 | - #endif | ||
1751 | - #ifndef true | ||
1752 | - "error: false is not defined" | ||
1753 | - #endif | ||
1754 | - #if true != 1 | ||
1755 | - "error: true is not 1" | ||
1756 | - #endif | ||
1757 | - #ifndef __bool_true_false_are_defined | ||
1758 | - "error: __bool_true_false_are_defined is not defined" | ||
1759 | - #endif | ||
1760 | - | ||
1761 | - struct s { _Bool s: 1; _Bool t; } s; | ||
1762 | - | ||
1763 | - char a[true == 1 ? 1 : -1]; | ||
1764 | - char b[false == 0 ? 1 : -1]; | ||
1765 | - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
1766 | - char d[(bool) -0.5 == true ? 1 : -1]; | ||
1767 | - bool e = &s; | ||
1768 | - char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
1769 | - char g[true]; | ||
1770 | - char h[sizeof (_Bool)]; | ||
1771 | - char i[sizeof s.t]; | ||
1772 | - ], | ||
1773 | - [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ], | ||
1774 | - [ac_cv_header_stdbool_h=yes], | ||
1775 | - [ac_cv_header_stdbool_h=no])]) | ||
1776 | - AC_CHECK_TYPES([_Bool]) | ||
1777 | - if test $ac_cv_header_stdbool_h = yes; then | ||
1778 | - AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) | ||
1779 | - fi]) | ||
1780 | -#serial 7 -*- autoconf -*- | ||
1781 | - | ||
1782 | -dnl From Jim Meyering. | ||
1783 | -dnl | ||
1784 | -dnl See if the glibc *_unlocked I/O macros or functions are available. | ||
1785 | -dnl Use only those *_unlocked macros or functions that are declared | ||
1786 | -dnl (because some of them were declared in Solaris 2.5.1 but were removed | ||
1787 | -dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run | ||
1788 | -dnl on Solaris 2.6). | ||
1789 | - | ||
1790 | -AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], | ||
1791 | -[ | ||
1792 | - dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked() | ||
1793 | - dnl etc. | ||
1794 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
1795 | - | ||
1796 | - AC_CHECK_DECLS_ONCE( | ||
1797 | - [clearerr_unlocked feof_unlocked ferror_unlocked | ||
1798 | - fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked | ||
1799 | - fread_unlocked fwrite_unlocked getc_unlocked | ||
1800 | - getchar_unlocked putc_unlocked putchar_unlocked]) | ||
1801 | -]) | ||
1802 | -#serial 5 | ||
1803 | - | ||
1804 | -dnl From Jim Meyering | ||
1805 | - | ||
1806 | -dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- | ||
1807 | -dnl usually in <utime.h>. | ||
1808 | -dnl Some systems have utime.h but don't declare the struct anywhere. | ||
1809 | - | ||
1810 | -AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF], | ||
1811 | -[ | ||
1812 | - AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) | ||
1813 | - AC_REQUIRE([AC_HEADER_TIME]) | ||
1814 | - AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, | ||
1815 | - [AC_TRY_COMPILE( | ||
1816 | - [ | ||
1817 | -#ifdef TIME_WITH_SYS_TIME | ||
1818 | -# include <sys/time.h> | ||
1819 | -# include <time.h> | ||
1820 | -#else | ||
1821 | -# ifdef HAVE_SYS_TIME_H | ||
1822 | -# include <sys/time.h> | ||
1823 | -# else | ||
1824 | -# include <time.h> | ||
1825 | -# endif | ||
1826 | -#endif | ||
1827 | -#ifdef HAVE_UTIME_H | ||
1828 | -# include <utime.h> | ||
1829 | -#endif | ||
1830 | - ], | ||
1831 | - [static struct utimbuf x; x.actime = x.modtime;], | ||
1832 | - fu_cv_sys_struct_utimbuf=yes, | ||
1833 | - fu_cv_sys_struct_utimbuf=no) | ||
1834 | - ]) | ||
1835 | |||
1836 | - if test $fu_cv_sys_struct_utimbuf = yes; then | ||
1837 | - AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, | ||
1838 | - [Define if struct utimbuf is declared -- usually in <utime.h>. | ||
1839 | - Some systems have utime.h but don't declare the struct anywhere. ]) | ||
1840 | - fi | ||
1841 | -]) | ||
1842 | -# xalloc.m4 serial 1 | ||
1843 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1844 | -dnl This file is free software, distributed under the terms of the GNU | ||
1845 | -dnl General Public License. As a special exception to the GNU General | ||
1846 | -dnl Public License, this file may be distributed as part of a program | ||
1847 | -dnl that contains a configuration script generated by Autoconf, under | ||
1848 | -dnl the same distribution terms as the rest of that program. | ||
1849 | +#serial 1 | ||
1850 | |||
1851 | -AC_DEFUN([gl_XALLOC], | ||
1852 | -[ | ||
1853 | - gl_PREREQ_XMALLOC | ||
1854 | - gl_PREREQ_XSTRDUP | ||
1855 | -]) | ||
1856 | +dnl From Mumit Khan and Paul Eggert | ||
1857 | +dnl Determine whether mkdir accepts only one argument instead of the usual two. | ||
1858 | |||
1859 | -# Prerequisites of lib/xmalloc.c. | ||
1860 | -AC_DEFUN([gl_PREREQ_XMALLOC], [ | ||
1861 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1862 | - AC_REQUIRE([jm_FUNC_MALLOC]) | ||
1863 | - AC_REQUIRE([jm_FUNC_REALLOC]) | ||
1864 | -]) | ||
1865 | +AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG], | ||
1866 | + [AC_CHECK_FUNCS(mkdir) | ||
1867 | + AC_CACHE_CHECK([whether mkdir takes only one argument], | ||
1868 | + patch_cv_mkdir_takes_one_arg, | ||
1869 | + [patch_cv_mkdir_takes_one_arg=no | ||
1870 | + if test $ac_cv_func_mkdir = yes; then | ||
1871 | + AC_TRY_COMPILE([ | ||
1872 | +#include <sys/types.h> | ||
1873 | +#include <sys/stat.h> | ||
1874 | + ], | ||
1875 | + [mkdir (".", 0);], | ||
1876 | + , | ||
1877 | + [AC_TRY_COMPILE([ | ||
1878 | +#include <sys/types.h> | ||
1879 | +#include <sys/stat.h> | ||
1880 | + ], | ||
1881 | + [mkdir (".");], | ||
1882 | + patch_cv_mkdir_takes_one_arg=yes | ||
1883 | + )] | ||
1884 | + ) | ||
1885 | + fi | ||
1886 | + ] | ||
1887 | + ) | ||
1888 | + if test $patch_cv_mkdir_takes_one_arg = yes; then | ||
1889 | + AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, | ||
1890 | + [Define if mkdir takes only one argument.]) | ||
1891 | + fi | ||
1892 | + ] | ||
1893 | +) | ||
1894 | |||
1895 | -# Prerequisites of lib/xstrdup.c. | ||
1896 | -AC_DEFUN([gl_PREREQ_XSTRDUP], [ | ||
1897 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1898 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1899 | -]) | ||
1900 | --- patch-2.5.9.orig/configure | ||
1901 | +++ patch-2.5.9/configure | ||
1902 | @@ -1,11 +1,10 @@ | ||
1903 | #! /bin/sh | ||
1904 | # Guess values for system-dependent variables and create Makefiles. | ||
1905 | -# Generated by GNU Autoconf 2.57 for patch 2.5.9. | ||
1906 | +# Generated by GNU Autoconf 2.59 for patch 2.5.9. | ||
1907 | # | ||
1908 | # Report bugs to <bug-patch@gnu.org>. | ||
1909 | # | ||
1910 | -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
1911 | -# Free Software Foundation, Inc. | ||
1912 | +# Copyright (C) 2003 Free Software Foundation, Inc. | ||
1913 | # This configure script is free software; the Free Software Foundation | ||
1914 | # gives unlimited permission to copy, distribute and modify it. | ||
1915 | ## --------------------- ## | ||
1916 | @@ -22,9 +21,10 @@ | ||
1917 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
1918 | set -o posix | ||
1919 | fi | ||
1920 | +DUALCASE=1; export DUALCASE # for MKS sh | ||
1921 | |||
1922 | # Support unset when possible. | ||
1923 | -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
1924 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
1925 | as_unset=unset | ||
1926 | else | ||
1927 | as_unset=false | ||
1928 | @@ -43,7 +43,7 @@ | ||
1929 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
1930 | LC_TELEPHONE LC_TIME | ||
1931 | do | ||
1932 | - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
1933 | + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
1934 | eval $as_var=C; export $as_var | ||
1935 | else | ||
1936 | $as_unset $as_var | ||
1937 | @@ -220,16 +220,17 @@ | ||
1938 | if mkdir -p . 2>/dev/null; then | ||
1939 | as_mkdir_p=: | ||
1940 | else | ||
1941 | + test -d ./-p && rmdir ./-p | ||
1942 | as_mkdir_p=false | ||
1943 | fi | ||
1944 | |||
1945 | as_executable_p="test -f" | ||
1946 | |||
1947 | # Sed expression to map a string onto a valid CPP name. | ||
1948 | -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
1949 | +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
1950 | |||
1951 | # Sed expression to map a string onto a valid variable name. | ||
1952 | -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | ||
1953 | +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
1954 | |||
1955 | |||
1956 | # IFS | ||
1957 | @@ -669,7 +670,7 @@ | ||
1958 | |||
1959 | # Be sure to have absolute paths. | ||
1960 | for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | ||
1961 | - localstatedir libdir includedir oldincludedir infodir mandir | ||
1962 | + localstatedir libdir includedir oldincludedir infodir mandir | ||
1963 | do | ||
1964 | eval ac_val=$`echo $ac_var` | ||
1965 | case $ac_val in | ||
1966 | @@ -709,10 +710,10 @@ | ||
1967 | # Try the directory containing this script, then its parent. | ||
1968 | ac_confdir=`(dirname "$0") 2>/dev/null || | ||
1969 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
1970 | - X"$0" : 'X\(//\)[^/]' \| \ | ||
1971 | - X"$0" : 'X\(//\)$' \| \ | ||
1972 | - X"$0" : 'X\(/\)' \| \ | ||
1973 | - . : '\(.\)' 2>/dev/null || | ||
1974 | + X"$0" : 'X\(//\)[^/]' \| \ | ||
1975 | + X"$0" : 'X\(//\)$' \| \ | ||
1976 | + X"$0" : 'X\(/\)' \| \ | ||
1977 | + . : '\(.\)' 2>/dev/null || | ||
1978 | echo X"$0" | | ||
1979 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
1980 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
1981 | @@ -804,9 +805,9 @@ | ||
1982 | cat <<_ACEOF | ||
1983 | Installation directories: | ||
1984 | --prefix=PREFIX install architecture-independent files in PREFIX | ||
1985 | - [$ac_default_prefix] | ||
1986 | + [$ac_default_prefix] | ||
1987 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | ||
1988 | - [PREFIX] | ||
1989 | + [PREFIX] | ||
1990 | |||
1991 | By default, \`make install' will install all the files in | ||
1992 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | ||
1993 | @@ -896,12 +897,45 @@ | ||
1994 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
1995 | ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
1996 | esac | ||
1997 | -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be | ||
1998 | -# absolute. | ||
1999 | -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` | ||
2000 | -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` | ||
2001 | -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` | ||
2002 | -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` | ||
2003 | + | ||
2004 | +# Do not use `cd foo && pwd` to compute absolute paths, because | ||
2005 | +# the directories may not exist. | ||
2006 | +case `pwd` in | ||
2007 | +.) ac_abs_builddir="$ac_dir";; | ||
2008 | +*) | ||
2009 | + case "$ac_dir" in | ||
2010 | + .) ac_abs_builddir=`pwd`;; | ||
2011 | + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
2012 | + *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
2013 | + esac;; | ||
2014 | +esac | ||
2015 | +case $ac_abs_builddir in | ||
2016 | +.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
2017 | +*) | ||
2018 | + case ${ac_top_builddir}. in | ||
2019 | + .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
2020 | + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
2021 | + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
2022 | + esac;; | ||
2023 | +esac | ||
2024 | +case $ac_abs_builddir in | ||
2025 | +.) ac_abs_srcdir=$ac_srcdir;; | ||
2026 | +*) | ||
2027 | + case $ac_srcdir in | ||
2028 | + .) ac_abs_srcdir=$ac_abs_builddir;; | ||
2029 | + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
2030 | + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
2031 | + esac;; | ||
2032 | +esac | ||
2033 | +case $ac_abs_builddir in | ||
2034 | +.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
2035 | +*) | ||
2036 | + case $ac_top_srcdir in | ||
2037 | + .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
2038 | + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
2039 | + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
2040 | + esac;; | ||
2041 | +esac | ||
2042 | |||
2043 | cd $ac_dir | ||
2044 | # Check for guested configure; otherwise get Cygnus style configure. | ||
2045 | @@ -912,13 +946,13 @@ | ||
2046 | echo | ||
2047 | $SHELL $ac_srcdir/configure --help=recursive | ||
2048 | elif test -f $ac_srcdir/configure.ac || | ||
2049 | - test -f $ac_srcdir/configure.in; then | ||
2050 | + test -f $ac_srcdir/configure.in; then | ||
2051 | echo | ||
2052 | $ac_configure --help | ||
2053 | else | ||
2054 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | ||
2055 | fi | ||
2056 | - cd $ac_popdir | ||
2057 | + cd "$ac_popdir" | ||
2058 | done | ||
2059 | fi | ||
2060 | |||
2061 | @@ -926,10 +960,9 @@ | ||
2062 | if $ac_init_version; then | ||
2063 | cat <<\_ACEOF | ||
2064 | patch configure 2.5.9 | ||
2065 | -generated by GNU Autoconf 2.57 | ||
2066 | +generated by GNU Autoconf 2.59 | ||
2067 | |||
2068 | -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
2069 | -Free Software Foundation, Inc. | ||
2070 | +Copyright (C) 2003 Free Software Foundation, Inc. | ||
2071 | This configure script is free software; the Free Software Foundation | ||
2072 | gives unlimited permission to copy, distribute and modify it. | ||
2073 | _ACEOF | ||
2074 | @@ -941,7 +974,7 @@ | ||
2075 | running configure, to aid debugging if configure makes a mistake. | ||
2076 | |||
2077 | It was created by patch $as_me 2.5.9, which was | ||
2078 | -generated by GNU Autoconf 2.57. Invocation command line was | ||
2079 | +generated by GNU Autoconf 2.59. Invocation command line was | ||
2080 | |||
2081 | $ $0 $@ | ||
2082 | |||
2083 | @@ -1018,19 +1051,19 @@ | ||
2084 | 2) | ||
2085 | ac_configure_args1="$ac_configure_args1 '$ac_arg'" | ||
2086 | if test $ac_must_keep_next = true; then | ||
2087 | - ac_must_keep_next=false # Got value, back to normal. | ||
2088 | + ac_must_keep_next=false # Got value, back to normal. | ||
2089 | else | ||
2090 | - case $ac_arg in | ||
2091 | - *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
2092 | - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
2093 | - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
2094 | - | -with-* | --with-* | -without-* | --without-* | --x) | ||
2095 | - case "$ac_configure_args0 " in | ||
2096 | - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
2097 | - esac | ||
2098 | - ;; | ||
2099 | - -* ) ac_must_keep_next=true ;; | ||
2100 | - esac | ||
2101 | + case $ac_arg in | ||
2102 | + *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
2103 | + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
2104 | + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
2105 | + | -with-* | --with-* | -without-* | --without-* | --x) | ||
2106 | + case "$ac_configure_args0 " in | ||
2107 | + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
2108 | + esac | ||
2109 | + ;; | ||
2110 | + -* ) ac_must_keep_next=true ;; | ||
2111 | + esac | ||
2112 | fi | ||
2113 | ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | ||
2114 | # Get rid of the leading space. | ||
2115 | @@ -1064,12 +1097,12 @@ | ||
2116 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in | ||
2117 | *ac_space=\ *) | ||
2118 | sed -n \ | ||
2119 | - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
2120 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
2121 | + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
2122 | + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
2123 | ;; | ||
2124 | *) | ||
2125 | sed -n \ | ||
2126 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
2127 | + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
2128 | ;; | ||
2129 | esac; | ||
2130 | } | ||
2131 | @@ -1098,7 +1131,7 @@ | ||
2132 | for ac_var in $ac_subst_files | ||
2133 | do | ||
2134 | eval ac_val=$`echo $ac_var` | ||
2135 | - echo "$ac_var='"'"'$ac_val'"'"'" | ||
2136 | + echo "$ac_var='"'"'$ac_val'"'"'" | ||
2137 | done | sort | ||
2138 | echo | ||
2139 | fi | ||
2140 | @@ -1117,7 +1150,7 @@ | ||
2141 | echo "$as_me: caught signal $ac_signal" | ||
2142 | echo "$as_me: exit $exit_status" | ||
2143 | } >&5 | ||
2144 | - rm -f core core.* *.core && | ||
2145 | + rm -f core *.core && | ||
2146 | rm -rf conftest* confdefs* conf$$* $ac_clean_files && | ||
2147 | exit $exit_status | ||
2148 | ' 0 | ||
2149 | @@ -1197,7 +1230,7 @@ | ||
2150 | # value. | ||
2151 | ac_cache_corrupted=false | ||
2152 | for ac_var in `(set) 2>&1 | | ||
2153 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
2154 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
2155 | eval ac_old_set=\$ac_cv_env_${ac_var}_set | ||
2156 | eval ac_new_set=\$ac_env_${ac_var}_set | ||
2157 | eval ac_old_val="\$ac_cv_env_${ac_var}_value" | ||
2158 | @@ -1214,13 +1247,13 @@ | ||
2159 | ,);; | ||
2160 | *) | ||
2161 | if test "x$ac_old_val" != "x$ac_new_val"; then | ||
2162 | - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2163 | + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2164 | echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
2165 | - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
2166 | + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
2167 | echo "$as_me: former value: $ac_old_val" >&2;} | ||
2168 | - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
2169 | + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
2170 | echo "$as_me: current value: $ac_new_val" >&2;} | ||
2171 | - ac_cache_corrupted=: | ||
2172 | + ac_cache_corrupted=: | ||
2173 | fi;; | ||
2174 | esac | ||
2175 | # Pass precious variables to config.status. | ||
2176 | @@ -1629,7 +1662,6 @@ | ||
2177 | (exit $ac_status); } | ||
2178 | |||
2179 | cat >conftest.$ac_ext <<_ACEOF | ||
2180 | -#line $LINENO "configure" | ||
2181 | /* confdefs.h. */ | ||
2182 | _ACEOF | ||
2183 | cat confdefs.h >>conftest.$ac_ext | ||
2184 | @@ -1649,8 +1681,8 @@ | ||
2185 | # Try to create an executable without -o first, disregard a.out. | ||
2186 | # It will help us diagnose broken compilers, and finding out an intuition | ||
2187 | # of exeext. | ||
2188 | -echo "$as_me:$LINENO: checking for C compiler default output" >&5 | ||
2189 | -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 | ||
2190 | +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | ||
2191 | +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 | ||
2192 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
2193 | if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 | ||
2194 | (eval $ac_link_default) 2>&5 | ||
2195 | @@ -1670,23 +1702,23 @@ | ||
2196 | test -f "$ac_file" || continue | ||
2197 | case $ac_file in | ||
2198 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) | ||
2199 | - ;; | ||
2200 | + ;; | ||
2201 | conftest.$ac_ext ) | ||
2202 | - # This is the source file. | ||
2203 | - ;; | ||
2204 | + # This is the source file. | ||
2205 | + ;; | ||
2206 | [ab].out ) | ||
2207 | - # We found the default executable, but exeext='' is most | ||
2208 | - # certainly right. | ||
2209 | - break;; | ||
2210 | + # We found the default executable, but exeext='' is most | ||
2211 | + # certainly right. | ||
2212 | + break;; | ||
2213 | *.* ) | ||
2214 | - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2215 | - # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
2216 | - # but it would be cool to find out if it's true. Does anybody | ||
2217 | - # maintain Libtool? --akim. | ||
2218 | - export ac_cv_exeext | ||
2219 | - break;; | ||
2220 | + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2221 | + # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
2222 | + # but it would be cool to find out if it's true. Does anybody | ||
2223 | + # maintain Libtool? --akim. | ||
2224 | + export ac_cv_exeext | ||
2225 | + break;; | ||
2226 | * ) | ||
2227 | - break;; | ||
2228 | + break;; | ||
2229 | esac | ||
2230 | done | ||
2231 | else | ||
2232 | @@ -1760,8 +1792,8 @@ | ||
2233 | case $ac_file in | ||
2234 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; | ||
2235 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2236 | - export ac_cv_exeext | ||
2237 | - break;; | ||
2238 | + export ac_cv_exeext | ||
2239 | + break;; | ||
2240 | * ) break;; | ||
2241 | esac | ||
2242 | done | ||
2243 | @@ -1786,7 +1818,6 @@ | ||
2244 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2245 | else | ||
2246 | cat >conftest.$ac_ext <<_ACEOF | ||
2247 | -#line $LINENO "configure" | ||
2248 | /* confdefs.h. */ | ||
2249 | _ACEOF | ||
2250 | cat confdefs.h >>conftest.$ac_ext | ||
2251 | @@ -1837,7 +1868,6 @@ | ||
2252 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2253 | else | ||
2254 | cat >conftest.$ac_ext <<_ACEOF | ||
2255 | -#line $LINENO "configure" | ||
2256 | /* confdefs.h. */ | ||
2257 | _ACEOF | ||
2258 | cat confdefs.h >>conftest.$ac_ext | ||
2259 | @@ -1857,11 +1887,20 @@ | ||
2260 | _ACEOF | ||
2261 | rm -f conftest.$ac_objext | ||
2262 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2263 | - (eval $ac_compile) 2>&5 | ||
2264 | + (eval $ac_compile) 2>conftest.er1 | ||
2265 | ac_status=$? | ||
2266 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2267 | + rm -f conftest.er1 | ||
2268 | + cat conftest.err >&5 | ||
2269 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2270 | (exit $ac_status); } && | ||
2271 | - { ac_try='test -s conftest.$ac_objext' | ||
2272 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2273 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2274 | + (eval $ac_try) 2>&5 | ||
2275 | + ac_status=$? | ||
2276 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2277 | + (exit $ac_status); }; } && | ||
2278 | + { ac_try='test -s conftest.$ac_objext' | ||
2279 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2280 | (eval $ac_try) 2>&5 | ||
2281 | ac_status=$? | ||
2282 | @@ -1874,7 +1913,7 @@ | ||
2283 | |||
2284 | ac_compiler_gnu=no | ||
2285 | fi | ||
2286 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2287 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2288 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
2289 | |||
2290 | fi | ||
2291 | @@ -1890,7 +1929,6 @@ | ||
2292 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2293 | else | ||
2294 | cat >conftest.$ac_ext <<_ACEOF | ||
2295 | -#line $LINENO "configure" | ||
2296 | /* confdefs.h. */ | ||
2297 | _ACEOF | ||
2298 | cat confdefs.h >>conftest.$ac_ext | ||
2299 | @@ -1907,11 +1945,20 @@ | ||
2300 | _ACEOF | ||
2301 | rm -f conftest.$ac_objext | ||
2302 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2303 | - (eval $ac_compile) 2>&5 | ||
2304 | + (eval $ac_compile) 2>conftest.er1 | ||
2305 | ac_status=$? | ||
2306 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2307 | + rm -f conftest.er1 | ||
2308 | + cat conftest.err >&5 | ||
2309 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2310 | (exit $ac_status); } && | ||
2311 | - { ac_try='test -s conftest.$ac_objext' | ||
2312 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2313 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2314 | + (eval $ac_try) 2>&5 | ||
2315 | + ac_status=$? | ||
2316 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2317 | + (exit $ac_status); }; } && | ||
2318 | + { ac_try='test -s conftest.$ac_objext' | ||
2319 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2320 | (eval $ac_try) 2>&5 | ||
2321 | ac_status=$? | ||
2322 | @@ -1924,7 +1971,7 @@ | ||
2323 | |||
2324 | ac_cv_prog_cc_g=no | ||
2325 | fi | ||
2326 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2327 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2328 | fi | ||
2329 | echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
2330 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | ||
2331 | @@ -1951,7 +1998,6 @@ | ||
2332 | ac_cv_prog_cc_stdc=no | ||
2333 | ac_save_CC=$CC | ||
2334 | cat >conftest.$ac_ext <<_ACEOF | ||
2335 | -#line $LINENO "configure" | ||
2336 | /* confdefs.h. */ | ||
2337 | _ACEOF | ||
2338 | cat confdefs.h >>conftest.$ac_ext | ||
2339 | @@ -1979,6 +2025,16 @@ | ||
2340 | va_end (v); | ||
2341 | return s; | ||
2342 | } | ||
2343 | + | ||
2344 | +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | ||
2345 | + function prototypes and stuff, but not '\xHH' hex character constants. | ||
2346 | + These don't provoke an error unfortunately, instead are silently treated | ||
2347 | + as 'x'. The following induces an error, until -std1 is added to get | ||
2348 | + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | ||
2349 | + array size at least. It's necessary to write '\x00'==0 to get something | ||
2350 | + that's true only with -std1. */ | ||
2351 | +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | ||
2352 | + | ||
2353 | int test (int i, double x); | ||
2354 | struct s1 {int (*f) (int a);}; | ||
2355 | struct s2 {int (*f) (double a);}; | ||
2356 | @@ -2005,11 +2061,20 @@ | ||
2357 | CC="$ac_save_CC $ac_arg" | ||
2358 | rm -f conftest.$ac_objext | ||
2359 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2360 | - (eval $ac_compile) 2>&5 | ||
2361 | + (eval $ac_compile) 2>conftest.er1 | ||
2362 | ac_status=$? | ||
2363 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2364 | + rm -f conftest.er1 | ||
2365 | + cat conftest.err >&5 | ||
2366 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2367 | (exit $ac_status); } && | ||
2368 | - { ac_try='test -s conftest.$ac_objext' | ||
2369 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2370 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2371 | + (eval $ac_try) 2>&5 | ||
2372 | + ac_status=$? | ||
2373 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2374 | + (exit $ac_status); }; } && | ||
2375 | + { ac_try='test -s conftest.$ac_objext' | ||
2376 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2377 | (eval $ac_try) 2>&5 | ||
2378 | ac_status=$? | ||
2379 | @@ -2022,7 +2087,7 @@ | ||
2380 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2381 | |||
2382 | fi | ||
2383 | -rm -f conftest.$ac_objext | ||
2384 | +rm -f conftest.err conftest.$ac_objext | ||
2385 | done | ||
2386 | rm -f conftest.$ac_ext conftest.$ac_objext | ||
2387 | CC=$ac_save_CC | ||
2388 | @@ -2050,19 +2115,27 @@ | ||
2389 | _ACEOF | ||
2390 | rm -f conftest.$ac_objext | ||
2391 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2392 | - (eval $ac_compile) 2>&5 | ||
2393 | + (eval $ac_compile) 2>conftest.er1 | ||
2394 | ac_status=$? | ||
2395 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2396 | + rm -f conftest.er1 | ||
2397 | + cat conftest.err >&5 | ||
2398 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2399 | (exit $ac_status); } && | ||
2400 | - { ac_try='test -s conftest.$ac_objext' | ||
2401 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2402 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2403 | + (eval $ac_try) 2>&5 | ||
2404 | + ac_status=$? | ||
2405 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2406 | + (exit $ac_status); }; } && | ||
2407 | + { ac_try='test -s conftest.$ac_objext' | ||
2408 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2409 | (eval $ac_try) 2>&5 | ||
2410 | ac_status=$? | ||
2411 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2412 | (exit $ac_status); }; }; then | ||
2413 | for ac_declaration in \ | ||
2414 | - ''\ | ||
2415 | - '#include <stdlib.h>' \ | ||
2416 | + '' \ | ||
2417 | 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
2418 | 'extern "C" void std::exit (int); using std::exit;' \ | ||
2419 | 'extern "C" void exit (int) throw ();' \ | ||
2420 | @@ -2070,14 +2143,13 @@ | ||
2421 | 'void exit (int);' | ||
2422 | do | ||
2423 | cat >conftest.$ac_ext <<_ACEOF | ||
2424 | -#line $LINENO "configure" | ||
2425 | /* confdefs.h. */ | ||
2426 | _ACEOF | ||
2427 | cat confdefs.h >>conftest.$ac_ext | ||
2428 | cat >>conftest.$ac_ext <<_ACEOF | ||
2429 | /* end confdefs.h. */ | ||
2430 | -#include <stdlib.h> | ||
2431 | $ac_declaration | ||
2432 | +#include <stdlib.h> | ||
2433 | int | ||
2434 | main () | ||
2435 | { | ||
2436 | @@ -2088,11 +2160,20 @@ | ||
2437 | _ACEOF | ||
2438 | rm -f conftest.$ac_objext | ||
2439 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2440 | - (eval $ac_compile) 2>&5 | ||
2441 | + (eval $ac_compile) 2>conftest.er1 | ||
2442 | ac_status=$? | ||
2443 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2444 | + rm -f conftest.er1 | ||
2445 | + cat conftest.err >&5 | ||
2446 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2447 | (exit $ac_status); } && | ||
2448 | - { ac_try='test -s conftest.$ac_objext' | ||
2449 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2450 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2451 | + (eval $ac_try) 2>&5 | ||
2452 | + ac_status=$? | ||
2453 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2454 | + (exit $ac_status); }; } && | ||
2455 | + { ac_try='test -s conftest.$ac_objext' | ||
2456 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2457 | (eval $ac_try) 2>&5 | ||
2458 | ac_status=$? | ||
2459 | @@ -2105,9 +2186,8 @@ | ||
2460 | |||
2461 | continue | ||
2462 | fi | ||
2463 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2464 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2465 | cat >conftest.$ac_ext <<_ACEOF | ||
2466 | -#line $LINENO "configure" | ||
2467 | /* confdefs.h. */ | ||
2468 | _ACEOF | ||
2469 | cat confdefs.h >>conftest.$ac_ext | ||
2470 | @@ -2124,11 +2204,20 @@ | ||
2471 | _ACEOF | ||
2472 | rm -f conftest.$ac_objext | ||
2473 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2474 | - (eval $ac_compile) 2>&5 | ||
2475 | + (eval $ac_compile) 2>conftest.er1 | ||
2476 | ac_status=$? | ||
2477 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2478 | + rm -f conftest.er1 | ||
2479 | + cat conftest.err >&5 | ||
2480 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2481 | (exit $ac_status); } && | ||
2482 | - { ac_try='test -s conftest.$ac_objext' | ||
2483 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2484 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2485 | + (eval $ac_try) 2>&5 | ||
2486 | + ac_status=$? | ||
2487 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2488 | + (exit $ac_status); }; } && | ||
2489 | + { ac_try='test -s conftest.$ac_objext' | ||
2490 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2491 | (eval $ac_try) 2>&5 | ||
2492 | ac_status=$? | ||
2493 | @@ -2140,7 +2229,7 @@ | ||
2494 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2495 | |||
2496 | fi | ||
2497 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2498 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2499 | done | ||
2500 | rm -f conftest* | ||
2501 | if test -n "$ac_declaration"; then | ||
2502 | @@ -2154,7 +2243,7 @@ | ||
2503 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2504 | |||
2505 | fi | ||
2506 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2507 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2508 | ac_ext=c | ||
2509 | ac_cpp='$CPP $CPPFLAGS' | ||
2510 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
2511 | @@ -2189,7 +2278,6 @@ | ||
2512 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
2513 | # not just through cpp. "Syntax error" is here to catch this case. | ||
2514 | cat >conftest.$ac_ext <<_ACEOF | ||
2515 | -#line $LINENO "configure" | ||
2516 | /* confdefs.h. */ | ||
2517 | _ACEOF | ||
2518 | cat confdefs.h >>conftest.$ac_ext | ||
2519 | @@ -2200,7 +2288,7 @@ | ||
2520 | #else | ||
2521 | # include <assert.h> | ||
2522 | #endif | ||
2523 | - Syntax error | ||
2524 | + Syntax error | ||
2525 | _ACEOF | ||
2526 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2527 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
2528 | @@ -2212,6 +2300,7 @@ | ||
2529 | (exit $ac_status); } >/dev/null; then | ||
2530 | if test -s conftest.err; then | ||
2531 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2532 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2533 | else | ||
2534 | ac_cpp_err= | ||
2535 | fi | ||
2536 | @@ -2232,7 +2321,6 @@ | ||
2537 | # OK, works on sane cases. Now check whether non-existent headers | ||
2538 | # can be detected and how. | ||
2539 | cat >conftest.$ac_ext <<_ACEOF | ||
2540 | -#line $LINENO "configure" | ||
2541 | /* confdefs.h. */ | ||
2542 | _ACEOF | ||
2543 | cat confdefs.h >>conftest.$ac_ext | ||
2544 | @@ -2250,6 +2338,7 @@ | ||
2545 | (exit $ac_status); } >/dev/null; then | ||
2546 | if test -s conftest.err; then | ||
2547 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2548 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2549 | else | ||
2550 | ac_cpp_err= | ||
2551 | fi | ||
2552 | @@ -2296,7 +2385,6 @@ | ||
2553 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
2554 | # not just through cpp. "Syntax error" is here to catch this case. | ||
2555 | cat >conftest.$ac_ext <<_ACEOF | ||
2556 | -#line $LINENO "configure" | ||
2557 | /* confdefs.h. */ | ||
2558 | _ACEOF | ||
2559 | cat confdefs.h >>conftest.$ac_ext | ||
2560 | @@ -2307,7 +2395,7 @@ | ||
2561 | #else | ||
2562 | # include <assert.h> | ||
2563 | #endif | ||
2564 | - Syntax error | ||
2565 | + Syntax error | ||
2566 | _ACEOF | ||
2567 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2568 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
2569 | @@ -2319,6 +2407,7 @@ | ||
2570 | (exit $ac_status); } >/dev/null; then | ||
2571 | if test -s conftest.err; then | ||
2572 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2573 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2574 | else | ||
2575 | ac_cpp_err= | ||
2576 | fi | ||
2577 | @@ -2339,7 +2428,6 @@ | ||
2578 | # OK, works on sane cases. Now check whether non-existent headers | ||
2579 | # can be detected and how. | ||
2580 | cat >conftest.$ac_ext <<_ACEOF | ||
2581 | -#line $LINENO "configure" | ||
2582 | /* confdefs.h. */ | ||
2583 | _ACEOF | ||
2584 | cat confdefs.h >>conftest.$ac_ext | ||
2585 | @@ -2357,6 +2445,7 @@ | ||
2586 | (exit $ac_status); } >/dev/null; then | ||
2587 | if test -s conftest.err; then | ||
2588 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2589 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2590 | else | ||
2591 | ac_cpp_err= | ||
2592 | fi | ||
2593 | @@ -2431,6 +2520,7 @@ | ||
2594 | # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag | ||
2595 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
2596 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
2597 | +# OS/2's system install, which has a completely different semantic | ||
2598 | # ./install, which can be erroneously created by make from ./install.sh. | ||
2599 | echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
2600 | echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 | ||
2601 | @@ -2447,6 +2537,7 @@ | ||
2602 | case $as_dir/ in | ||
2603 | ./ | .// | /cC/* | \ | ||
2604 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | ||
2605 | + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ | ||
2606 | /usr/ucb/* ) ;; | ||
2607 | *) | ||
2608 | # OSF1 and SCO ODT 3.0 have their own names for install. | ||
2609 | @@ -2454,20 +2545,20 @@ | ||
2610 | # by default. | ||
2611 | for ac_prog in ginstall scoinst install; do | ||
2612 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2613 | - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2614 | - if test $ac_prog = install && | ||
2615 | - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2616 | - # AIX install. It has an incompatible calling convention. | ||
2617 | - : | ||
2618 | - elif test $ac_prog = install && | ||
2619 | - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2620 | - # program-specific install script used by HP pwplus--don't use. | ||
2621 | - : | ||
2622 | - else | ||
2623 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2624 | - break 3 | ||
2625 | - fi | ||
2626 | - fi | ||
2627 | + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2628 | + if test $ac_prog = install && | ||
2629 | + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2630 | + # AIX install. It has an incompatible calling convention. | ||
2631 | + : | ||
2632 | + elif test $ac_prog = install && | ||
2633 | + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2634 | + # program-specific install script used by HP pwplus--don't use. | ||
2635 | + : | ||
2636 | + else | ||
2637 | + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2638 | + break 3 | ||
2639 | + fi | ||
2640 | + fi | ||
2641 | done | ||
2642 | done | ||
2643 | ;; | ||
2644 | @@ -2499,7 +2590,7 @@ | ||
2645 | |||
2646 | echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
2647 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | ||
2648 | -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | ||
2649 | +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` | ||
2650 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | ||
2651 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2652 | else | ||
2653 | @@ -2596,7 +2687,6 @@ | ||
2654 | echo "$as_me:$LINENO: checking for AIX" >&5 | ||
2655 | echo $ECHO_N "checking for AIX... $ECHO_C" >&6 | ||
2656 | cat >conftest.$ac_ext <<_ACEOF | ||
2657 | -#line $LINENO "configure" | ||
2658 | /* confdefs.h. */ | ||
2659 | _ACEOF | ||
2660 | cat confdefs.h >>conftest.$ac_ext | ||
2661 | @@ -2628,7 +2718,6 @@ | ||
2662 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2663 | else | ||
2664 | cat >conftest.$ac_ext <<_ACEOF | ||
2665 | -#line $LINENO "configure" | ||
2666 | /* confdefs.h. */ | ||
2667 | _ACEOF | ||
2668 | cat confdefs.h >>conftest.$ac_ext | ||
2669 | @@ -2649,11 +2738,20 @@ | ||
2670 | _ACEOF | ||
2671 | rm -f conftest.$ac_objext | ||
2672 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2673 | - (eval $ac_compile) 2>&5 | ||
2674 | + (eval $ac_compile) 2>conftest.er1 | ||
2675 | ac_status=$? | ||
2676 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2677 | + rm -f conftest.er1 | ||
2678 | + cat conftest.err >&5 | ||
2679 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2680 | (exit $ac_status); } && | ||
2681 | - { ac_try='test -s conftest.$ac_objext' | ||
2682 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2683 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2684 | + (eval $ac_try) 2>&5 | ||
2685 | + ac_status=$? | ||
2686 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2687 | + (exit $ac_status); }; } && | ||
2688 | + { ac_try='test -s conftest.$ac_objext' | ||
2689 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2690 | (eval $ac_try) 2>&5 | ||
2691 | ac_status=$? | ||
2692 | @@ -2666,12 +2764,11 @@ | ||
2693 | |||
2694 | ac_cv_header_stdc=no | ||
2695 | fi | ||
2696 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2697 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2698 | |||
2699 | if test $ac_cv_header_stdc = yes; then | ||
2700 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
2701 | cat >conftest.$ac_ext <<_ACEOF | ||
2702 | -#line $LINENO "configure" | ||
2703 | /* confdefs.h. */ | ||
2704 | _ACEOF | ||
2705 | cat confdefs.h >>conftest.$ac_ext | ||
2706 | @@ -2693,7 +2790,6 @@ | ||
2707 | if test $ac_cv_header_stdc = yes; then | ||
2708 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
2709 | cat >conftest.$ac_ext <<_ACEOF | ||
2710 | -#line $LINENO "configure" | ||
2711 | /* confdefs.h. */ | ||
2712 | _ACEOF | ||
2713 | cat confdefs.h >>conftest.$ac_ext | ||
2714 | @@ -2718,7 +2814,6 @@ | ||
2715 | : | ||
2716 | else | ||
2717 | cat >conftest.$ac_ext <<_ACEOF | ||
2718 | -#line $LINENO "configure" | ||
2719 | /* confdefs.h. */ | ||
2720 | _ACEOF | ||
2721 | cat confdefs.h >>conftest.$ac_ext | ||
2722 | @@ -2730,9 +2825,9 @@ | ||
2723 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
2724 | #else | ||
2725 | # define ISLOWER(c) \ | ||
2726 | - (('a' <= (c) && (c) <= 'i') \ | ||
2727 | - || ('j' <= (c) && (c) <= 'r') \ | ||
2728 | - || ('s' <= (c) && (c) <= 'z')) | ||
2729 | + (('a' <= (c) && (c) <= 'i') \ | ||
2730 | + || ('j' <= (c) && (c) <= 'r') \ | ||
2731 | + || ('s' <= (c) && (c) <= 'z')) | ||
2732 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
2733 | #endif | ||
2734 | |||
2735 | @@ -2743,7 +2838,7 @@ | ||
2736 | int i; | ||
2737 | for (i = 0; i < 256; i++) | ||
2738 | if (XOR (islower (i), ISLOWER (i)) | ||
2739 | - || toupper (i) != TOUPPER (i)) | ||
2740 | + || toupper (i) != TOUPPER (i)) | ||
2741 | exit(2); | ||
2742 | exit (0); | ||
2743 | } | ||
2744 | @@ -2768,7 +2863,7 @@ | ||
2745 | ( exit $ac_status ) | ||
2746 | ac_cv_header_stdc=no | ||
2747 | fi | ||
2748 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
2749 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
2750 | fi | ||
2751 | fi | ||
2752 | fi | ||
2753 | @@ -2793,7 +2888,7 @@ | ||
2754 | |||
2755 | |||
2756 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
2757 | - inttypes.h stdint.h unistd.h | ||
2758 | + inttypes.h stdint.h unistd.h | ||
2759 | do | ||
2760 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
2761 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
2762 | @@ -2802,7 +2897,6 @@ | ||
2763 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2764 | else | ||
2765 | cat >conftest.$ac_ext <<_ACEOF | ||
2766 | -#line $LINENO "configure" | ||
2767 | /* confdefs.h. */ | ||
2768 | _ACEOF | ||
2769 | cat confdefs.h >>conftest.$ac_ext | ||
2770 | @@ -2814,11 +2908,20 @@ | ||
2771 | _ACEOF | ||
2772 | rm -f conftest.$ac_objext | ||
2773 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2774 | - (eval $ac_compile) 2>&5 | ||
2775 | + (eval $ac_compile) 2>conftest.er1 | ||
2776 | ac_status=$? | ||
2777 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2778 | + rm -f conftest.er1 | ||
2779 | + cat conftest.err >&5 | ||
2780 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2781 | (exit $ac_status); } && | ||
2782 | - { ac_try='test -s conftest.$ac_objext' | ||
2783 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2784 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2785 | + (eval $ac_try) 2>&5 | ||
2786 | + ac_status=$? | ||
2787 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2788 | + (exit $ac_status); }; } && | ||
2789 | + { ac_try='test -s conftest.$ac_objext' | ||
2790 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2791 | (eval $ac_try) 2>&5 | ||
2792 | ac_status=$? | ||
2793 | @@ -2831,7 +2934,7 @@ | ||
2794 | |||
2795 | eval "$as_ac_Header=no" | ||
2796 | fi | ||
2797 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2798 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2799 | fi | ||
2800 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
2801 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
2802 | @@ -2858,7 +2961,6 @@ | ||
2803 | echo "$as_me:$LINENO: checking minix/config.h usability" >&5 | ||
2804 | echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6 | ||
2805 | cat >conftest.$ac_ext <<_ACEOF | ||
2806 | -#line $LINENO "configure" | ||
2807 | /* confdefs.h. */ | ||
2808 | _ACEOF | ||
2809 | cat confdefs.h >>conftest.$ac_ext | ||
2810 | @@ -2869,11 +2971,20 @@ | ||
2811 | _ACEOF | ||
2812 | rm -f conftest.$ac_objext | ||
2813 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2814 | - (eval $ac_compile) 2>&5 | ||
2815 | + (eval $ac_compile) 2>conftest.er1 | ||
2816 | ac_status=$? | ||
2817 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2818 | + rm -f conftest.er1 | ||
2819 | + cat conftest.err >&5 | ||
2820 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2821 | (exit $ac_status); } && | ||
2822 | - { ac_try='test -s conftest.$ac_objext' | ||
2823 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2824 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2825 | + (eval $ac_try) 2>&5 | ||
2826 | + ac_status=$? | ||
2827 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2828 | + (exit $ac_status); }; } && | ||
2829 | + { ac_try='test -s conftest.$ac_objext' | ||
2830 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2831 | (eval $ac_try) 2>&5 | ||
2832 | ac_status=$? | ||
2833 | @@ -2886,7 +2997,7 @@ | ||
2834 | |||
2835 | ac_header_compiler=no | ||
2836 | fi | ||
2837 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2838 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2839 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
2840 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
2841 | |||
2842 | @@ -2894,7 +3005,6 @@ | ||
2843 | echo "$as_me:$LINENO: checking minix/config.h presence" >&5 | ||
2844 | echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6 | ||
2845 | cat >conftest.$ac_ext <<_ACEOF | ||
2846 | -#line $LINENO "configure" | ||
2847 | /* confdefs.h. */ | ||
2848 | _ACEOF | ||
2849 | cat confdefs.h >>conftest.$ac_ext | ||
2850 | @@ -2912,6 +3022,7 @@ | ||
2851 | (exit $ac_status); } >/dev/null; then | ||
2852 | if test -s conftest.err; then | ||
2853 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2854 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2855 | else | ||
2856 | ac_cpp_err= | ||
2857 | fi | ||
2858 | @@ -2931,33 +3042,32 @@ | ||
2859 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
2860 | |||
2861 | # So? What about this header? | ||
2862 | -case $ac_header_compiler:$ac_header_preproc in | ||
2863 | - yes:no ) | ||
2864 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
2865 | + yes:no: ) | ||
2866 | { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
2867 | echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
2868 | - { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 | ||
2869 | -echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} | ||
2870 | - ( | ||
2871 | - cat <<\_ASBOX | ||
2872 | -## ------------------------------------ ## | ||
2873 | -## Report this to bug-autoconf@gnu.org. ## | ||
2874 | -## ------------------------------------ ## | ||
2875 | -_ASBOX | ||
2876 | - ) | | ||
2877 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
2878 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 | ||
2879 | +echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} | ||
2880 | + ac_header_preproc=yes | ||
2881 | ;; | ||
2882 | - no:yes ) | ||
2883 | + no:yes:* ) | ||
2884 | { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 | ||
2885 | echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} | ||
2886 | - { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 | ||
2887 | -echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} | ||
2888 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 | ||
2889 | +echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} | ||
2890 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 | ||
2891 | +echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} | ||
2892 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
2893 | +echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
2894 | { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 | ||
2895 | echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} | ||
2896 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 | ||
2897 | +echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} | ||
2898 | ( | ||
2899 | cat <<\_ASBOX | ||
2900 | -## ------------------------------------ ## | ||
2901 | -## Report this to bug-autoconf@gnu.org. ## | ||
2902 | -## ------------------------------------ ## | ||
2903 | +## -------------------------------- ## | ||
2904 | +## Report this to bug-patch@gnu.org ## | ||
2905 | +## -------------------------------- ## | ||
2906 | _ASBOX | ||
2907 | ) | | ||
2908 | sed "s/^/$as_me: WARNING: /" >&2 | ||
2909 | @@ -3000,15 +3110,15 @@ | ||
2910 | fi | ||
2911 | |||
2912 | |||
2913 | -echo "$as_me:$LINENO: checking for library containing strerror" >&5 | ||
2914 | -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 | ||
2915 | -if test "${ac_cv_search_strerror+set}" = set; then | ||
2916 | + | ||
2917 | + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 | ||
2918 | +echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 | ||
2919 | +if test "${ac_cv_lib_cposix_strerror+set}" = set; then | ||
2920 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2921 | else | ||
2922 | - ac_func_search_save_LIBS=$LIBS | ||
2923 | -ac_cv_search_strerror=no | ||
2924 | + ac_check_lib_save_LIBS=$LIBS | ||
2925 | +LIBS="-lcposix $LIBS" | ||
2926 | cat >conftest.$ac_ext <<_ACEOF | ||
2927 | -#line $LINENO "configure" | ||
2928 | /* confdefs.h. */ | ||
2929 | _ACEOF | ||
2930 | cat confdefs.h >>conftest.$ac_ext | ||
2931 | @@ -3032,79 +3142,43 @@ | ||
2932 | _ACEOF | ||
2933 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
2934 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
2935 | - (eval $ac_link) 2>&5 | ||
2936 | + (eval $ac_link) 2>conftest.er1 | ||
2937 | ac_status=$? | ||
2938 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2939 | + rm -f conftest.er1 | ||
2940 | + cat conftest.err >&5 | ||
2941 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2942 | (exit $ac_status); } && | ||
2943 | - { ac_try='test -s conftest$ac_exeext' | ||
2944 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2945 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2946 | (eval $ac_try) 2>&5 | ||
2947 | ac_status=$? | ||
2948 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2949 | - (exit $ac_status); }; }; then | ||
2950 | - ac_cv_search_strerror="none required" | ||
2951 | -else | ||
2952 | - echo "$as_me: failed program was:" >&5 | ||
2953 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2954 | - | ||
2955 | -fi | ||
2956 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
2957 | -if test "$ac_cv_search_strerror" = no; then | ||
2958 | - for ac_lib in cposix; do | ||
2959 | - LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
2960 | - cat >conftest.$ac_ext <<_ACEOF | ||
2961 | -#line $LINENO "configure" | ||
2962 | -/* confdefs.h. */ | ||
2963 | -_ACEOF | ||
2964 | -cat confdefs.h >>conftest.$ac_ext | ||
2965 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2966 | -/* end confdefs.h. */ | ||
2967 | - | ||
2968 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
2969 | -#ifdef __cplusplus | ||
2970 | -extern "C" | ||
2971 | -#endif | ||
2972 | -/* We use char because int might match the return type of a gcc2 | ||
2973 | - builtin and then its argument prototype would still apply. */ | ||
2974 | -char strerror (); | ||
2975 | -int | ||
2976 | -main () | ||
2977 | -{ | ||
2978 | -strerror (); | ||
2979 | - ; | ||
2980 | - return 0; | ||
2981 | -} | ||
2982 | -_ACEOF | ||
2983 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
2984 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
2985 | - (eval $ac_link) 2>&5 | ||
2986 | - ac_status=$? | ||
2987 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2988 | - (exit $ac_status); } && | ||
2989 | - { ac_try='test -s conftest$ac_exeext' | ||
2990 | + (exit $ac_status); }; } && | ||
2991 | + { ac_try='test -s conftest$ac_exeext' | ||
2992 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2993 | (eval $ac_try) 2>&5 | ||
2994 | ac_status=$? | ||
2995 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2996 | (exit $ac_status); }; }; then | ||
2997 | - ac_cv_search_strerror="-l$ac_lib" | ||
2998 | -break | ||
2999 | + ac_cv_lib_cposix_strerror=yes | ||
3000 | else | ||
3001 | echo "$as_me: failed program was:" >&5 | ||
3002 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3003 | |||
3004 | +ac_cv_lib_cposix_strerror=no | ||
3005 | fi | ||
3006 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3007 | - done | ||
3008 | +rm -f conftest.err conftest.$ac_objext \ | ||
3009 | + conftest$ac_exeext conftest.$ac_ext | ||
3010 | +LIBS=$ac_check_lib_save_LIBS | ||
3011 | fi | ||
3012 | -LIBS=$ac_func_search_save_LIBS | ||
3013 | +echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 | ||
3014 | +echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 | ||
3015 | +if test $ac_cv_lib_cposix_strerror = yes; then | ||
3016 | + LIBS="$LIBS -lcposix" | ||
3017 | fi | ||
3018 | -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 | ||
3019 | -echo "${ECHO_T}$ac_cv_search_strerror" >&6 | ||
3020 | -if test "$ac_cv_search_strerror" != no; then | ||
3021 | - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" | ||
3022 | |||
3023 | -fi | ||
3024 | + | ||
3025 | |||
3026 | # Check whether --enable-largefile or --disable-largefile was given. | ||
3027 | if test "${enable_largefile+set}" = set; then | ||
3028 | @@ -3124,8 +3198,7 @@ | ||
3029 | while :; do | ||
3030 | # IRIX 6.2 and later do not support large files by default, | ||
3031 | # so use the C compiler's -n32 option if that helps. | ||
3032 | - cat >conftest.$ac_ext <<_ACEOF | ||
3033 | -#line $LINENO "configure" | ||
3034 | + cat >conftest.$ac_ext <<_ACEOF | ||
3035 | /* confdefs.h. */ | ||
3036 | _ACEOF | ||
3037 | cat confdefs.h >>conftest.$ac_ext | ||
3038 | @@ -3150,11 +3223,20 @@ | ||
3039 | _ACEOF | ||
3040 | rm -f conftest.$ac_objext | ||
3041 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3042 | - (eval $ac_compile) 2>&5 | ||
3043 | + (eval $ac_compile) 2>conftest.er1 | ||
3044 | ac_status=$? | ||
3045 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3046 | + rm -f conftest.er1 | ||
3047 | + cat conftest.err >&5 | ||
3048 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3049 | (exit $ac_status); } && | ||
3050 | - { ac_try='test -s conftest.$ac_objext' | ||
3051 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3052 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3053 | + (eval $ac_try) 2>&5 | ||
3054 | + ac_status=$? | ||
3055 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3056 | + (exit $ac_status); }; } && | ||
3057 | + { ac_try='test -s conftest.$ac_objext' | ||
3058 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3059 | (eval $ac_try) 2>&5 | ||
3060 | ac_status=$? | ||
3061 | @@ -3166,15 +3248,24 @@ | ||
3062 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3063 | |||
3064 | fi | ||
3065 | -rm -f conftest.$ac_objext | ||
3066 | +rm -f conftest.err conftest.$ac_objext | ||
3067 | CC="$CC -n32" | ||
3068 | rm -f conftest.$ac_objext | ||
3069 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3070 | - (eval $ac_compile) 2>&5 | ||
3071 | + (eval $ac_compile) 2>conftest.er1 | ||
3072 | ac_status=$? | ||
3073 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3074 | + rm -f conftest.er1 | ||
3075 | + cat conftest.err >&5 | ||
3076 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3077 | (exit $ac_status); } && | ||
3078 | - { ac_try='test -s conftest.$ac_objext' | ||
3079 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3080 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3081 | + (eval $ac_try) 2>&5 | ||
3082 | + ac_status=$? | ||
3083 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3084 | + (exit $ac_status); }; } && | ||
3085 | + { ac_try='test -s conftest.$ac_objext' | ||
3086 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3087 | (eval $ac_try) 2>&5 | ||
3088 | ac_status=$? | ||
3089 | @@ -3186,8 +3277,8 @@ | ||
3090 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3091 | |||
3092 | fi | ||
3093 | -rm -f conftest.$ac_objext | ||
3094 | - break | ||
3095 | +rm -f conftest.err conftest.$ac_objext | ||
3096 | + break | ||
3097 | done | ||
3098 | CC=$ac_save_CC | ||
3099 | rm -f conftest.$ac_ext | ||
3100 | @@ -3207,7 +3298,6 @@ | ||
3101 | while :; do | ||
3102 | ac_cv_sys_file_offset_bits=no | ||
3103 | cat >conftest.$ac_ext <<_ACEOF | ||
3104 | -#line $LINENO "configure" | ||
3105 | /* confdefs.h. */ | ||
3106 | _ACEOF | ||
3107 | cat confdefs.h >>conftest.$ac_ext | ||
3108 | @@ -3232,11 +3322,20 @@ | ||
3109 | _ACEOF | ||
3110 | rm -f conftest.$ac_objext | ||
3111 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3112 | - (eval $ac_compile) 2>&5 | ||
3113 | + (eval $ac_compile) 2>conftest.er1 | ||
3114 | ac_status=$? | ||
3115 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3116 | + rm -f conftest.er1 | ||
3117 | + cat conftest.err >&5 | ||
3118 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3119 | (exit $ac_status); } && | ||
3120 | - { ac_try='test -s conftest.$ac_objext' | ||
3121 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3122 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3123 | + (eval $ac_try) 2>&5 | ||
3124 | + ac_status=$? | ||
3125 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3126 | + (exit $ac_status); }; } && | ||
3127 | + { ac_try='test -s conftest.$ac_objext' | ||
3128 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3129 | (eval $ac_try) 2>&5 | ||
3130 | ac_status=$? | ||
3131 | @@ -3248,9 +3347,8 @@ | ||
3132 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3133 | |||
3134 | fi | ||
3135 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3136 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3137 | cat >conftest.$ac_ext <<_ACEOF | ||
3138 | -#line $LINENO "configure" | ||
3139 | /* confdefs.h. */ | ||
3140 | _ACEOF | ||
3141 | cat confdefs.h >>conftest.$ac_ext | ||
3142 | @@ -3276,11 +3374,20 @@ | ||
3143 | _ACEOF | ||
3144 | rm -f conftest.$ac_objext | ||
3145 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3146 | - (eval $ac_compile) 2>&5 | ||
3147 | + (eval $ac_compile) 2>conftest.er1 | ||
3148 | ac_status=$? | ||
3149 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3150 | + rm -f conftest.er1 | ||
3151 | + cat conftest.err >&5 | ||
3152 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3153 | (exit $ac_status); } && | ||
3154 | - { ac_try='test -s conftest.$ac_objext' | ||
3155 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3156 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3157 | + (eval $ac_try) 2>&5 | ||
3158 | + ac_status=$? | ||
3159 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3160 | + (exit $ac_status); }; } && | ||
3161 | + { ac_try='test -s conftest.$ac_objext' | ||
3162 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3163 | (eval $ac_try) 2>&5 | ||
3164 | ac_status=$? | ||
3165 | @@ -3292,7 +3399,7 @@ | ||
3166 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3167 | |||
3168 | fi | ||
3169 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3170 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3171 | break | ||
3172 | done | ||
3173 | fi | ||
3174 | @@ -3314,7 +3421,6 @@ | ||
3175 | while :; do | ||
3176 | ac_cv_sys_large_files=no | ||
3177 | cat >conftest.$ac_ext <<_ACEOF | ||
3178 | -#line $LINENO "configure" | ||
3179 | /* confdefs.h. */ | ||
3180 | _ACEOF | ||
3181 | cat confdefs.h >>conftest.$ac_ext | ||
3182 | @@ -3339,11 +3445,20 @@ | ||
3183 | _ACEOF | ||
3184 | rm -f conftest.$ac_objext | ||
3185 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3186 | - (eval $ac_compile) 2>&5 | ||
3187 | + (eval $ac_compile) 2>conftest.er1 | ||
3188 | ac_status=$? | ||
3189 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3190 | + rm -f conftest.er1 | ||
3191 | + cat conftest.err >&5 | ||
3192 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3193 | (exit $ac_status); } && | ||
3194 | - { ac_try='test -s conftest.$ac_objext' | ||
3195 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3196 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3197 | + (eval $ac_try) 2>&5 | ||
3198 | + ac_status=$? | ||
3199 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3200 | + (exit $ac_status); }; } && | ||
3201 | + { ac_try='test -s conftest.$ac_objext' | ||
3202 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3203 | (eval $ac_try) 2>&5 | ||
3204 | ac_status=$? | ||
3205 | @@ -3355,9 +3470,8 @@ | ||
3206 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3207 | |||
3208 | fi | ||
3209 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3210 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3211 | cat >conftest.$ac_ext <<_ACEOF | ||
3212 | -#line $LINENO "configure" | ||
3213 | /* confdefs.h. */ | ||
3214 | _ACEOF | ||
3215 | cat confdefs.h >>conftest.$ac_ext | ||
3216 | @@ -3383,11 +3497,20 @@ | ||
3217 | _ACEOF | ||
3218 | rm -f conftest.$ac_objext | ||
3219 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3220 | - (eval $ac_compile) 2>&5 | ||
3221 | + (eval $ac_compile) 2>conftest.er1 | ||
3222 | ac_status=$? | ||
3223 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3224 | + rm -f conftest.er1 | ||
3225 | + cat conftest.err >&5 | ||
3226 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3227 | (exit $ac_status); } && | ||
3228 | - { ac_try='test -s conftest.$ac_objext' | ||
3229 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3230 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3231 | + (eval $ac_try) 2>&5 | ||
3232 | + ac_status=$? | ||
3233 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3234 | + (exit $ac_status); }; } && | ||
3235 | + { ac_try='test -s conftest.$ac_objext' | ||
3236 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3237 | (eval $ac_try) 2>&5 | ||
3238 | ac_status=$? | ||
3239 | @@ -3399,7 +3522,7 @@ | ||
3240 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3241 | |||
3242 | fi | ||
3243 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3244 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3245 | break | ||
3246 | done | ||
3247 | fi | ||
3248 | @@ -3443,7 +3566,6 @@ | ||
3249 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3250 | else | ||
3251 | cat >conftest.$ac_ext <<_ACEOF | ||
3252 | -#line $LINENO "configure" | ||
3253 | /* confdefs.h. */ | ||
3254 | _ACEOF | ||
3255 | cat confdefs.h >>conftest.$ac_ext | ||
3256 | @@ -3506,11 +3628,20 @@ | ||
3257 | _ACEOF | ||
3258 | rm -f conftest.$ac_objext | ||
3259 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3260 | - (eval $ac_compile) 2>&5 | ||
3261 | + (eval $ac_compile) 2>conftest.er1 | ||
3262 | ac_status=$? | ||
3263 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3264 | + rm -f conftest.er1 | ||
3265 | + cat conftest.err >&5 | ||
3266 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3267 | (exit $ac_status); } && | ||
3268 | - { ac_try='test -s conftest.$ac_objext' | ||
3269 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3270 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3271 | + (eval $ac_try) 2>&5 | ||
3272 | + ac_status=$? | ||
3273 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3274 | + (exit $ac_status); }; } && | ||
3275 | + { ac_try='test -s conftest.$ac_objext' | ||
3276 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3277 | (eval $ac_try) 2>&5 | ||
3278 | ac_status=$? | ||
3279 | @@ -3523,7 +3654,7 @@ | ||
3280 | |||
3281 | ac_cv_c_const=no | ||
3282 | fi | ||
3283 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3284 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3285 | fi | ||
3286 | echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 | ||
3287 | echo "${ECHO_T}$ac_cv_c_const" >&6 | ||
3288 | @@ -3550,7 +3681,6 @@ | ||
3289 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3290 | else | ||
3291 | cat >conftest.$ac_ext <<_ACEOF | ||
3292 | -#line $LINENO "configure" | ||
3293 | /* confdefs.h. */ | ||
3294 | _ACEOF | ||
3295 | cat confdefs.h >>conftest.$ac_ext | ||
3296 | @@ -3570,11 +3700,20 @@ | ||
3297 | _ACEOF | ||
3298 | rm -f conftest.$ac_objext | ||
3299 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3300 | - (eval $ac_compile) 2>&5 | ||
3301 | + (eval $ac_compile) 2>conftest.er1 | ||
3302 | ac_status=$? | ||
3303 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3304 | + rm -f conftest.er1 | ||
3305 | + cat conftest.err >&5 | ||
3306 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3307 | (exit $ac_status); } && | ||
3308 | - { ac_try='test -s conftest.$ac_objext' | ||
3309 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3310 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3311 | + (eval $ac_try) 2>&5 | ||
3312 | + ac_status=$? | ||
3313 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3314 | + (exit $ac_status); }; } && | ||
3315 | + { ac_try='test -s conftest.$ac_objext' | ||
3316 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3317 | (eval $ac_try) 2>&5 | ||
3318 | ac_status=$? | ||
3319 | @@ -3587,7 +3726,7 @@ | ||
3320 | |||
3321 | eval "$as_ac_Header=no" | ||
3322 | fi | ||
3323 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3324 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3325 | fi | ||
3326 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
3327 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
3328 | @@ -3610,7 +3749,6 @@ | ||
3329 | ac_func_search_save_LIBS=$LIBS | ||
3330 | ac_cv_search_opendir=no | ||
3331 | cat >conftest.$ac_ext <<_ACEOF | ||
3332 | -#line $LINENO "configure" | ||
3333 | /* confdefs.h. */ | ||
3334 | _ACEOF | ||
3335 | cat confdefs.h >>conftest.$ac_ext | ||
3336 | @@ -3634,11 +3772,20 @@ | ||
3337 | _ACEOF | ||
3338 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3339 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3340 | - (eval $ac_link) 2>&5 | ||
3341 | + (eval $ac_link) 2>conftest.er1 | ||
3342 | ac_status=$? | ||
3343 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3344 | + rm -f conftest.er1 | ||
3345 | + cat conftest.err >&5 | ||
3346 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3347 | (exit $ac_status); } && | ||
3348 | - { ac_try='test -s conftest$ac_exeext' | ||
3349 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3350 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3351 | + (eval $ac_try) 2>&5 | ||
3352 | + ac_status=$? | ||
3353 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3354 | + (exit $ac_status); }; } && | ||
3355 | + { ac_try='test -s conftest$ac_exeext' | ||
3356 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3357 | (eval $ac_try) 2>&5 | ||
3358 | ac_status=$? | ||
3359 | @@ -3650,12 +3797,12 @@ | ||
3360 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3361 | |||
3362 | fi | ||
3363 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3364 | +rm -f conftest.err conftest.$ac_objext \ | ||
3365 | + conftest$ac_exeext conftest.$ac_ext | ||
3366 | if test "$ac_cv_search_opendir" = no; then | ||
3367 | for ac_lib in dir; do | ||
3368 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
3369 | cat >conftest.$ac_ext <<_ACEOF | ||
3370 | -#line $LINENO "configure" | ||
3371 | /* confdefs.h. */ | ||
3372 | _ACEOF | ||
3373 | cat confdefs.h >>conftest.$ac_ext | ||
3374 | @@ -3679,11 +3826,20 @@ | ||
3375 | _ACEOF | ||
3376 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3377 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3378 | - (eval $ac_link) 2>&5 | ||
3379 | + (eval $ac_link) 2>conftest.er1 | ||
3380 | ac_status=$? | ||
3381 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3382 | + rm -f conftest.er1 | ||
3383 | + cat conftest.err >&5 | ||
3384 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3385 | (exit $ac_status); } && | ||
3386 | - { ac_try='test -s conftest$ac_exeext' | ||
3387 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3388 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3389 | + (eval $ac_try) 2>&5 | ||
3390 | + ac_status=$? | ||
3391 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3392 | + (exit $ac_status); }; } && | ||
3393 | + { ac_try='test -s conftest$ac_exeext' | ||
3394 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3395 | (eval $ac_try) 2>&5 | ||
3396 | ac_status=$? | ||
3397 | @@ -3696,7 +3852,8 @@ | ||
3398 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3399 | |||
3400 | fi | ||
3401 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3402 | +rm -f conftest.err conftest.$ac_objext \ | ||
3403 | + conftest$ac_exeext conftest.$ac_ext | ||
3404 | done | ||
3405 | fi | ||
3406 | LIBS=$ac_func_search_save_LIBS | ||
3407 | @@ -3717,7 +3874,6 @@ | ||
3408 | ac_func_search_save_LIBS=$LIBS | ||
3409 | ac_cv_search_opendir=no | ||
3410 | cat >conftest.$ac_ext <<_ACEOF | ||
3411 | -#line $LINENO "configure" | ||
3412 | /* confdefs.h. */ | ||
3413 | _ACEOF | ||
3414 | cat confdefs.h >>conftest.$ac_ext | ||
3415 | @@ -3741,11 +3897,20 @@ | ||
3416 | _ACEOF | ||
3417 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3418 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3419 | - (eval $ac_link) 2>&5 | ||
3420 | + (eval $ac_link) 2>conftest.er1 | ||
3421 | ac_status=$? | ||
3422 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3423 | + rm -f conftest.er1 | ||
3424 | + cat conftest.err >&5 | ||
3425 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3426 | (exit $ac_status); } && | ||
3427 | - { ac_try='test -s conftest$ac_exeext' | ||
3428 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3429 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3430 | + (eval $ac_try) 2>&5 | ||
3431 | + ac_status=$? | ||
3432 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3433 | + (exit $ac_status); }; } && | ||
3434 | + { ac_try='test -s conftest$ac_exeext' | ||
3435 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3436 | (eval $ac_try) 2>&5 | ||
3437 | ac_status=$? | ||
3438 | @@ -3757,12 +3922,12 @@ | ||
3439 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3440 | |||
3441 | fi | ||
3442 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3443 | +rm -f conftest.err conftest.$ac_objext \ | ||
3444 | + conftest$ac_exeext conftest.$ac_ext | ||
3445 | if test "$ac_cv_search_opendir" = no; then | ||
3446 | for ac_lib in x; do | ||
3447 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
3448 | cat >conftest.$ac_ext <<_ACEOF | ||
3449 | -#line $LINENO "configure" | ||
3450 | /* confdefs.h. */ | ||
3451 | _ACEOF | ||
3452 | cat confdefs.h >>conftest.$ac_ext | ||
3453 | @@ -3786,11 +3951,20 @@ | ||
3454 | _ACEOF | ||
3455 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3456 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3457 | - (eval $ac_link) 2>&5 | ||
3458 | + (eval $ac_link) 2>conftest.er1 | ||
3459 | ac_status=$? | ||
3460 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3461 | + rm -f conftest.er1 | ||
3462 | + cat conftest.err >&5 | ||
3463 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3464 | (exit $ac_status); } && | ||
3465 | - { ac_try='test -s conftest$ac_exeext' | ||
3466 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3467 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3468 | + (eval $ac_try) 2>&5 | ||
3469 | + ac_status=$? | ||
3470 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3471 | + (exit $ac_status); }; } && | ||
3472 | + { ac_try='test -s conftest$ac_exeext' | ||
3473 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3474 | (eval $ac_try) 2>&5 | ||
3475 | ac_status=$? | ||
3476 | @@ -3803,7 +3977,8 @@ | ||
3477 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3478 | |||
3479 | fi | ||
3480 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3481 | +rm -f conftest.err conftest.$ac_objext \ | ||
3482 | + conftest$ac_exeext conftest.$ac_ext | ||
3483 | done | ||
3484 | fi | ||
3485 | LIBS=$ac_func_search_save_LIBS | ||
3486 | @@ -3823,7 +3998,6 @@ | ||
3487 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3488 | else | ||
3489 | cat >conftest.$ac_ext <<_ACEOF | ||
3490 | -#line $LINENO "configure" | ||
3491 | /* confdefs.h. */ | ||
3492 | _ACEOF | ||
3493 | cat confdefs.h >>conftest.$ac_ext | ||
3494 | @@ -3844,11 +4018,20 @@ | ||
3495 | _ACEOF | ||
3496 | rm -f conftest.$ac_objext | ||
3497 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3498 | - (eval $ac_compile) 2>&5 | ||
3499 | + (eval $ac_compile) 2>conftest.er1 | ||
3500 | ac_status=$? | ||
3501 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3502 | + rm -f conftest.er1 | ||
3503 | + cat conftest.err >&5 | ||
3504 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3505 | (exit $ac_status); } && | ||
3506 | - { ac_try='test -s conftest.$ac_objext' | ||
3507 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3508 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3509 | + (eval $ac_try) 2>&5 | ||
3510 | + ac_status=$? | ||
3511 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3512 | + (exit $ac_status); }; } && | ||
3513 | + { ac_try='test -s conftest.$ac_objext' | ||
3514 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3515 | (eval $ac_try) 2>&5 | ||
3516 | ac_status=$? | ||
3517 | @@ -3861,12 +4044,11 @@ | ||
3518 | |||
3519 | ac_cv_header_stdc=no | ||
3520 | fi | ||
3521 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3522 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3523 | |||
3524 | if test $ac_cv_header_stdc = yes; then | ||
3525 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
3526 | cat >conftest.$ac_ext <<_ACEOF | ||
3527 | -#line $LINENO "configure" | ||
3528 | /* confdefs.h. */ | ||
3529 | _ACEOF | ||
3530 | cat confdefs.h >>conftest.$ac_ext | ||
3531 | @@ -3888,7 +4070,6 @@ | ||
3532 | if test $ac_cv_header_stdc = yes; then | ||
3533 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
3534 | cat >conftest.$ac_ext <<_ACEOF | ||
3535 | -#line $LINENO "configure" | ||
3536 | /* confdefs.h. */ | ||
3537 | _ACEOF | ||
3538 | cat confdefs.h >>conftest.$ac_ext | ||
3539 | @@ -3913,7 +4094,6 @@ | ||
3540 | : | ||
3541 | else | ||
3542 | cat >conftest.$ac_ext <<_ACEOF | ||
3543 | -#line $LINENO "configure" | ||
3544 | /* confdefs.h. */ | ||
3545 | _ACEOF | ||
3546 | cat confdefs.h >>conftest.$ac_ext | ||
3547 | @@ -3925,9 +4105,9 @@ | ||
3548 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
3549 | #else | ||
3550 | # define ISLOWER(c) \ | ||
3551 | - (('a' <= (c) && (c) <= 'i') \ | ||
3552 | - || ('j' <= (c) && (c) <= 'r') \ | ||
3553 | - || ('s' <= (c) && (c) <= 'z')) | ||
3554 | + (('a' <= (c) && (c) <= 'i') \ | ||
3555 | + || ('j' <= (c) && (c) <= 'r') \ | ||
3556 | + || ('s' <= (c) && (c) <= 'z')) | ||
3557 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
3558 | #endif | ||
3559 | |||
3560 | @@ -3938,7 +4118,7 @@ | ||
3561 | int i; | ||
3562 | for (i = 0; i < 256; i++) | ||
3563 | if (XOR (islower (i), ISLOWER (i)) | ||
3564 | - || toupper (i) != TOUPPER (i)) | ||
3565 | + || toupper (i) != TOUPPER (i)) | ||
3566 | exit(2); | ||
3567 | exit (0); | ||
3568 | } | ||
3569 | @@ -3963,7 +4143,7 @@ | ||
3570 | ( exit $ac_status ) | ||
3571 | ac_cv_header_stdc=no | ||
3572 | fi | ||
3573 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
3574 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
3575 | fi | ||
3576 | fi | ||
3577 | fi | ||
3578 | @@ -3999,7 +4179,6 @@ | ||
3579 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
3580 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
3581 | cat >conftest.$ac_ext <<_ACEOF | ||
3582 | -#line $LINENO "configure" | ||
3583 | /* confdefs.h. */ | ||
3584 | _ACEOF | ||
3585 | cat confdefs.h >>conftest.$ac_ext | ||
3586 | @@ -4010,11 +4189,20 @@ | ||
3587 | _ACEOF | ||
3588 | rm -f conftest.$ac_objext | ||
3589 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3590 | - (eval $ac_compile) 2>&5 | ||
3591 | + (eval $ac_compile) 2>conftest.er1 | ||
3592 | ac_status=$? | ||
3593 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3594 | + rm -f conftest.er1 | ||
3595 | + cat conftest.err >&5 | ||
3596 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3597 | (exit $ac_status); } && | ||
3598 | - { ac_try='test -s conftest.$ac_objext' | ||
3599 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3600 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3601 | + (eval $ac_try) 2>&5 | ||
3602 | + ac_status=$? | ||
3603 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3604 | + (exit $ac_status); }; } && | ||
3605 | + { ac_try='test -s conftest.$ac_objext' | ||
3606 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3607 | (eval $ac_try) 2>&5 | ||
3608 | ac_status=$? | ||
3609 | @@ -4027,7 +4215,7 @@ | ||
3610 | |||
3611 | ac_header_compiler=no | ||
3612 | fi | ||
3613 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3614 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3615 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
3616 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
3617 | |||
3618 | @@ -4035,7 +4223,6 @@ | ||
3619 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
3620 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
3621 | cat >conftest.$ac_ext <<_ACEOF | ||
3622 | -#line $LINENO "configure" | ||
3623 | /* confdefs.h. */ | ||
3624 | _ACEOF | ||
3625 | cat confdefs.h >>conftest.$ac_ext | ||
3626 | @@ -4053,6 +4240,7 @@ | ||
3627 | (exit $ac_status); } >/dev/null; then | ||
3628 | if test -s conftest.err; then | ||
3629 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
3630 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
3631 | else | ||
3632 | ac_cpp_err= | ||
3633 | fi | ||
3634 | @@ -4072,33 +4260,32 @@ | ||
3635 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
3636 | |||
3637 | # So? What about this header? | ||
3638 | -case $ac_header_compiler:$ac_header_preproc in | ||
3639 | - yes:no ) | ||
3640 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
3641 | + yes:no: ) | ||
3642 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
3643 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
3644 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
3645 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
3646 | + ac_header_preproc=yes | ||
3647 | + ;; | ||
3648 | + no:yes:* ) | ||
3649 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
3650 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
3651 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
3652 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
3653 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
3654 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
3655 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
3656 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
3657 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
3658 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
3659 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
3660 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
3661 | ( | ||
3662 | cat <<\_ASBOX | ||
3663 | -## ------------------------------------ ## | ||
3664 | -## Report this to bug-autoconf@gnu.org. ## | ||
3665 | -## ------------------------------------ ## | ||
3666 | -_ASBOX | ||
3667 | - ) | | ||
3668 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
3669 | - ;; | ||
3670 | - no:yes ) | ||
3671 | - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
3672 | -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
3673 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
3674 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
3675 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
3676 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
3677 | - ( | ||
3678 | - cat <<\_ASBOX | ||
3679 | -## ------------------------------------ ## | ||
3680 | -## Report this to bug-autoconf@gnu.org. ## | ||
3681 | -## ------------------------------------ ## | ||
3682 | +## -------------------------------- ## | ||
3683 | +## Report this to bug-patch@gnu.org ## | ||
3684 | +## -------------------------------- ## | ||
3685 | _ASBOX | ||
3686 | ) | | ||
3687 | sed "s/^/$as_me: WARNING: /" >&2 | ||
3688 | @@ -4109,7 +4296,7 @@ | ||
3689 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
3690 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3691 | else | ||
3692 | - eval "$as_ac_Header=$ac_header_preproc" | ||
3693 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
3694 | fi | ||
3695 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
3696 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
3697 | @@ -4131,7 +4318,6 @@ | ||
3698 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3699 | else | ||
3700 | cat >conftest.$ac_ext <<_ACEOF | ||
3701 | -#line $LINENO "configure" | ||
3702 | /* confdefs.h. */ | ||
3703 | _ACEOF | ||
3704 | cat confdefs.h >>conftest.$ac_ext | ||
3705 | @@ -4151,11 +4337,20 @@ | ||
3706 | _ACEOF | ||
3707 | rm -f conftest.$ac_objext | ||
3708 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3709 | - (eval $ac_compile) 2>&5 | ||
3710 | + (eval $ac_compile) 2>conftest.er1 | ||
3711 | ac_status=$? | ||
3712 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3713 | + rm -f conftest.er1 | ||
3714 | + cat conftest.err >&5 | ||
3715 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3716 | (exit $ac_status); } && | ||
3717 | - { ac_try='test -s conftest.$ac_objext' | ||
3718 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3719 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3720 | + (eval $ac_try) 2>&5 | ||
3721 | + ac_status=$? | ||
3722 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3723 | + (exit $ac_status); }; } && | ||
3724 | + { ac_try='test -s conftest.$ac_objext' | ||
3725 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3726 | (eval $ac_try) 2>&5 | ||
3727 | ac_status=$? | ||
3728 | @@ -4168,7 +4363,7 @@ | ||
3729 | |||
3730 | ac_cv_type_mode_t=no | ||
3731 | fi | ||
3732 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3733 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3734 | fi | ||
3735 | echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 | ||
3736 | echo "${ECHO_T}$ac_cv_type_mode_t" >&6 | ||
3737 | @@ -4188,7 +4383,6 @@ | ||
3738 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3739 | else | ||
3740 | cat >conftest.$ac_ext <<_ACEOF | ||
3741 | -#line $LINENO "configure" | ||
3742 | /* confdefs.h. */ | ||
3743 | _ACEOF | ||
3744 | cat confdefs.h >>conftest.$ac_ext | ||
3745 | @@ -4208,11 +4402,20 @@ | ||
3746 | _ACEOF | ||
3747 | rm -f conftest.$ac_objext | ||
3748 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3749 | - (eval $ac_compile) 2>&5 | ||
3750 | + (eval $ac_compile) 2>conftest.er1 | ||
3751 | ac_status=$? | ||
3752 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3753 | + rm -f conftest.er1 | ||
3754 | + cat conftest.err >&5 | ||
3755 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3756 | (exit $ac_status); } && | ||
3757 | - { ac_try='test -s conftest.$ac_objext' | ||
3758 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3759 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3760 | + (eval $ac_try) 2>&5 | ||
3761 | + ac_status=$? | ||
3762 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3763 | + (exit $ac_status); }; } && | ||
3764 | + { ac_try='test -s conftest.$ac_objext' | ||
3765 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3766 | (eval $ac_try) 2>&5 | ||
3767 | ac_status=$? | ||
3768 | @@ -4225,7 +4428,7 @@ | ||
3769 | |||
3770 | ac_cv_type_off_t=no | ||
3771 | fi | ||
3772 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3773 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3774 | fi | ||
3775 | echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 | ||
3776 | echo "${ECHO_T}$ac_cv_type_off_t" >&6 | ||
3777 | @@ -4245,7 +4448,6 @@ | ||
3778 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3779 | else | ||
3780 | cat >conftest.$ac_ext <<_ACEOF | ||
3781 | -#line $LINENO "configure" | ||
3782 | /* confdefs.h. */ | ||
3783 | _ACEOF | ||
3784 | cat confdefs.h >>conftest.$ac_ext | ||
3785 | @@ -4265,11 +4467,20 @@ | ||
3786 | _ACEOF | ||
3787 | rm -f conftest.$ac_objext | ||
3788 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3789 | - (eval $ac_compile) 2>&5 | ||
3790 | + (eval $ac_compile) 2>conftest.er1 | ||
3791 | ac_status=$? | ||
3792 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3793 | + rm -f conftest.er1 | ||
3794 | + cat conftest.err >&5 | ||
3795 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3796 | (exit $ac_status); } && | ||
3797 | - { ac_try='test -s conftest.$ac_objext' | ||
3798 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3799 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3800 | + (eval $ac_try) 2>&5 | ||
3801 | + ac_status=$? | ||
3802 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3803 | + (exit $ac_status); }; } && | ||
3804 | + { ac_try='test -s conftest.$ac_objext' | ||
3805 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3806 | (eval $ac_try) 2>&5 | ||
3807 | ac_status=$? | ||
3808 | @@ -4282,7 +4493,7 @@ | ||
3809 | |||
3810 | ac_cv_type_pid_t=no | ||
3811 | fi | ||
3812 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3813 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3814 | fi | ||
3815 | echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 | ||
3816 | echo "${ECHO_T}$ac_cv_type_pid_t" >&6 | ||
3817 | @@ -4302,7 +4513,6 @@ | ||
3818 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3819 | else | ||
3820 | cat >conftest.$ac_ext <<_ACEOF | ||
3821 | -#line $LINENO "configure" | ||
3822 | /* confdefs.h. */ | ||
3823 | _ACEOF | ||
3824 | cat confdefs.h >>conftest.$ac_ext | ||
3825 | @@ -4329,11 +4539,20 @@ | ||
3826 | _ACEOF | ||
3827 | rm -f conftest.$ac_objext | ||
3828 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3829 | - (eval $ac_compile) 2>&5 | ||
3830 | + (eval $ac_compile) 2>conftest.er1 | ||
3831 | ac_status=$? | ||
3832 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3833 | + rm -f conftest.er1 | ||
3834 | + cat conftest.err >&5 | ||
3835 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3836 | (exit $ac_status); } && | ||
3837 | - { ac_try='test -s conftest.$ac_objext' | ||
3838 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3839 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3840 | + (eval $ac_try) 2>&5 | ||
3841 | + ac_status=$? | ||
3842 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3843 | + (exit $ac_status); }; } && | ||
3844 | + { ac_try='test -s conftest.$ac_objext' | ||
3845 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3846 | (eval $ac_try) 2>&5 | ||
3847 | ac_status=$? | ||
3848 | @@ -4346,7 +4565,7 @@ | ||
3849 | |||
3850 | ac_cv_type_signal=int | ||
3851 | fi | ||
3852 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3853 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3854 | fi | ||
3855 | echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 | ||
3856 | echo "${ECHO_T}$ac_cv_type_signal" >&6 | ||
3857 | @@ -4362,7 +4581,6 @@ | ||
3858 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3859 | else | ||
3860 | cat >conftest.$ac_ext <<_ACEOF | ||
3861 | -#line $LINENO "configure" | ||
3862 | /* confdefs.h. */ | ||
3863 | _ACEOF | ||
3864 | cat confdefs.h >>conftest.$ac_ext | ||
3865 | @@ -4382,11 +4600,20 @@ | ||
3866 | _ACEOF | ||
3867 | rm -f conftest.$ac_objext | ||
3868 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3869 | - (eval $ac_compile) 2>&5 | ||
3870 | + (eval $ac_compile) 2>conftest.er1 | ||
3871 | ac_status=$? | ||
3872 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3873 | + rm -f conftest.er1 | ||
3874 | + cat conftest.err >&5 | ||
3875 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3876 | (exit $ac_status); } && | ||
3877 | - { ac_try='test -s conftest.$ac_objext' | ||
3878 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3879 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3880 | + (eval $ac_try) 2>&5 | ||
3881 | + ac_status=$? | ||
3882 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3883 | + (exit $ac_status); }; } && | ||
3884 | + { ac_try='test -s conftest.$ac_objext' | ||
3885 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3886 | (eval $ac_try) 2>&5 | ||
3887 | ac_status=$? | ||
3888 | @@ -4399,7 +4626,7 @@ | ||
3889 | |||
3890 | ac_cv_type_size_t=no | ||
3891 | fi | ||
3892 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3893 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3894 | fi | ||
3895 | echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 | ||
3896 | echo "${ECHO_T}$ac_cv_type_size_t" >&6 | ||
3897 | @@ -4419,7 +4646,6 @@ | ||
3898 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3899 | else | ||
3900 | cat >conftest.$ac_ext <<_ACEOF | ||
3901 | -#line $LINENO "configure" | ||
3902 | /* confdefs.h. */ | ||
3903 | _ACEOF | ||
3904 | cat confdefs.h >>conftest.$ac_ext | ||
3905 | @@ -4468,11 +4694,20 @@ | ||
3906 | _ACEOF | ||
3907 | rm -f conftest.$ac_objext | ||
3908 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3909 | - (eval $ac_compile) 2>&5 | ||
3910 | + (eval $ac_compile) 2>conftest.er1 | ||
3911 | ac_status=$? | ||
3912 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3913 | + rm -f conftest.er1 | ||
3914 | + cat conftest.err >&5 | ||
3915 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3916 | (exit $ac_status); } && | ||
3917 | - { ac_try='test -s conftest.$ac_objext' | ||
3918 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3919 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3920 | + (eval $ac_try) 2>&5 | ||
3921 | + ac_status=$? | ||
3922 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3923 | + (exit $ac_status); }; } && | ||
3924 | + { ac_try='test -s conftest.$ac_objext' | ||
3925 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3926 | (eval $ac_try) 2>&5 | ||
3927 | ac_status=$? | ||
3928 | @@ -4485,7 +4720,7 @@ | ||
3929 | |||
3930 | ac_cv_header_stdbool_h=no | ||
3931 | fi | ||
3932 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3933 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3934 | fi | ||
3935 | echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 | ||
3936 | echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 | ||
3937 | @@ -4495,7 +4730,6 @@ | ||
3938 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3939 | else | ||
3940 | cat >conftest.$ac_ext <<_ACEOF | ||
3941 | -#line $LINENO "configure" | ||
3942 | /* confdefs.h. */ | ||
3943 | _ACEOF | ||
3944 | cat confdefs.h >>conftest.$ac_ext | ||
3945 | @@ -4515,11 +4749,20 @@ | ||
3946 | _ACEOF | ||
3947 | rm -f conftest.$ac_objext | ||
3948 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3949 | - (eval $ac_compile) 2>&5 | ||
3950 | + (eval $ac_compile) 2>conftest.er1 | ||
3951 | ac_status=$? | ||
3952 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3953 | + rm -f conftest.er1 | ||
3954 | + cat conftest.err >&5 | ||
3955 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3956 | (exit $ac_status); } && | ||
3957 | - { ac_try='test -s conftest.$ac_objext' | ||
3958 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3959 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3960 | + (eval $ac_try) 2>&5 | ||
3961 | + ac_status=$? | ||
3962 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3963 | + (exit $ac_status); }; } && | ||
3964 | + { ac_try='test -s conftest.$ac_objext' | ||
3965 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3966 | (eval $ac_try) 2>&5 | ||
3967 | ac_status=$? | ||
3968 | @@ -4532,7 +4775,7 @@ | ||
3969 | |||
3970 | ac_cv_type__Bool=no | ||
3971 | fi | ||
3972 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3973 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3974 | fi | ||
3975 | echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 | ||
3976 | echo "${ECHO_T}$ac_cv_type__Bool" >&6 | ||
3977 | @@ -4589,7 +4832,6 @@ | ||
3978 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
3979 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
3980 | cat >conftest.$ac_ext <<_ACEOF | ||
3981 | -#line $LINENO "configure" | ||
3982 | /* confdefs.h. */ | ||
3983 | _ACEOF | ||
3984 | cat confdefs.h >>conftest.$ac_ext | ||
3985 | @@ -4600,11 +4842,20 @@ | ||
3986 | _ACEOF | ||
3987 | rm -f conftest.$ac_objext | ||
3988 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3989 | - (eval $ac_compile) 2>&5 | ||
3990 | + (eval $ac_compile) 2>conftest.er1 | ||
3991 | ac_status=$? | ||
3992 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3993 | + rm -f conftest.er1 | ||
3994 | + cat conftest.err >&5 | ||
3995 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3996 | (exit $ac_status); } && | ||
3997 | - { ac_try='test -s conftest.$ac_objext' | ||
3998 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3999 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4000 | + (eval $ac_try) 2>&5 | ||
4001 | + ac_status=$? | ||
4002 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4003 | + (exit $ac_status); }; } && | ||
4004 | + { ac_try='test -s conftest.$ac_objext' | ||
4005 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4006 | (eval $ac_try) 2>&5 | ||
4007 | ac_status=$? | ||
4008 | @@ -4617,7 +4868,7 @@ | ||
4009 | |||
4010 | ac_header_compiler=no | ||
4011 | fi | ||
4012 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4013 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4014 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4015 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4016 | |||
4017 | @@ -4625,7 +4876,6 @@ | ||
4018 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4019 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4020 | cat >conftest.$ac_ext <<_ACEOF | ||
4021 | -#line $LINENO "configure" | ||
4022 | /* confdefs.h. */ | ||
4023 | _ACEOF | ||
4024 | cat confdefs.h >>conftest.$ac_ext | ||
4025 | @@ -4643,6 +4893,7 @@ | ||
4026 | (exit $ac_status); } >/dev/null; then | ||
4027 | if test -s conftest.err; then | ||
4028 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4029 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4030 | else | ||
4031 | ac_cpp_err= | ||
4032 | fi | ||
4033 | @@ -4662,33 +4913,32 @@ | ||
4034 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4035 | |||
4036 | # So? What about this header? | ||
4037 | -case $ac_header_compiler:$ac_header_preproc in | ||
4038 | - yes:no ) | ||
4039 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4040 | + yes:no: ) | ||
4041 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4042 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4043 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4044 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4045 | - ( | ||
4046 | - cat <<\_ASBOX | ||
4047 | -## ------------------------------------ ## | ||
4048 | -## Report this to bug-autoconf@gnu.org. ## | ||
4049 | -## ------------------------------------ ## | ||
4050 | -_ASBOX | ||
4051 | - ) | | ||
4052 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4053 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4054 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4055 | + ac_header_preproc=yes | ||
4056 | ;; | ||
4057 | - no:yes ) | ||
4058 | + no:yes:* ) | ||
4059 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4060 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4061 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4062 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4063 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4064 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4065 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
4066 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4067 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4068 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4069 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4070 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4071 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4072 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4073 | ( | ||
4074 | cat <<\_ASBOX | ||
4075 | -## ------------------------------------ ## | ||
4076 | -## Report this to bug-autoconf@gnu.org. ## | ||
4077 | -## ------------------------------------ ## | ||
4078 | +## -------------------------------- ## | ||
4079 | +## Report this to bug-patch@gnu.org ## | ||
4080 | +## -------------------------------- ## | ||
4081 | _ASBOX | ||
4082 | ) | | ||
4083 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4084 | @@ -4699,7 +4949,7 @@ | ||
4085 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4086 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4087 | else | ||
4088 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4089 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4090 | fi | ||
4091 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4092 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4093 | @@ -4733,7 +4983,6 @@ | ||
4094 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4095 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4096 | cat >conftest.$ac_ext <<_ACEOF | ||
4097 | -#line $LINENO "configure" | ||
4098 | /* confdefs.h. */ | ||
4099 | _ACEOF | ||
4100 | cat confdefs.h >>conftest.$ac_ext | ||
4101 | @@ -4744,11 +4993,20 @@ | ||
4102 | _ACEOF | ||
4103 | rm -f conftest.$ac_objext | ||
4104 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4105 | - (eval $ac_compile) 2>&5 | ||
4106 | + (eval $ac_compile) 2>conftest.er1 | ||
4107 | ac_status=$? | ||
4108 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4109 | + rm -f conftest.er1 | ||
4110 | + cat conftest.err >&5 | ||
4111 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4112 | (exit $ac_status); } && | ||
4113 | - { ac_try='test -s conftest.$ac_objext' | ||
4114 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4115 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4116 | + (eval $ac_try) 2>&5 | ||
4117 | + ac_status=$? | ||
4118 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4119 | + (exit $ac_status); }; } && | ||
4120 | + { ac_try='test -s conftest.$ac_objext' | ||
4121 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4122 | (eval $ac_try) 2>&5 | ||
4123 | ac_status=$? | ||
4124 | @@ -4761,7 +5019,7 @@ | ||
4125 | |||
4126 | ac_header_compiler=no | ||
4127 | fi | ||
4128 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4129 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4130 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4131 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4132 | |||
4133 | @@ -4769,7 +5027,6 @@ | ||
4134 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4135 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4136 | cat >conftest.$ac_ext <<_ACEOF | ||
4137 | -#line $LINENO "configure" | ||
4138 | /* confdefs.h. */ | ||
4139 | _ACEOF | ||
4140 | cat confdefs.h >>conftest.$ac_ext | ||
4141 | @@ -4787,6 +5044,7 @@ | ||
4142 | (exit $ac_status); } >/dev/null; then | ||
4143 | if test -s conftest.err; then | ||
4144 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4145 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4146 | else | ||
4147 | ac_cpp_err= | ||
4148 | fi | ||
4149 | @@ -4806,33 +5064,32 @@ | ||
4150 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4151 | |||
4152 | # So? What about this header? | ||
4153 | -case $ac_header_compiler:$ac_header_preproc in | ||
4154 | - yes:no ) | ||
4155 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4156 | + yes:no: ) | ||
4157 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4158 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4159 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4160 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4161 | - ( | ||
4162 | - cat <<\_ASBOX | ||
4163 | -## ------------------------------------ ## | ||
4164 | -## Report this to bug-autoconf@gnu.org. ## | ||
4165 | -## ------------------------------------ ## | ||
4166 | -_ASBOX | ||
4167 | - ) | | ||
4168 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4169 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4170 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4171 | + ac_header_preproc=yes | ||
4172 | ;; | ||
4173 | - no:yes ) | ||
4174 | + no:yes:* ) | ||
4175 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4176 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4177 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4178 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4179 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4180 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4181 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
4182 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4183 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4184 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4185 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4186 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4187 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4188 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4189 | ( | ||
4190 | cat <<\_ASBOX | ||
4191 | -## ------------------------------------ ## | ||
4192 | -## Report this to bug-autoconf@gnu.org. ## | ||
4193 | -## ------------------------------------ ## | ||
4194 | +## -------------------------------- ## | ||
4195 | +## Report this to bug-patch@gnu.org ## | ||
4196 | +## -------------------------------- ## | ||
4197 | _ASBOX | ||
4198 | ) | | ||
4199 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4200 | @@ -4843,7 +5100,7 @@ | ||
4201 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4202 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4203 | else | ||
4204 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4205 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4206 | fi | ||
4207 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4208 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4209 | @@ -4865,7 +5122,6 @@ | ||
4210 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4211 | else | ||
4212 | cat >conftest.$ac_ext <<_ACEOF | ||
4213 | -#line $LINENO "configure" | ||
4214 | /* confdefs.h. */ | ||
4215 | _ACEOF | ||
4216 | cat confdefs.h >>conftest.$ac_ext | ||
4217 | @@ -4886,11 +5142,20 @@ | ||
4218 | _ACEOF | ||
4219 | rm -f conftest.$ac_objext | ||
4220 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4221 | - (eval $ac_compile) 2>&5 | ||
4222 | + (eval $ac_compile) 2>conftest.er1 | ||
4223 | ac_status=$? | ||
4224 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4225 | + rm -f conftest.er1 | ||
4226 | + cat conftest.err >&5 | ||
4227 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4228 | (exit $ac_status); } && | ||
4229 | - { ac_try='test -s conftest.$ac_objext' | ||
4230 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4231 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4232 | + (eval $ac_try) 2>&5 | ||
4233 | + ac_status=$? | ||
4234 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4235 | + (exit $ac_status); }; } && | ||
4236 | + { ac_try='test -s conftest.$ac_objext' | ||
4237 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4238 | (eval $ac_try) 2>&5 | ||
4239 | ac_status=$? | ||
4240 | @@ -4903,7 +5168,7 @@ | ||
4241 | |||
4242 | ac_cv_header_time=no | ||
4243 | fi | ||
4244 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4245 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4246 | fi | ||
4247 | echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 | ||
4248 | echo "${ECHO_T}$ac_cv_header_time" >&6 | ||
4249 | @@ -4933,7 +5198,6 @@ | ||
4250 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4251 | else | ||
4252 | cat >conftest.$ac_ext <<_ACEOF | ||
4253 | -#line $LINENO "configure" | ||
4254 | /* confdefs.h. */ | ||
4255 | _ACEOF | ||
4256 | cat confdefs.h >>conftest.$ac_ext | ||
4257 | @@ -4964,11 +5228,20 @@ | ||
4258 | _ACEOF | ||
4259 | rm -f conftest.$ac_objext | ||
4260 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4261 | - (eval $ac_compile) 2>&5 | ||
4262 | + (eval $ac_compile) 2>conftest.er1 | ||
4263 | ac_status=$? | ||
4264 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4265 | + rm -f conftest.er1 | ||
4266 | + cat conftest.err >&5 | ||
4267 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4268 | (exit $ac_status); } && | ||
4269 | - { ac_try='test -s conftest.$ac_objext' | ||
4270 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4271 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4272 | + (eval $ac_try) 2>&5 | ||
4273 | + ac_status=$? | ||
4274 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4275 | + (exit $ac_status); }; } && | ||
4276 | + { ac_try='test -s conftest.$ac_objext' | ||
4277 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4278 | (eval $ac_try) 2>&5 | ||
4279 | ac_status=$? | ||
4280 | @@ -4981,7 +5254,7 @@ | ||
4281 | |||
4282 | fu_cv_sys_struct_utimbuf=no | ||
4283 | fi | ||
4284 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4285 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4286 | |||
4287 | fi | ||
4288 | echo "$as_me:$LINENO: result: $fu_cv_sys_struct_utimbuf" >&5 | ||
4289 | @@ -5005,7 +5278,6 @@ | ||
4290 | ac_cv_func_closedir_void=yes | ||
4291 | else | ||
4292 | cat >conftest.$ac_ext <<_ACEOF | ||
4293 | -#line $LINENO "configure" | ||
4294 | /* confdefs.h. */ | ||
4295 | _ACEOF | ||
4296 | cat confdefs.h >>conftest.$ac_ext | ||
4297 | @@ -5045,7 +5317,7 @@ | ||
4298 | ( exit $ac_status ) | ||
4299 | ac_cv_func_closedir_void=yes | ||
4300 | fi | ||
4301 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4302 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4303 | fi | ||
4304 | fi | ||
4305 | echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 | ||
4306 | @@ -5076,7 +5348,6 @@ | ||
4307 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4308 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4309 | cat >conftest.$ac_ext <<_ACEOF | ||
4310 | -#line $LINENO "configure" | ||
4311 | /* confdefs.h. */ | ||
4312 | _ACEOF | ||
4313 | cat confdefs.h >>conftest.$ac_ext | ||
4314 | @@ -5087,11 +5358,20 @@ | ||
4315 | _ACEOF | ||
4316 | rm -f conftest.$ac_objext | ||
4317 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4318 | - (eval $ac_compile) 2>&5 | ||
4319 | + (eval $ac_compile) 2>conftest.er1 | ||
4320 | ac_status=$? | ||
4321 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4322 | + rm -f conftest.er1 | ||
4323 | + cat conftest.err >&5 | ||
4324 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4325 | (exit $ac_status); } && | ||
4326 | - { ac_try='test -s conftest.$ac_objext' | ||
4327 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4328 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4329 | + (eval $ac_try) 2>&5 | ||
4330 | + ac_status=$? | ||
4331 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4332 | + (exit $ac_status); }; } && | ||
4333 | + { ac_try='test -s conftest.$ac_objext' | ||
4334 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4335 | (eval $ac_try) 2>&5 | ||
4336 | ac_status=$? | ||
4337 | @@ -5104,7 +5384,7 @@ | ||
4338 | |||
4339 | ac_header_compiler=no | ||
4340 | fi | ||
4341 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4342 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4343 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4344 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4345 | |||
4346 | @@ -5112,7 +5392,6 @@ | ||
4347 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4348 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4349 | cat >conftest.$ac_ext <<_ACEOF | ||
4350 | -#line $LINENO "configure" | ||
4351 | /* confdefs.h. */ | ||
4352 | _ACEOF | ||
4353 | cat confdefs.h >>conftest.$ac_ext | ||
4354 | @@ -5130,6 +5409,7 @@ | ||
4355 | (exit $ac_status); } >/dev/null; then | ||
4356 | if test -s conftest.err; then | ||
4357 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4358 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4359 | else | ||
4360 | ac_cpp_err= | ||
4361 | fi | ||
4362 | @@ -5149,33 +5429,32 @@ | ||
4363 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4364 | |||
4365 | # So? What about this header? | ||
4366 | -case $ac_header_compiler:$ac_header_preproc in | ||
4367 | - yes:no ) | ||
4368 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4369 | + yes:no: ) | ||
4370 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4371 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4372 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4373 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4374 | - ( | ||
4375 | - cat <<\_ASBOX | ||
4376 | -## ------------------------------------ ## | ||
4377 | -## Report this to bug-autoconf@gnu.org. ## | ||
4378 | -## ------------------------------------ ## | ||
4379 | -_ASBOX | ||
4380 | - ) | | ||
4381 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4382 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4383 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4384 | + ac_header_preproc=yes | ||
4385 | ;; | ||
4386 | - no:yes ) | ||
4387 | + no:yes:* ) | ||
4388 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4389 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4390 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4391 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4392 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4393 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4394 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
4395 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4396 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4397 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4398 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4399 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4400 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4401 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4402 | ( | ||
4403 | cat <<\_ASBOX | ||
4404 | -## ------------------------------------ ## | ||
4405 | -## Report this to bug-autoconf@gnu.org. ## | ||
4406 | -## ------------------------------------ ## | ||
4407 | +## -------------------------------- ## | ||
4408 | +## Report this to bug-patch@gnu.org ## | ||
4409 | +## -------------------------------- ## | ||
4410 | _ASBOX | ||
4411 | ) | | ||
4412 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4413 | @@ -5186,7 +5465,7 @@ | ||
4414 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4415 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4416 | else | ||
4417 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4418 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4419 | fi | ||
4420 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4421 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4422 | @@ -5220,7 +5499,6 @@ | ||
4423 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4424 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4425 | cat >conftest.$ac_ext <<_ACEOF | ||
4426 | -#line $LINENO "configure" | ||
4427 | /* confdefs.h. */ | ||
4428 | _ACEOF | ||
4429 | cat confdefs.h >>conftest.$ac_ext | ||
4430 | @@ -5231,11 +5509,20 @@ | ||
4431 | _ACEOF | ||
4432 | rm -f conftest.$ac_objext | ||
4433 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4434 | - (eval $ac_compile) 2>&5 | ||
4435 | + (eval $ac_compile) 2>conftest.er1 | ||
4436 | ac_status=$? | ||
4437 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4438 | + rm -f conftest.er1 | ||
4439 | + cat conftest.err >&5 | ||
4440 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4441 | (exit $ac_status); } && | ||
4442 | - { ac_try='test -s conftest.$ac_objext' | ||
4443 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4444 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4445 | + (eval $ac_try) 2>&5 | ||
4446 | + ac_status=$? | ||
4447 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4448 | + (exit $ac_status); }; } && | ||
4449 | + { ac_try='test -s conftest.$ac_objext' | ||
4450 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4451 | (eval $ac_try) 2>&5 | ||
4452 | ac_status=$? | ||
4453 | @@ -5248,7 +5535,7 @@ | ||
4454 | |||
4455 | ac_header_compiler=no | ||
4456 | fi | ||
4457 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4458 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4459 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4460 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4461 | |||
4462 | @@ -5256,7 +5543,6 @@ | ||
4463 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4464 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4465 | cat >conftest.$ac_ext <<_ACEOF | ||
4466 | -#line $LINENO "configure" | ||
4467 | /* confdefs.h. */ | ||
4468 | _ACEOF | ||
4469 | cat confdefs.h >>conftest.$ac_ext | ||
4470 | @@ -5274,6 +5560,7 @@ | ||
4471 | (exit $ac_status); } >/dev/null; then | ||
4472 | if test -s conftest.err; then | ||
4473 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4474 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4475 | else | ||
4476 | ac_cpp_err= | ||
4477 | fi | ||
4478 | @@ -5293,33 +5580,32 @@ | ||
4479 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4480 | |||
4481 | # So? What about this header? | ||
4482 | -case $ac_header_compiler:$ac_header_preproc in | ||
4483 | - yes:no ) | ||
4484 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4485 | + yes:no: ) | ||
4486 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4487 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4488 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4489 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4490 | - ( | ||
4491 | - cat <<\_ASBOX | ||
4492 | -## ------------------------------------ ## | ||
4493 | -## Report this to bug-autoconf@gnu.org. ## | ||
4494 | -## ------------------------------------ ## | ||
4495 | -_ASBOX | ||
4496 | - ) | | ||
4497 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4498 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4499 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4500 | + ac_header_preproc=yes | ||
4501 | ;; | ||
4502 | - no:yes ) | ||
4503 | + no:yes:* ) | ||
4504 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4505 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4506 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4507 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4508 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4509 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4510 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
4511 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4512 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4513 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4514 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4515 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4516 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4517 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4518 | ( | ||
4519 | cat <<\_ASBOX | ||
4520 | -## ------------------------------------ ## | ||
4521 | -## Report this to bug-autoconf@gnu.org. ## | ||
4522 | -## ------------------------------------ ## | ||
4523 | +## -------------------------------- ## | ||
4524 | +## Report this to bug-patch@gnu.org ## | ||
4525 | +## -------------------------------- ## | ||
4526 | _ASBOX | ||
4527 | ) | | ||
4528 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4529 | @@ -5330,7 +5616,7 @@ | ||
4530 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4531 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4532 | else | ||
4533 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4534 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4535 | fi | ||
4536 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4537 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4538 | @@ -5364,7 +5650,6 @@ | ||
4539 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4540 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4541 | cat >conftest.$ac_ext <<_ACEOF | ||
4542 | -#line $LINENO "configure" | ||
4543 | /* confdefs.h. */ | ||
4544 | _ACEOF | ||
4545 | cat confdefs.h >>conftest.$ac_ext | ||
4546 | @@ -5375,11 +5660,20 @@ | ||
4547 | _ACEOF | ||
4548 | rm -f conftest.$ac_objext | ||
4549 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4550 | - (eval $ac_compile) 2>&5 | ||
4551 | + (eval $ac_compile) 2>conftest.er1 | ||
4552 | ac_status=$? | ||
4553 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4554 | + rm -f conftest.er1 | ||
4555 | + cat conftest.err >&5 | ||
4556 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4557 | (exit $ac_status); } && | ||
4558 | - { ac_try='test -s conftest.$ac_objext' | ||
4559 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4560 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4561 | + (eval $ac_try) 2>&5 | ||
4562 | + ac_status=$? | ||
4563 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4564 | + (exit $ac_status); }; } && | ||
4565 | + { ac_try='test -s conftest.$ac_objext' | ||
4566 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4567 | (eval $ac_try) 2>&5 | ||
4568 | ac_status=$? | ||
4569 | @@ -5392,7 +5686,7 @@ | ||
4570 | |||
4571 | ac_header_compiler=no | ||
4572 | fi | ||
4573 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4574 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4575 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4576 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4577 | |||
4578 | @@ -5400,7 +5694,6 @@ | ||
4579 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4580 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4581 | cat >conftest.$ac_ext <<_ACEOF | ||
4582 | -#line $LINENO "configure" | ||
4583 | /* confdefs.h. */ | ||
4584 | _ACEOF | ||
4585 | cat confdefs.h >>conftest.$ac_ext | ||
4586 | @@ -5418,6 +5711,7 @@ | ||
4587 | (exit $ac_status); } >/dev/null; then | ||
4588 | if test -s conftest.err; then | ||
4589 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4590 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4591 | else | ||
4592 | ac_cpp_err= | ||
4593 | fi | ||
4594 | @@ -5437,33 +5731,32 @@ | ||
4595 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4596 | |||
4597 | # So? What about this header? | ||
4598 | -case $ac_header_compiler:$ac_header_preproc in | ||
4599 | - yes:no ) | ||
4600 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4601 | + yes:no: ) | ||
4602 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4603 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4604 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4605 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4606 | - ( | ||
4607 | - cat <<\_ASBOX | ||
4608 | -## ------------------------------------ ## | ||
4609 | -## Report this to bug-autoconf@gnu.org. ## | ||
4610 | -## ------------------------------------ ## | ||
4611 | -_ASBOX | ||
4612 | - ) | | ||
4613 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4614 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4615 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4616 | + ac_header_preproc=yes | ||
4617 | ;; | ||
4618 | - no:yes ) | ||
4619 | + no:yes:* ) | ||
4620 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4621 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4622 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4623 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4624 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4625 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4626 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
4627 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4628 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4629 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4630 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4631 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4632 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4633 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4634 | ( | ||
4635 | cat <<\_ASBOX | ||
4636 | -## ------------------------------------ ## | ||
4637 | -## Report this to bug-autoconf@gnu.org. ## | ||
4638 | -## ------------------------------------ ## | ||
4639 | +## -------------------------------- ## | ||
4640 | +## Report this to bug-patch@gnu.org ## | ||
4641 | +## -------------------------------- ## | ||
4642 | _ASBOX | ||
4643 | ) | | ||
4644 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4645 | @@ -5474,7 +5767,7 @@ | ||
4646 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4647 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4648 | else | ||
4649 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4650 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4651 | fi | ||
4652 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4653 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4654 | @@ -5497,7 +5790,6 @@ | ||
4655 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4656 | else | ||
4657 | cat >conftest.$ac_ext <<_ACEOF | ||
4658 | -#line $LINENO "configure" | ||
4659 | /* confdefs.h. */ | ||
4660 | _ACEOF | ||
4661 | cat confdefs.h >>conftest.$ac_ext | ||
4662 | @@ -5517,11 +5809,20 @@ | ||
4663 | _ACEOF | ||
4664 | rm -f conftest.$ac_objext | ||
4665 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4666 | - (eval $ac_compile) 2>&5 | ||
4667 | + (eval $ac_compile) 2>conftest.er1 | ||
4668 | ac_status=$? | ||
4669 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4670 | + rm -f conftest.er1 | ||
4671 | + cat conftest.err >&5 | ||
4672 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4673 | (exit $ac_status); } && | ||
4674 | - { ac_try='test -s conftest.$ac_objext' | ||
4675 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4676 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4677 | + (eval $ac_try) 2>&5 | ||
4678 | + ac_status=$? | ||
4679 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4680 | + (exit $ac_status); }; } && | ||
4681 | + { ac_try='test -s conftest.$ac_objext' | ||
4682 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4683 | (eval $ac_try) 2>&5 | ||
4684 | ac_status=$? | ||
4685 | @@ -5534,7 +5835,7 @@ | ||
4686 | |||
4687 | ac_cv_have_decl_getenv=no | ||
4688 | fi | ||
4689 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4690 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4691 | fi | ||
4692 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5 | ||
4693 | echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6 | ||
4694 | @@ -5562,7 +5863,6 @@ | ||
4695 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4696 | else | ||
4697 | cat >conftest.$ac_ext <<_ACEOF | ||
4698 | -#line $LINENO "configure" | ||
4699 | /* confdefs.h. */ | ||
4700 | _ACEOF | ||
4701 | cat confdefs.h >>conftest.$ac_ext | ||
4702 | @@ -5582,11 +5882,20 @@ | ||
4703 | _ACEOF | ||
4704 | rm -f conftest.$ac_objext | ||
4705 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4706 | - (eval $ac_compile) 2>&5 | ||
4707 | + (eval $ac_compile) 2>conftest.er1 | ||
4708 | ac_status=$? | ||
4709 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4710 | + rm -f conftest.er1 | ||
4711 | + cat conftest.err >&5 | ||
4712 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4713 | (exit $ac_status); } && | ||
4714 | - { ac_try='test -s conftest.$ac_objext' | ||
4715 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4716 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4717 | + (eval $ac_try) 2>&5 | ||
4718 | + ac_status=$? | ||
4719 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4720 | + (exit $ac_status); }; } && | ||
4721 | + { ac_try='test -s conftest.$ac_objext' | ||
4722 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4723 | (eval $ac_try) 2>&5 | ||
4724 | ac_status=$? | ||
4725 | @@ -5599,7 +5908,7 @@ | ||
4726 | |||
4727 | ac_cv_have_decl_malloc=no | ||
4728 | fi | ||
4729 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4730 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4731 | fi | ||
4732 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_malloc" >&5 | ||
4733 | echo "${ECHO_T}$ac_cv_have_decl_malloc" >&6 | ||
4734 | @@ -5628,7 +5937,6 @@ | ||
4735 | else | ||
4736 | |||
4737 | cat >conftest.$ac_ext <<_ACEOF | ||
4738 | -#line $LINENO "configure" | ||
4739 | /* confdefs.h. */ | ||
4740 | _ACEOF | ||
4741 | cat confdefs.h >>conftest.$ac_ext | ||
4742 | @@ -5647,11 +5955,20 @@ | ||
4743 | _ACEOF | ||
4744 | rm -f conftest.$ac_objext | ||
4745 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4746 | - (eval $ac_compile) 2>&5 | ||
4747 | + (eval $ac_compile) 2>conftest.er1 | ||
4748 | ac_status=$? | ||
4749 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4750 | + rm -f conftest.er1 | ||
4751 | + cat conftest.err >&5 | ||
4752 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4753 | (exit $ac_status); } && | ||
4754 | - { ac_try='test -s conftest.$ac_objext' | ||
4755 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4756 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4757 | + (eval $ac_try) 2>&5 | ||
4758 | + ac_status=$? | ||
4759 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4760 | + (exit $ac_status); }; } && | ||
4761 | + { ac_try='test -s conftest.$ac_objext' | ||
4762 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4763 | (eval $ac_try) 2>&5 | ||
4764 | ac_status=$? | ||
4765 | @@ -5664,7 +5981,7 @@ | ||
4766 | |||
4767 | ac_cv_win_or_dos=no | ||
4768 | fi | ||
4769 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4770 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4771 | |||
4772 | fi | ||
4773 | echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 | ||
4774 | @@ -5714,7 +6031,6 @@ | ||
4775 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4776 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4777 | cat >conftest.$ac_ext <<_ACEOF | ||
4778 | -#line $LINENO "configure" | ||
4779 | /* confdefs.h. */ | ||
4780 | _ACEOF | ||
4781 | cat confdefs.h >>conftest.$ac_ext | ||
4782 | @@ -5725,11 +6041,20 @@ | ||
4783 | _ACEOF | ||
4784 | rm -f conftest.$ac_objext | ||
4785 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4786 | - (eval $ac_compile) 2>&5 | ||
4787 | + (eval $ac_compile) 2>conftest.er1 | ||
4788 | ac_status=$? | ||
4789 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4790 | + rm -f conftest.er1 | ||
4791 | + cat conftest.err >&5 | ||
4792 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4793 | (exit $ac_status); } && | ||
4794 | - { ac_try='test -s conftest.$ac_objext' | ||
4795 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4796 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4797 | + (eval $ac_try) 2>&5 | ||
4798 | + ac_status=$? | ||
4799 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4800 | + (exit $ac_status); }; } && | ||
4801 | + { ac_try='test -s conftest.$ac_objext' | ||
4802 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4803 | (eval $ac_try) 2>&5 | ||
4804 | ac_status=$? | ||
4805 | @@ -5742,7 +6067,7 @@ | ||
4806 | |||
4807 | ac_header_compiler=no | ||
4808 | fi | ||
4809 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4810 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4811 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4812 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4813 | |||
4814 | @@ -5750,7 +6075,6 @@ | ||
4815 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4816 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4817 | cat >conftest.$ac_ext <<_ACEOF | ||
4818 | -#line $LINENO "configure" | ||
4819 | /* confdefs.h. */ | ||
4820 | _ACEOF | ||
4821 | cat confdefs.h >>conftest.$ac_ext | ||
4822 | @@ -5768,6 +6092,7 @@ | ||
4823 | (exit $ac_status); } >/dev/null; then | ||
4824 | if test -s conftest.err; then | ||
4825 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4826 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4827 | else | ||
4828 | ac_cpp_err= | ||
4829 | fi | ||
4830 | @@ -5787,33 +6112,32 @@ | ||
4831 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4832 | |||
4833 | # So? What about this header? | ||
4834 | -case $ac_header_compiler:$ac_header_preproc in | ||
4835 | - yes:no ) | ||
4836 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4837 | + yes:no: ) | ||
4838 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4839 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4840 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4841 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4842 | - ( | ||
4843 | - cat <<\_ASBOX | ||
4844 | -## ------------------------------------ ## | ||
4845 | -## Report this to bug-autoconf@gnu.org. ## | ||
4846 | -## ------------------------------------ ## | ||
4847 | -_ASBOX | ||
4848 | - ) | | ||
4849 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4850 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4851 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4852 | + ac_header_preproc=yes | ||
4853 | ;; | ||
4854 | - no:yes ) | ||
4855 | + no:yes:* ) | ||
4856 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4857 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4858 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4859 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4860 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4861 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
4862 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
4863 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4864 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4865 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4866 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4867 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4868 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4869 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4870 | ( | ||
4871 | cat <<\_ASBOX | ||
4872 | -## ------------------------------------ ## | ||
4873 | -## Report this to bug-autoconf@gnu.org. ## | ||
4874 | -## ------------------------------------ ## | ||
4875 | +## -------------------------------- ## | ||
4876 | +## Report this to bug-patch@gnu.org ## | ||
4877 | +## -------------------------------- ## | ||
4878 | _ASBOX | ||
4879 | ) | | ||
4880 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4881 | @@ -5824,7 +6148,7 @@ | ||
4882 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4883 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4884 | else | ||
4885 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4886 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4887 | fi | ||
4888 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4889 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4890 | @@ -5872,7 +6196,6 @@ | ||
4891 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4892 | else | ||
4893 | cat >conftest.$ac_ext <<_ACEOF | ||
4894 | -#line $LINENO "configure" | ||
4895 | /* confdefs.h. */ | ||
4896 | _ACEOF | ||
4897 | cat confdefs.h >>conftest.$ac_ext | ||
4898 | @@ -5905,11 +6228,20 @@ | ||
4899 | _ACEOF | ||
4900 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4901 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
4902 | - (eval $ac_link) 2>&5 | ||
4903 | + (eval $ac_link) 2>conftest.er1 | ||
4904 | ac_status=$? | ||
4905 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4906 | + rm -f conftest.er1 | ||
4907 | + cat conftest.err >&5 | ||
4908 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4909 | (exit $ac_status); } && | ||
4910 | - { ac_try='test -s conftest$ac_exeext' | ||
4911 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4912 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4913 | + (eval $ac_try) 2>&5 | ||
4914 | + ac_status=$? | ||
4915 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4916 | + (exit $ac_status); }; } && | ||
4917 | + { ac_try='test -s conftest$ac_exeext' | ||
4918 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4919 | (eval $ac_try) 2>&5 | ||
4920 | ac_status=$? | ||
4921 | @@ -5922,7 +6254,8 @@ | ||
4922 | |||
4923 | jm_cv_struct_dirent_d_ino=no | ||
4924 | fi | ||
4925 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
4926 | +rm -f conftest.err conftest.$ac_objext \ | ||
4927 | + conftest$ac_exeext conftest.$ac_ext | ||
4928 | |||
4929 | |||
4930 | fi | ||
4931 | @@ -6011,21 +6344,28 @@ | ||
4932 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4933 | else | ||
4934 | cat >conftest.$ac_ext <<_ACEOF | ||
4935 | -#line $LINENO "configure" | ||
4936 | /* confdefs.h. */ | ||
4937 | _ACEOF | ||
4938 | cat confdefs.h >>conftest.$ac_ext | ||
4939 | cat >>conftest.$ac_ext <<_ACEOF | ||
4940 | /* end confdefs.h. */ | ||
4941 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
4942 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
4943 | +#define $ac_func innocuous_$ac_func | ||
4944 | + | ||
4945 | /* System header to define __stub macros and hopefully few prototypes, | ||
4946 | which can conflict with char $ac_func (); below. | ||
4947 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
4948 | <limits.h> exists even on freestanding compilers. */ | ||
4949 | + | ||
4950 | #ifdef __STDC__ | ||
4951 | # include <limits.h> | ||
4952 | #else | ||
4953 | # include <assert.h> | ||
4954 | #endif | ||
4955 | + | ||
4956 | +#undef $ac_func | ||
4957 | + | ||
4958 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4959 | #ifdef __cplusplus | ||
4960 | extern "C" | ||
4961 | @@ -6056,11 +6396,20 @@ | ||
4962 | _ACEOF | ||
4963 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4964 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
4965 | - (eval $ac_link) 2>&5 | ||
4966 | + (eval $ac_link) 2>conftest.er1 | ||
4967 | ac_status=$? | ||
4968 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4969 | + rm -f conftest.er1 | ||
4970 | + cat conftest.err >&5 | ||
4971 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4972 | (exit $ac_status); } && | ||
4973 | - { ac_try='test -s conftest$ac_exeext' | ||
4974 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4975 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4976 | + (eval $ac_try) 2>&5 | ||
4977 | + ac_status=$? | ||
4978 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4979 | + (exit $ac_status); }; } && | ||
4980 | + { ac_try='test -s conftest$ac_exeext' | ||
4981 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4982 | (eval $ac_try) 2>&5 | ||
4983 | ac_status=$? | ||
4984 | @@ -6073,7 +6422,8 @@ | ||
4985 | |||
4986 | eval "$as_ac_var=no" | ||
4987 | fi | ||
4988 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
4989 | +rm -f conftest.err conftest.$ac_objext \ | ||
4990 | + conftest$ac_exeext conftest.$ac_ext | ||
4991 | fi | ||
4992 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
4993 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
4994 | @@ -6126,21 +6476,28 @@ | ||
4995 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4996 | else | ||
4997 | cat >conftest.$ac_ext <<_ACEOF | ||
4998 | -#line $LINENO "configure" | ||
4999 | /* confdefs.h. */ | ||
5000 | _ACEOF | ||
5001 | cat confdefs.h >>conftest.$ac_ext | ||
5002 | cat >>conftest.$ac_ext <<_ACEOF | ||
5003 | /* end confdefs.h. */ | ||
5004 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5005 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5006 | +#define $ac_func innocuous_$ac_func | ||
5007 | + | ||
5008 | /* System header to define __stub macros and hopefully few prototypes, | ||
5009 | which can conflict with char $ac_func (); below. | ||
5010 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5011 | <limits.h> exists even on freestanding compilers. */ | ||
5012 | + | ||
5013 | #ifdef __STDC__ | ||
5014 | # include <limits.h> | ||
5015 | #else | ||
5016 | # include <assert.h> | ||
5017 | #endif | ||
5018 | + | ||
5019 | +#undef $ac_func | ||
5020 | + | ||
5021 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5022 | #ifdef __cplusplus | ||
5023 | extern "C" | ||
5024 | @@ -6171,11 +6528,20 @@ | ||
5025 | _ACEOF | ||
5026 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5027 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5028 | - (eval $ac_link) 2>&5 | ||
5029 | + (eval $ac_link) 2>conftest.er1 | ||
5030 | ac_status=$? | ||
5031 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5032 | + rm -f conftest.er1 | ||
5033 | + cat conftest.err >&5 | ||
5034 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5035 | (exit $ac_status); } && | ||
5036 | - { ac_try='test -s conftest$ac_exeext' | ||
5037 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5038 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5039 | + (eval $ac_try) 2>&5 | ||
5040 | + ac_status=$? | ||
5041 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5042 | + (exit $ac_status); }; } && | ||
5043 | + { ac_try='test -s conftest$ac_exeext' | ||
5044 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5045 | (eval $ac_try) 2>&5 | ||
5046 | ac_status=$? | ||
5047 | @@ -6188,7 +6554,8 @@ | ||
5048 | |||
5049 | eval "$as_ac_var=no" | ||
5050 | fi | ||
5051 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5052 | +rm -f conftest.err conftest.$ac_objext \ | ||
5053 | + conftest$ac_exeext conftest.$ac_ext | ||
5054 | fi | ||
5055 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5056 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5057 | @@ -6203,21 +6570,28 @@ | ||
5058 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5059 | else | ||
5060 | cat >conftest.$ac_ext <<_ACEOF | ||
5061 | -#line $LINENO "configure" | ||
5062 | /* confdefs.h. */ | ||
5063 | _ACEOF | ||
5064 | cat confdefs.h >>conftest.$ac_ext | ||
5065 | cat >>conftest.$ac_ext <<_ACEOF | ||
5066 | /* end confdefs.h. */ | ||
5067 | +/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. | ||
5068 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5069 | +#define _doprnt innocuous__doprnt | ||
5070 | + | ||
5071 | /* System header to define __stub macros and hopefully few prototypes, | ||
5072 | which can conflict with char _doprnt (); below. | ||
5073 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5074 | <limits.h> exists even on freestanding compilers. */ | ||
5075 | + | ||
5076 | #ifdef __STDC__ | ||
5077 | # include <limits.h> | ||
5078 | #else | ||
5079 | # include <assert.h> | ||
5080 | #endif | ||
5081 | + | ||
5082 | +#undef _doprnt | ||
5083 | + | ||
5084 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5085 | #ifdef __cplusplus | ||
5086 | extern "C" | ||
5087 | @@ -6248,11 +6622,20 @@ | ||
5088 | _ACEOF | ||
5089 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5090 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5091 | - (eval $ac_link) 2>&5 | ||
5092 | + (eval $ac_link) 2>conftest.er1 | ||
5093 | ac_status=$? | ||
5094 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5095 | + rm -f conftest.er1 | ||
5096 | + cat conftest.err >&5 | ||
5097 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5098 | (exit $ac_status); } && | ||
5099 | - { ac_try='test -s conftest$ac_exeext' | ||
5100 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5101 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5102 | + (eval $ac_try) 2>&5 | ||
5103 | + ac_status=$? | ||
5104 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5105 | + (exit $ac_status); }; } && | ||
5106 | + { ac_try='test -s conftest$ac_exeext' | ||
5107 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5108 | (eval $ac_try) 2>&5 | ||
5109 | ac_status=$? | ||
5110 | @@ -6265,7 +6648,8 @@ | ||
5111 | |||
5112 | ac_cv_func__doprnt=no | ||
5113 | fi | ||
5114 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5115 | +rm -f conftest.err conftest.$ac_objext \ | ||
5116 | + conftest$ac_exeext conftest.$ac_ext | ||
5117 | fi | ||
5118 | echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 | ||
5119 | echo "${ECHO_T}$ac_cv_func__doprnt" >&6 | ||
5120 | @@ -6288,13 +6672,12 @@ | ||
5121 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5122 | else | ||
5123 | cat >conftest.$ac_ext <<_ACEOF | ||
5124 | -#line $LINENO "configure" | ||
5125 | /* confdefs.h. */ | ||
5126 | _ACEOF | ||
5127 | cat confdefs.h >>conftest.$ac_ext | ||
5128 | cat >>conftest.$ac_ext <<_ACEOF | ||
5129 | /* end confdefs.h. */ | ||
5130 | - | ||
5131 | +$ac_includes_default | ||
5132 | int | ||
5133 | main () | ||
5134 | { | ||
5135 | @@ -6305,11 +6688,20 @@ | ||
5136 | _ACEOF | ||
5137 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5138 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5139 | - (eval $ac_link) 2>&5 | ||
5140 | + (eval $ac_link) 2>conftest.er1 | ||
5141 | ac_status=$? | ||
5142 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5143 | + rm -f conftest.er1 | ||
5144 | + cat conftest.err >&5 | ||
5145 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5146 | (exit $ac_status); } && | ||
5147 | - { ac_try='test -s conftest$ac_exeext' | ||
5148 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5149 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5150 | + (eval $ac_try) 2>&5 | ||
5151 | + ac_status=$? | ||
5152 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5153 | + (exit $ac_status); }; } && | ||
5154 | + { ac_try='test -s conftest$ac_exeext' | ||
5155 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5156 | (eval $ac_try) 2>&5 | ||
5157 | ac_status=$? | ||
5158 | @@ -6322,12 +6714,20 @@ | ||
5159 | |||
5160 | ac_cv_lib_error_at_line=no | ||
5161 | fi | ||
5162 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5163 | +rm -f conftest.err conftest.$ac_objext \ | ||
5164 | + conftest$ac_exeext conftest.$ac_ext | ||
5165 | fi | ||
5166 | echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5 | ||
5167 | echo "${ECHO_T}$ac_cv_lib_error_at_line" >&6 | ||
5168 | if test $ac_cv_lib_error_at_line = no; then | ||
5169 | - LIBOBJS="$LIBOBJS error.$ac_objext" | ||
5170 | + case $LIBOBJS in | ||
5171 | + "error.$ac_objext" | \ | ||
5172 | + *" error.$ac_objext" | \ | ||
5173 | + "error.$ac_objext "* | \ | ||
5174 | + *" error.$ac_objext "* ) ;; | ||
5175 | + *) LIBOBJS="$LIBOBJS error.$ac_objext" ;; | ||
5176 | +esac | ||
5177 | + | ||
5178 | fi | ||
5179 | |||
5180 | |||
5181 | @@ -6343,21 +6743,28 @@ | ||
5182 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5183 | else | ||
5184 | cat >conftest.$ac_ext <<_ACEOF | ||
5185 | -#line $LINENO "configure" | ||
5186 | /* confdefs.h. */ | ||
5187 | _ACEOF | ||
5188 | cat confdefs.h >>conftest.$ac_ext | ||
5189 | cat >>conftest.$ac_ext <<_ACEOF | ||
5190 | /* end confdefs.h. */ | ||
5191 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5192 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5193 | +#define $ac_func innocuous_$ac_func | ||
5194 | + | ||
5195 | /* System header to define __stub macros and hopefully few prototypes, | ||
5196 | which can conflict with char $ac_func (); below. | ||
5197 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5198 | <limits.h> exists even on freestanding compilers. */ | ||
5199 | + | ||
5200 | #ifdef __STDC__ | ||
5201 | # include <limits.h> | ||
5202 | #else | ||
5203 | # include <assert.h> | ||
5204 | #endif | ||
5205 | + | ||
5206 | +#undef $ac_func | ||
5207 | + | ||
5208 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5209 | #ifdef __cplusplus | ||
5210 | extern "C" | ||
5211 | @@ -6388,11 +6795,20 @@ | ||
5212 | _ACEOF | ||
5213 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5214 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5215 | - (eval $ac_link) 2>&5 | ||
5216 | + (eval $ac_link) 2>conftest.er1 | ||
5217 | ac_status=$? | ||
5218 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5219 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5220 | + rm -f conftest.er1 | ||
5221 | + cat conftest.err >&5 | ||
5222 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5223 | (exit $ac_status); } && | ||
5224 | - { ac_try='test -s conftest$ac_exeext' | ||
5225 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5226 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5227 | + (eval $ac_try) 2>&5 | ||
5228 | + ac_status=$? | ||
5229 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5230 | + (exit $ac_status); }; } && | ||
5231 | + { ac_try='test -s conftest$ac_exeext' | ||
5232 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5233 | (eval $ac_try) 2>&5 | ||
5234 | ac_status=$? | ||
5235 | @@ -6405,7 +6821,8 @@ | ||
5236 | |||
5237 | eval "$as_ac_var=no" | ||
5238 | fi | ||
5239 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5240 | +rm -f conftest.err conftest.$ac_objext \ | ||
5241 | + conftest$ac_exeext conftest.$ac_ext | ||
5242 | fi | ||
5243 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5244 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5245 | @@ -6423,7 +6840,6 @@ | ||
5246 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5247 | else | ||
5248 | cat >conftest.$ac_ext <<_ACEOF | ||
5249 | -#line $LINENO "configure" | ||
5250 | /* confdefs.h. */ | ||
5251 | _ACEOF | ||
5252 | cat confdefs.h >>conftest.$ac_ext | ||
5253 | @@ -6443,11 +6859,20 @@ | ||
5254 | _ACEOF | ||
5255 | rm -f conftest.$ac_objext | ||
5256 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5257 | - (eval $ac_compile) 2>&5 | ||
5258 | + (eval $ac_compile) 2>conftest.er1 | ||
5259 | ac_status=$? | ||
5260 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5261 | + rm -f conftest.er1 | ||
5262 | + cat conftest.err >&5 | ||
5263 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5264 | (exit $ac_status); } && | ||
5265 | - { ac_try='test -s conftest.$ac_objext' | ||
5266 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5267 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5268 | + (eval $ac_try) 2>&5 | ||
5269 | + ac_status=$? | ||
5270 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5271 | + (exit $ac_status); }; } && | ||
5272 | + { ac_try='test -s conftest.$ac_objext' | ||
5273 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5274 | (eval $ac_try) 2>&5 | ||
5275 | ac_status=$? | ||
5276 | @@ -6460,7 +6885,7 @@ | ||
5277 | |||
5278 | ac_cv_have_decl_strerror=no | ||
5279 | fi | ||
5280 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5281 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5282 | fi | ||
5283 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5 | ||
5284 | echo "${ECHO_T}$ac_cv_have_decl_strerror" >&6 | ||
5285 | @@ -6486,7 +6911,6 @@ | ||
5286 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5287 | else | ||
5288 | cat >conftest.$ac_ext <<_ACEOF | ||
5289 | -#line $LINENO "configure" | ||
5290 | /* confdefs.h. */ | ||
5291 | _ACEOF | ||
5292 | cat confdefs.h >>conftest.$ac_ext | ||
5293 | @@ -6506,11 +6930,20 @@ | ||
5294 | _ACEOF | ||
5295 | rm -f conftest.$ac_objext | ||
5296 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5297 | - (eval $ac_compile) 2>&5 | ||
5298 | + (eval $ac_compile) 2>conftest.er1 | ||
5299 | ac_status=$? | ||
5300 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5301 | + rm -f conftest.er1 | ||
5302 | + cat conftest.err >&5 | ||
5303 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5304 | (exit $ac_status); } && | ||
5305 | - { ac_try='test -s conftest.$ac_objext' | ||
5306 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5307 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5308 | + (eval $ac_try) 2>&5 | ||
5309 | + ac_status=$? | ||
5310 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5311 | + (exit $ac_status); }; } && | ||
5312 | + { ac_try='test -s conftest.$ac_objext' | ||
5313 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5314 | (eval $ac_try) 2>&5 | ||
5315 | ac_status=$? | ||
5316 | @@ -6523,7 +6956,7 @@ | ||
5317 | |||
5318 | ac_cv_have_decl_strerror_r=no | ||
5319 | fi | ||
5320 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5321 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5322 | fi | ||
5323 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5 | ||
5324 | echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6 | ||
5325 | @@ -6553,21 +6986,28 @@ | ||
5326 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5327 | else | ||
5328 | cat >conftest.$ac_ext <<_ACEOF | ||
5329 | -#line $LINENO "configure" | ||
5330 | /* confdefs.h. */ | ||
5331 | _ACEOF | ||
5332 | cat confdefs.h >>conftest.$ac_ext | ||
5333 | cat >>conftest.$ac_ext <<_ACEOF | ||
5334 | /* end confdefs.h. */ | ||
5335 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5336 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5337 | +#define $ac_func innocuous_$ac_func | ||
5338 | + | ||
5339 | /* System header to define __stub macros and hopefully few prototypes, | ||
5340 | which can conflict with char $ac_func (); below. | ||
5341 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5342 | <limits.h> exists even on freestanding compilers. */ | ||
5343 | + | ||
5344 | #ifdef __STDC__ | ||
5345 | # include <limits.h> | ||
5346 | #else | ||
5347 | # include <assert.h> | ||
5348 | #endif | ||
5349 | + | ||
5350 | +#undef $ac_func | ||
5351 | + | ||
5352 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5353 | #ifdef __cplusplus | ||
5354 | extern "C" | ||
5355 | @@ -6598,11 +7038,20 @@ | ||
5356 | _ACEOF | ||
5357 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5358 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5359 | - (eval $ac_link) 2>&5 | ||
5360 | + (eval $ac_link) 2>conftest.er1 | ||
5361 | ac_status=$? | ||
5362 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5363 | + rm -f conftest.er1 | ||
5364 | + cat conftest.err >&5 | ||
5365 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5366 | (exit $ac_status); } && | ||
5367 | - { ac_try='test -s conftest$ac_exeext' | ||
5368 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5369 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5370 | + (eval $ac_try) 2>&5 | ||
5371 | + ac_status=$? | ||
5372 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5373 | + (exit $ac_status); }; } && | ||
5374 | + { ac_try='test -s conftest$ac_exeext' | ||
5375 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5376 | (eval $ac_try) 2>&5 | ||
5377 | ac_status=$? | ||
5378 | @@ -6615,7 +7064,8 @@ | ||
5379 | |||
5380 | eval "$as_ac_var=no" | ||
5381 | fi | ||
5382 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5383 | +rm -f conftest.err conftest.$ac_objext \ | ||
5384 | + conftest$ac_exeext conftest.$ac_ext | ||
5385 | fi | ||
5386 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5387 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5388 | @@ -6636,7 +7086,6 @@ | ||
5389 | ac_cv_func_strerror_r_char_p=no | ||
5390 | if test $ac_cv_have_decl_strerror_r = yes; then | ||
5391 | cat >conftest.$ac_ext <<_ACEOF | ||
5392 | -#line $LINENO "configure" | ||
5393 | /* confdefs.h. */ | ||
5394 | _ACEOF | ||
5395 | cat confdefs.h >>conftest.$ac_ext | ||
5396 | @@ -6657,11 +7106,20 @@ | ||
5397 | _ACEOF | ||
5398 | rm -f conftest.$ac_objext | ||
5399 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5400 | - (eval $ac_compile) 2>&5 | ||
5401 | + (eval $ac_compile) 2>conftest.er1 | ||
5402 | ac_status=$? | ||
5403 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5404 | + rm -f conftest.er1 | ||
5405 | + cat conftest.err >&5 | ||
5406 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5407 | (exit $ac_status); } && | ||
5408 | - { ac_try='test -s conftest.$ac_objext' | ||
5409 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5410 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5411 | + (eval $ac_try) 2>&5 | ||
5412 | + ac_status=$? | ||
5413 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5414 | + (exit $ac_status); }; } && | ||
5415 | + { ac_try='test -s conftest.$ac_objext' | ||
5416 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5417 | (eval $ac_try) 2>&5 | ||
5418 | ac_status=$? | ||
5419 | @@ -6673,7 +7131,7 @@ | ||
5420 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5421 | |||
5422 | fi | ||
5423 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5424 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5425 | else | ||
5426 | # strerror_r is not declared. Choose between | ||
5427 | # systems that have relatively inaccessible declarations for the | ||
5428 | @@ -6685,7 +7143,6 @@ | ||
5429 | : | ||
5430 | else | ||
5431 | cat >conftest.$ac_ext <<_ACEOF | ||
5432 | -#line $LINENO "configure" | ||
5433 | /* confdefs.h. */ | ||
5434 | _ACEOF | ||
5435 | cat confdefs.h >>conftest.$ac_ext | ||
5436 | @@ -6721,7 +7178,7 @@ | ||
5437 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5438 | |||
5439 | fi | ||
5440 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5441 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5442 | fi | ||
5443 | fi | ||
5444 | |||
5445 | @@ -6749,21 +7206,28 @@ | ||
5446 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5447 | else | ||
5448 | cat >conftest.$ac_ext <<_ACEOF | ||
5449 | -#line $LINENO "configure" | ||
5450 | /* confdefs.h. */ | ||
5451 | _ACEOF | ||
5452 | cat confdefs.h >>conftest.$ac_ext | ||
5453 | cat >>conftest.$ac_ext <<_ACEOF | ||
5454 | /* end confdefs.h. */ | ||
5455 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5456 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5457 | +#define $ac_func innocuous_$ac_func | ||
5458 | + | ||
5459 | /* System header to define __stub macros and hopefully few prototypes, | ||
5460 | which can conflict with char $ac_func (); below. | ||
5461 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5462 | <limits.h> exists even on freestanding compilers. */ | ||
5463 | + | ||
5464 | #ifdef __STDC__ | ||
5465 | # include <limits.h> | ||
5466 | #else | ||
5467 | # include <assert.h> | ||
5468 | #endif | ||
5469 | + | ||
5470 | +#undef $ac_func | ||
5471 | + | ||
5472 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5473 | #ifdef __cplusplus | ||
5474 | extern "C" | ||
5475 | @@ -6794,11 +7258,20 @@ | ||
5476 | _ACEOF | ||
5477 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5478 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5479 | - (eval $ac_link) 2>&5 | ||
5480 | + (eval $ac_link) 2>conftest.er1 | ||
5481 | ac_status=$? | ||
5482 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5483 | + rm -f conftest.er1 | ||
5484 | + cat conftest.err >&5 | ||
5485 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5486 | (exit $ac_status); } && | ||
5487 | - { ac_try='test -s conftest$ac_exeext' | ||
5488 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5489 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5490 | + (eval $ac_try) 2>&5 | ||
5491 | + ac_status=$? | ||
5492 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5493 | + (exit $ac_status); }; } && | ||
5494 | + { ac_try='test -s conftest$ac_exeext' | ||
5495 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5496 | (eval $ac_try) 2>&5 | ||
5497 | ac_status=$? | ||
5498 | @@ -6811,7 +7284,8 @@ | ||
5499 | |||
5500 | eval "$as_ac_var=no" | ||
5501 | fi | ||
5502 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5503 | +rm -f conftest.err conftest.$ac_objext \ | ||
5504 | + conftest$ac_exeext conftest.$ac_ext | ||
5505 | fi | ||
5506 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5507 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5508 | @@ -6821,7 +7295,14 @@ | ||
5509 | _ACEOF | ||
5510 | |||
5511 | else | ||
5512 | - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" | ||
5513 | + case $LIBOBJS in | ||
5514 | + "$ac_func.$ac_objext" | \ | ||
5515 | + *" $ac_func.$ac_objext" | \ | ||
5516 | + "$ac_func.$ac_objext "* | \ | ||
5517 | + *" $ac_func.$ac_objext "* ) ;; | ||
5518 | + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; | ||
5519 | +esac | ||
5520 | + | ||
5521 | fi | ||
5522 | done | ||
5523 | |||
5524 | @@ -6855,7 +7336,6 @@ | ||
5525 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
5526 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
5527 | cat >conftest.$ac_ext <<_ACEOF | ||
5528 | -#line $LINENO "configure" | ||
5529 | /* confdefs.h. */ | ||
5530 | _ACEOF | ||
5531 | cat confdefs.h >>conftest.$ac_ext | ||
5532 | @@ -6866,11 +7346,20 @@ | ||
5533 | _ACEOF | ||
5534 | rm -f conftest.$ac_objext | ||
5535 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5536 | - (eval $ac_compile) 2>&5 | ||
5537 | + (eval $ac_compile) 2>conftest.er1 | ||
5538 | ac_status=$? | ||
5539 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5540 | + rm -f conftest.er1 | ||
5541 | + cat conftest.err >&5 | ||
5542 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5543 | (exit $ac_status); } && | ||
5544 | - { ac_try='test -s conftest.$ac_objext' | ||
5545 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5546 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5547 | + (eval $ac_try) 2>&5 | ||
5548 | + ac_status=$? | ||
5549 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5550 | + (exit $ac_status); }; } && | ||
5551 | + { ac_try='test -s conftest.$ac_objext' | ||
5552 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5553 | (eval $ac_try) 2>&5 | ||
5554 | ac_status=$? | ||
5555 | @@ -6883,7 +7372,7 @@ | ||
5556 | |||
5557 | ac_header_compiler=no | ||
5558 | fi | ||
5559 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5560 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5561 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
5562 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
5563 | |||
5564 | @@ -6891,7 +7380,6 @@ | ||
5565 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
5566 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
5567 | cat >conftest.$ac_ext <<_ACEOF | ||
5568 | -#line $LINENO "configure" | ||
5569 | /* confdefs.h. */ | ||
5570 | _ACEOF | ||
5571 | cat confdefs.h >>conftest.$ac_ext | ||
5572 | @@ -6909,6 +7397,7 @@ | ||
5573 | (exit $ac_status); } >/dev/null; then | ||
5574 | if test -s conftest.err; then | ||
5575 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
5576 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5577 | else | ||
5578 | ac_cpp_err= | ||
5579 | fi | ||
5580 | @@ -6928,33 +7417,32 @@ | ||
5581 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
5582 | |||
5583 | # So? What about this header? | ||
5584 | -case $ac_header_compiler:$ac_header_preproc in | ||
5585 | - yes:no ) | ||
5586 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
5587 | + yes:no: ) | ||
5588 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
5589 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
5590 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5591 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5592 | - ( | ||
5593 | - cat <<\_ASBOX | ||
5594 | -## ------------------------------------ ## | ||
5595 | -## Report this to bug-autoconf@gnu.org. ## | ||
5596 | -## ------------------------------------ ## | ||
5597 | -_ASBOX | ||
5598 | - ) | | ||
5599 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
5600 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
5601 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
5602 | + ac_header_preproc=yes | ||
5603 | ;; | ||
5604 | - no:yes ) | ||
5605 | + no:yes:* ) | ||
5606 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
5607 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
5608 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5609 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
5610 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5611 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
5612 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
5613 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
5614 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
5615 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
5616 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5617 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5618 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
5619 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
5620 | ( | ||
5621 | cat <<\_ASBOX | ||
5622 | -## ------------------------------------ ## | ||
5623 | -## Report this to bug-autoconf@gnu.org. ## | ||
5624 | -## ------------------------------------ ## | ||
5625 | +## -------------------------------- ## | ||
5626 | +## Report this to bug-patch@gnu.org ## | ||
5627 | +## -------------------------------- ## | ||
5628 | _ASBOX | ||
5629 | ) | | ||
5630 | sed "s/^/$as_me: WARNING: /" >&2 | ||
5631 | @@ -6965,7 +7453,7 @@ | ||
5632 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
5633 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5634 | else | ||
5635 | - eval "$as_ac_Header=$ac_header_preproc" | ||
5636 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
5637 | fi | ||
5638 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
5639 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5640 | @@ -6989,7 +7477,6 @@ | ||
5641 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5642 | else | ||
5643 | cat >conftest.$ac_ext <<_ACEOF | ||
5644 | -#line $LINENO "configure" | ||
5645 | /* confdefs.h. */ | ||
5646 | _ACEOF | ||
5647 | cat confdefs.h >>conftest.$ac_ext | ||
5648 | @@ -7053,21 +7540,28 @@ | ||
5649 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5650 | else | ||
5651 | cat >conftest.$ac_ext <<_ACEOF | ||
5652 | -#line $LINENO "configure" | ||
5653 | /* confdefs.h. */ | ||
5654 | _ACEOF | ||
5655 | cat confdefs.h >>conftest.$ac_ext | ||
5656 | cat >>conftest.$ac_ext <<_ACEOF | ||
5657 | /* end confdefs.h. */ | ||
5658 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5659 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5660 | +#define $ac_func innocuous_$ac_func | ||
5661 | + | ||
5662 | /* System header to define __stub macros and hopefully few prototypes, | ||
5663 | which can conflict with char $ac_func (); below. | ||
5664 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5665 | <limits.h> exists even on freestanding compilers. */ | ||
5666 | + | ||
5667 | #ifdef __STDC__ | ||
5668 | # include <limits.h> | ||
5669 | #else | ||
5670 | # include <assert.h> | ||
5671 | #endif | ||
5672 | + | ||
5673 | +#undef $ac_func | ||
5674 | + | ||
5675 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5676 | #ifdef __cplusplus | ||
5677 | extern "C" | ||
5678 | @@ -7098,11 +7592,20 @@ | ||
5679 | _ACEOF | ||
5680 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5681 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5682 | - (eval $ac_link) 2>&5 | ||
5683 | + (eval $ac_link) 2>conftest.er1 | ||
5684 | ac_status=$? | ||
5685 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5686 | + rm -f conftest.er1 | ||
5687 | + cat conftest.err >&5 | ||
5688 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5689 | (exit $ac_status); } && | ||
5690 | - { ac_try='test -s conftest$ac_exeext' | ||
5691 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5692 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5693 | + (eval $ac_try) 2>&5 | ||
5694 | + ac_status=$? | ||
5695 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5696 | + (exit $ac_status); }; } && | ||
5697 | + { ac_try='test -s conftest$ac_exeext' | ||
5698 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5699 | (eval $ac_try) 2>&5 | ||
5700 | ac_status=$? | ||
5701 | @@ -7115,7 +7618,8 @@ | ||
5702 | |||
5703 | eval "$as_ac_var=no" | ||
5704 | fi | ||
5705 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5706 | +rm -f conftest.err conftest.$ac_objext \ | ||
5707 | + conftest$ac_exeext conftest.$ac_ext | ||
5708 | fi | ||
5709 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5710 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5711 | @@ -7125,7 +7629,14 @@ | ||
5712 | _ACEOF | ||
5713 | |||
5714 | else | ||
5715 | - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" | ||
5716 | + case $LIBOBJS in | ||
5717 | + "$ac_func.$ac_objext" | \ | ||
5718 | + *" $ac_func.$ac_objext" | \ | ||
5719 | + "$ac_func.$ac_objext "* | \ | ||
5720 | + *" $ac_func.$ac_objext "* ) ;; | ||
5721 | + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; | ||
5722 | +esac | ||
5723 | + | ||
5724 | fi | ||
5725 | done | ||
5726 | |||
5727 | @@ -7163,7 +7674,6 @@ | ||
5728 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
5729 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
5730 | cat >conftest.$ac_ext <<_ACEOF | ||
5731 | -#line $LINENO "configure" | ||
5732 | /* confdefs.h. */ | ||
5733 | _ACEOF | ||
5734 | cat confdefs.h >>conftest.$ac_ext | ||
5735 | @@ -7174,11 +7684,20 @@ | ||
5736 | _ACEOF | ||
5737 | rm -f conftest.$ac_objext | ||
5738 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5739 | - (eval $ac_compile) 2>&5 | ||
5740 | + (eval $ac_compile) 2>conftest.er1 | ||
5741 | ac_status=$? | ||
5742 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5743 | + rm -f conftest.er1 | ||
5744 | + cat conftest.err >&5 | ||
5745 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5746 | (exit $ac_status); } && | ||
5747 | - { ac_try='test -s conftest.$ac_objext' | ||
5748 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5749 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5750 | + (eval $ac_try) 2>&5 | ||
5751 | + ac_status=$? | ||
5752 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5753 | + (exit $ac_status); }; } && | ||
5754 | + { ac_try='test -s conftest.$ac_objext' | ||
5755 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5756 | (eval $ac_try) 2>&5 | ||
5757 | ac_status=$? | ||
5758 | @@ -7191,7 +7710,7 @@ | ||
5759 | |||
5760 | ac_header_compiler=no | ||
5761 | fi | ||
5762 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5763 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5764 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
5765 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
5766 | |||
5767 | @@ -7199,7 +7718,6 @@ | ||
5768 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
5769 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
5770 | cat >conftest.$ac_ext <<_ACEOF | ||
5771 | -#line $LINENO "configure" | ||
5772 | /* confdefs.h. */ | ||
5773 | _ACEOF | ||
5774 | cat confdefs.h >>conftest.$ac_ext | ||
5775 | @@ -7217,6 +7735,7 @@ | ||
5776 | (exit $ac_status); } >/dev/null; then | ||
5777 | if test -s conftest.err; then | ||
5778 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
5779 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5780 | else | ||
5781 | ac_cpp_err= | ||
5782 | fi | ||
5783 | @@ -7236,33 +7755,32 @@ | ||
5784 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
5785 | |||
5786 | # So? What about this header? | ||
5787 | -case $ac_header_compiler:$ac_header_preproc in | ||
5788 | - yes:no ) | ||
5789 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
5790 | + yes:no: ) | ||
5791 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
5792 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
5793 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5794 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5795 | - ( | ||
5796 | - cat <<\_ASBOX | ||
5797 | -## ------------------------------------ ## | ||
5798 | -## Report this to bug-autoconf@gnu.org. ## | ||
5799 | -## ------------------------------------ ## | ||
5800 | -_ASBOX | ||
5801 | - ) | | ||
5802 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
5803 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
5804 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
5805 | + ac_header_preproc=yes | ||
5806 | ;; | ||
5807 | - no:yes ) | ||
5808 | + no:yes:* ) | ||
5809 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
5810 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
5811 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5812 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
5813 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5814 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
5815 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
5816 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
5817 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
5818 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
5819 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5820 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5821 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
5822 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
5823 | ( | ||
5824 | cat <<\_ASBOX | ||
5825 | -## ------------------------------------ ## | ||
5826 | -## Report this to bug-autoconf@gnu.org. ## | ||
5827 | -## ------------------------------------ ## | ||
5828 | +## -------------------------------- ## | ||
5829 | +## Report this to bug-patch@gnu.org ## | ||
5830 | +## -------------------------------- ## | ||
5831 | _ASBOX | ||
5832 | ) | | ||
5833 | sed "s/^/$as_me: WARNING: /" >&2 | ||
5834 | @@ -7273,7 +7791,7 @@ | ||
5835 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
5836 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5837 | else | ||
5838 | - eval "$as_ac_Header=$ac_header_preproc" | ||
5839 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
5840 | fi | ||
5841 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
5842 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5843 | @@ -7297,7 +7815,6 @@ | ||
5844 | ac_cv_func_malloc_0_nonnull=no | ||
5845 | else | ||
5846 | cat >conftest.$ac_ext <<_ACEOF | ||
5847 | -#line $LINENO "configure" | ||
5848 | /* confdefs.h. */ | ||
5849 | _ACEOF | ||
5850 | cat confdefs.h >>conftest.$ac_ext | ||
5851 | @@ -7337,7 +7854,7 @@ | ||
5852 | ( exit $ac_status ) | ||
5853 | ac_cv_func_malloc_0_nonnull=no | ||
5854 | fi | ||
5855 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5856 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5857 | fi | ||
5858 | fi | ||
5859 | echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 | ||
5860 | @@ -7353,7 +7870,14 @@ | ||
5861 | #define HAVE_MALLOC 0 | ||
5862 | _ACEOF | ||
5863 | |||
5864 | - LIBOBJS="$LIBOBJS malloc.$ac_objext" | ||
5865 | + case $LIBOBJS in | ||
5866 | + "malloc.$ac_objext" | \ | ||
5867 | + *" malloc.$ac_objext" | \ | ||
5868 | + "malloc.$ac_objext "* | \ | ||
5869 | + *" malloc.$ac_objext "* ) ;; | ||
5870 | + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;; | ||
5871 | +esac | ||
5872 | + | ||
5873 | |||
5874 | cat >>confdefs.h <<\_ACEOF | ||
5875 | #define malloc rpl_malloc | ||
5876 | @@ -7388,7 +7912,6 @@ | ||
5877 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
5878 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
5879 | cat >conftest.$ac_ext <<_ACEOF | ||
5880 | -#line $LINENO "configure" | ||
5881 | /* confdefs.h. */ | ||
5882 | _ACEOF | ||
5883 | cat confdefs.h >>conftest.$ac_ext | ||
5884 | @@ -7399,11 +7922,20 @@ | ||
5885 | _ACEOF | ||
5886 | rm -f conftest.$ac_objext | ||
5887 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5888 | - (eval $ac_compile) 2>&5 | ||
5889 | + (eval $ac_compile) 2>conftest.er1 | ||
5890 | ac_status=$? | ||
5891 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5892 | + rm -f conftest.er1 | ||
5893 | + cat conftest.err >&5 | ||
5894 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5895 | (exit $ac_status); } && | ||
5896 | - { ac_try='test -s conftest.$ac_objext' | ||
5897 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5898 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5899 | + (eval $ac_try) 2>&5 | ||
5900 | + ac_status=$? | ||
5901 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5902 | + (exit $ac_status); }; } && | ||
5903 | + { ac_try='test -s conftest.$ac_objext' | ||
5904 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5905 | (eval $ac_try) 2>&5 | ||
5906 | ac_status=$? | ||
5907 | @@ -7416,7 +7948,7 @@ | ||
5908 | |||
5909 | ac_header_compiler=no | ||
5910 | fi | ||
5911 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5912 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5913 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
5914 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
5915 | |||
5916 | @@ -7424,7 +7956,6 @@ | ||
5917 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
5918 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
5919 | cat >conftest.$ac_ext <<_ACEOF | ||
5920 | -#line $LINENO "configure" | ||
5921 | /* confdefs.h. */ | ||
5922 | _ACEOF | ||
5923 | cat confdefs.h >>conftest.$ac_ext | ||
5924 | @@ -7442,6 +7973,7 @@ | ||
5925 | (exit $ac_status); } >/dev/null; then | ||
5926 | if test -s conftest.err; then | ||
5927 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
5928 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5929 | else | ||
5930 | ac_cpp_err= | ||
5931 | fi | ||
5932 | @@ -7461,33 +7993,32 @@ | ||
5933 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
5934 | |||
5935 | # So? What about this header? | ||
5936 | -case $ac_header_compiler:$ac_header_preproc in | ||
5937 | - yes:no ) | ||
5938 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
5939 | + yes:no: ) | ||
5940 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
5941 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
5942 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5943 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5944 | - ( | ||
5945 | - cat <<\_ASBOX | ||
5946 | -## ------------------------------------ ## | ||
5947 | -## Report this to bug-autoconf@gnu.org. ## | ||
5948 | -## ------------------------------------ ## | ||
5949 | -_ASBOX | ||
5950 | - ) | | ||
5951 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
5952 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
5953 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
5954 | + ac_header_preproc=yes | ||
5955 | ;; | ||
5956 | - no:yes ) | ||
5957 | + no:yes:* ) | ||
5958 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
5959 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
5960 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5961 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
5962 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5963 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
5964 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
5965 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
5966 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
5967 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
5968 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5969 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5970 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
5971 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
5972 | ( | ||
5973 | cat <<\_ASBOX | ||
5974 | -## ------------------------------------ ## | ||
5975 | -## Report this to bug-autoconf@gnu.org. ## | ||
5976 | -## ------------------------------------ ## | ||
5977 | +## -------------------------------- ## | ||
5978 | +## Report this to bug-patch@gnu.org ## | ||
5979 | +## -------------------------------- ## | ||
5980 | _ASBOX | ||
5981 | ) | | ||
5982 | sed "s/^/$as_me: WARNING: /" >&2 | ||
5983 | @@ -7498,7 +8029,7 @@ | ||
5984 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
5985 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5986 | else | ||
5987 | - eval "$as_ac_Header=$ac_header_preproc" | ||
5988 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
5989 | fi | ||
5990 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
5991 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5992 | @@ -7522,7 +8053,6 @@ | ||
5993 | ac_cv_func_realloc_0_nonnull=no | ||
5994 | else | ||
5995 | cat >conftest.$ac_ext <<_ACEOF | ||
5996 | -#line $LINENO "configure" | ||
5997 | /* confdefs.h. */ | ||
5998 | _ACEOF | ||
5999 | cat confdefs.h >>conftest.$ac_ext | ||
6000 | @@ -7562,7 +8092,7 @@ | ||
6001 | ( exit $ac_status ) | ||
6002 | ac_cv_func_realloc_0_nonnull=no | ||
6003 | fi | ||
6004 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
6005 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
6006 | fi | ||
6007 | fi | ||
6008 | echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5 | ||
6009 | @@ -7578,7 +8108,14 @@ | ||
6010 | #define HAVE_REALLOC 0 | ||
6011 | _ACEOF | ||
6012 | |||
6013 | - LIBOBJS="$LIBOBJS realloc.$ac_objext" | ||
6014 | + case $LIBOBJS in | ||
6015 | + "realloc.$ac_objext" | \ | ||
6016 | + *" realloc.$ac_objext" | \ | ||
6017 | + "realloc.$ac_objext "* | \ | ||
6018 | + *" realloc.$ac_objext "* ) ;; | ||
6019 | + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;; | ||
6020 | +esac | ||
6021 | + | ||
6022 | |||
6023 | cat >>confdefs.h <<\_ACEOF | ||
6024 | #define realloc rpl_realloc | ||
6025 | @@ -7619,7 +8156,6 @@ | ||
6026 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6027 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
6028 | cat >conftest.$ac_ext <<_ACEOF | ||
6029 | -#line $LINENO "configure" | ||
6030 | /* confdefs.h. */ | ||
6031 | _ACEOF | ||
6032 | cat confdefs.h >>conftest.$ac_ext | ||
6033 | @@ -7630,11 +8166,20 @@ | ||
6034 | _ACEOF | ||
6035 | rm -f conftest.$ac_objext | ||
6036 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6037 | - (eval $ac_compile) 2>&5 | ||
6038 | + (eval $ac_compile) 2>conftest.er1 | ||
6039 | ac_status=$? | ||
6040 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6041 | + rm -f conftest.er1 | ||
6042 | + cat conftest.err >&5 | ||
6043 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6044 | (exit $ac_status); } && | ||
6045 | - { ac_try='test -s conftest.$ac_objext' | ||
6046 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6047 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6048 | + (eval $ac_try) 2>&5 | ||
6049 | + ac_status=$? | ||
6050 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6051 | + (exit $ac_status); }; } && | ||
6052 | + { ac_try='test -s conftest.$ac_objext' | ||
6053 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6054 | (eval $ac_try) 2>&5 | ||
6055 | ac_status=$? | ||
6056 | @@ -7647,7 +8192,7 @@ | ||
6057 | |||
6058 | ac_header_compiler=no | ||
6059 | fi | ||
6060 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6061 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6062 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6063 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
6064 | |||
6065 | @@ -7655,7 +8200,6 @@ | ||
6066 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6067 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
6068 | cat >conftest.$ac_ext <<_ACEOF | ||
6069 | -#line $LINENO "configure" | ||
6070 | /* confdefs.h. */ | ||
6071 | _ACEOF | ||
6072 | cat confdefs.h >>conftest.$ac_ext | ||
6073 | @@ -7673,6 +8217,7 @@ | ||
6074 | (exit $ac_status); } >/dev/null; then | ||
6075 | if test -s conftest.err; then | ||
6076 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6077 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
6078 | else | ||
6079 | ac_cpp_err= | ||
6080 | fi | ||
6081 | @@ -7692,33 +8237,32 @@ | ||
6082 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
6083 | |||
6084 | # So? What about this header? | ||
6085 | -case $ac_header_compiler:$ac_header_preproc in | ||
6086 | - yes:no ) | ||
6087 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6088 | + yes:no: ) | ||
6089 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6090 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6091 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6092 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6093 | - ( | ||
6094 | - cat <<\_ASBOX | ||
6095 | -## ------------------------------------ ## | ||
6096 | -## Report this to bug-autoconf@gnu.org. ## | ||
6097 | -## ------------------------------------ ## | ||
6098 | -_ASBOX | ||
6099 | - ) | | ||
6100 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
6101 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6102 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6103 | + ac_header_preproc=yes | ||
6104 | ;; | ||
6105 | - no:yes ) | ||
6106 | + no:yes:* ) | ||
6107 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6108 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6109 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6110 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6111 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6112 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6113 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
6114 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6115 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6116 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6117 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6118 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6119 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6120 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6121 | ( | ||
6122 | cat <<\_ASBOX | ||
6123 | -## ------------------------------------ ## | ||
6124 | -## Report this to bug-autoconf@gnu.org. ## | ||
6125 | -## ------------------------------------ ## | ||
6126 | +## -------------------------------- ## | ||
6127 | +## Report this to bug-patch@gnu.org ## | ||
6128 | +## -------------------------------- ## | ||
6129 | _ASBOX | ||
6130 | ) | | ||
6131 | sed "s/^/$as_me: WARNING: /" >&2 | ||
6132 | @@ -7729,7 +8273,7 @@ | ||
6133 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6134 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6135 | else | ||
6136 | - eval "$as_ac_Header=$ac_header_preproc" | ||
6137 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6138 | fi | ||
6139 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6140 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6141 | @@ -7772,7 +8316,6 @@ | ||
6142 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6143 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
6144 | cat >conftest.$ac_ext <<_ACEOF | ||
6145 | -#line $LINENO "configure" | ||
6146 | /* confdefs.h. */ | ||
6147 | _ACEOF | ||
6148 | cat confdefs.h >>conftest.$ac_ext | ||
6149 | @@ -7783,11 +8326,20 @@ | ||
6150 | _ACEOF | ||
6151 | rm -f conftest.$ac_objext | ||
6152 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6153 | - (eval $ac_compile) 2>&5 | ||
6154 | + (eval $ac_compile) 2>conftest.er1 | ||
6155 | ac_status=$? | ||
6156 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6157 | + rm -f conftest.er1 | ||
6158 | + cat conftest.err >&5 | ||
6159 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6160 | (exit $ac_status); } && | ||
6161 | - { ac_try='test -s conftest.$ac_objext' | ||
6162 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6163 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6164 | + (eval $ac_try) 2>&5 | ||
6165 | + ac_status=$? | ||
6166 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6167 | + (exit $ac_status); }; } && | ||
6168 | + { ac_try='test -s conftest.$ac_objext' | ||
6169 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6170 | (eval $ac_try) 2>&5 | ||
6171 | ac_status=$? | ||
6172 | @@ -7800,7 +8352,7 @@ | ||
6173 | |||
6174 | ac_header_compiler=no | ||
6175 | fi | ||
6176 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6177 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6178 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6179 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
6180 | |||
6181 | @@ -7808,7 +8360,6 @@ | ||
6182 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6183 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
6184 | cat >conftest.$ac_ext <<_ACEOF | ||
6185 | -#line $LINENO "configure" | ||
6186 | /* confdefs.h. */ | ||
6187 | _ACEOF | ||
6188 | cat confdefs.h >>conftest.$ac_ext | ||
6189 | @@ -7826,6 +8377,7 @@ | ||
6190 | (exit $ac_status); } >/dev/null; then | ||
6191 | if test -s conftest.err; then | ||
6192 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6193 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
6194 | else | ||
6195 | ac_cpp_err= | ||
6196 | fi | ||
6197 | @@ -7845,33 +8397,32 @@ | ||
6198 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
6199 | |||
6200 | # So? What about this header? | ||
6201 | -case $ac_header_compiler:$ac_header_preproc in | ||
6202 | - yes:no ) | ||
6203 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6204 | + yes:no: ) | ||
6205 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6206 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6207 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6208 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6209 | - ( | ||
6210 | - cat <<\_ASBOX | ||
6211 | -## ------------------------------------ ## | ||
6212 | -## Report this to bug-autoconf@gnu.org. ## | ||
6213 | -## ------------------------------------ ## | ||
6214 | -_ASBOX | ||
6215 | - ) | | ||
6216 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
6217 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6218 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6219 | + ac_header_preproc=yes | ||
6220 | ;; | ||
6221 | - no:yes ) | ||
6222 | + no:yes:* ) | ||
6223 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6224 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6225 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6226 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6227 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6228 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6229 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
6230 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6231 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6232 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6233 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6234 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6235 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6236 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6237 | ( | ||
6238 | cat <<\_ASBOX | ||
6239 | -## ------------------------------------ ## | ||
6240 | -## Report this to bug-autoconf@gnu.org. ## | ||
6241 | -## ------------------------------------ ## | ||
6242 | +## -------------------------------- ## | ||
6243 | +## Report this to bug-patch@gnu.org ## | ||
6244 | +## -------------------------------- ## | ||
6245 | _ASBOX | ||
6246 | ) | | ||
6247 | sed "s/^/$as_me: WARNING: /" >&2 | ||
6248 | @@ -7882,7 +8433,7 @@ | ||
6249 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6250 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6251 | else | ||
6252 | - eval "$as_ac_Header=$ac_header_preproc" | ||
6253 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6254 | fi | ||
6255 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6256 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6257 | @@ -7916,7 +8467,6 @@ | ||
6258 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6259 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
6260 | cat >conftest.$ac_ext <<_ACEOF | ||
6261 | -#line $LINENO "configure" | ||
6262 | /* confdefs.h. */ | ||
6263 | _ACEOF | ||
6264 | cat confdefs.h >>conftest.$ac_ext | ||
6265 | @@ -7927,11 +8477,20 @@ | ||
6266 | _ACEOF | ||
6267 | rm -f conftest.$ac_objext | ||
6268 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6269 | - (eval $ac_compile) 2>&5 | ||
6270 | + (eval $ac_compile) 2>conftest.er1 | ||
6271 | ac_status=$? | ||
6272 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6273 | + rm -f conftest.er1 | ||
6274 | + cat conftest.err >&5 | ||
6275 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6276 | (exit $ac_status); } && | ||
6277 | - { ac_try='test -s conftest.$ac_objext' | ||
6278 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6279 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6280 | + (eval $ac_try) 2>&5 | ||
6281 | + ac_status=$? | ||
6282 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6283 | + (exit $ac_status); }; } && | ||
6284 | + { ac_try='test -s conftest.$ac_objext' | ||
6285 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6286 | (eval $ac_try) 2>&5 | ||
6287 | ac_status=$? | ||
6288 | @@ -7944,7 +8503,7 @@ | ||
6289 | |||
6290 | ac_header_compiler=no | ||
6291 | fi | ||
6292 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6293 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6294 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6295 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
6296 | |||
6297 | @@ -7952,7 +8511,6 @@ | ||
6298 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6299 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
6300 | cat >conftest.$ac_ext <<_ACEOF | ||
6301 | -#line $LINENO "configure" | ||
6302 | /* confdefs.h. */ | ||
6303 | _ACEOF | ||
6304 | cat confdefs.h >>conftest.$ac_ext | ||
6305 | @@ -7970,6 +8528,7 @@ | ||
6306 | (exit $ac_status); } >/dev/null; then | ||
6307 | if test -s conftest.err; then | ||
6308 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6309 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
6310 | else | ||
6311 | ac_cpp_err= | ||
6312 | fi | ||
6313 | @@ -7989,33 +8548,32 @@ | ||
6314 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
6315 | |||
6316 | # So? What about this header? | ||
6317 | -case $ac_header_compiler:$ac_header_preproc in | ||
6318 | - yes:no ) | ||
6319 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6320 | + yes:no: ) | ||
6321 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6322 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6323 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6324 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6325 | - ( | ||
6326 | - cat <<\_ASBOX | ||
6327 | -## ------------------------------------ ## | ||
6328 | -## Report this to bug-autoconf@gnu.org. ## | ||
6329 | -## ------------------------------------ ## | ||
6330 | -_ASBOX | ||
6331 | - ) | | ||
6332 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
6333 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6334 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6335 | + ac_header_preproc=yes | ||
6336 | ;; | ||
6337 | - no:yes ) | ||
6338 | + no:yes:* ) | ||
6339 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6340 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6341 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6342 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6343 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6344 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6345 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
6346 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6347 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6348 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6349 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6350 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6351 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6352 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6353 | ( | ||
6354 | cat <<\_ASBOX | ||
6355 | -## ------------------------------------ ## | ||
6356 | -## Report this to bug-autoconf@gnu.org. ## | ||
6357 | -## ------------------------------------ ## | ||
6358 | +## -------------------------------- ## | ||
6359 | +## Report this to bug-patch@gnu.org ## | ||
6360 | +## -------------------------------- ## | ||
6361 | _ASBOX | ||
6362 | ) | | ||
6363 | sed "s/^/$as_me: WARNING: /" >&2 | ||
6364 | @@ -8026,7 +8584,7 @@ | ||
6365 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6366 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6367 | else | ||
6368 | - eval "$as_ac_Header=$ac_header_preproc" | ||
6369 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6370 | fi | ||
6371 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6372 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6373 | @@ -8053,21 +8611,28 @@ | ||
6374 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6375 | else | ||
6376 | cat >conftest.$ac_ext <<_ACEOF | ||
6377 | -#line $LINENO "configure" | ||
6378 | /* confdefs.h. */ | ||
6379 | _ACEOF | ||
6380 | cat confdefs.h >>conftest.$ac_ext | ||
6381 | cat >>conftest.$ac_ext <<_ACEOF | ||
6382 | /* end confdefs.h. */ | ||
6383 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
6384 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
6385 | +#define $ac_func innocuous_$ac_func | ||
6386 | + | ||
6387 | /* System header to define __stub macros and hopefully few prototypes, | ||
6388 | which can conflict with char $ac_func (); below. | ||
6389 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
6390 | <limits.h> exists even on freestanding compilers. */ | ||
6391 | + | ||
6392 | #ifdef __STDC__ | ||
6393 | # include <limits.h> | ||
6394 | #else | ||
6395 | # include <assert.h> | ||
6396 | #endif | ||
6397 | + | ||
6398 | +#undef $ac_func | ||
6399 | + | ||
6400 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
6401 | #ifdef __cplusplus | ||
6402 | extern "C" | ||
6403 | @@ -8098,11 +8663,20 @@ | ||
6404 | _ACEOF | ||
6405 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6406 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6407 | - (eval $ac_link) 2>&5 | ||
6408 | + (eval $ac_link) 2>conftest.er1 | ||
6409 | ac_status=$? | ||
6410 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6411 | + rm -f conftest.er1 | ||
6412 | + cat conftest.err >&5 | ||
6413 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6414 | (exit $ac_status); } && | ||
6415 | - { ac_try='test -s conftest$ac_exeext' | ||
6416 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6417 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6418 | + (eval $ac_try) 2>&5 | ||
6419 | + ac_status=$? | ||
6420 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6421 | + (exit $ac_status); }; } && | ||
6422 | + { ac_try='test -s conftest$ac_exeext' | ||
6423 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6424 | (eval $ac_try) 2>&5 | ||
6425 | ac_status=$? | ||
6426 | @@ -8115,7 +8689,8 @@ | ||
6427 | |||
6428 | eval "$as_ac_var=no" | ||
6429 | fi | ||
6430 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
6431 | +rm -f conftest.err conftest.$ac_objext \ | ||
6432 | + conftest$ac_exeext conftest.$ac_ext | ||
6433 | fi | ||
6434 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
6435 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
6436 | @@ -8139,21 +8714,28 @@ | ||
6437 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6438 | else | ||
6439 | cat >conftest.$ac_ext <<_ACEOF | ||
6440 | -#line $LINENO "configure" | ||
6441 | /* confdefs.h. */ | ||
6442 | _ACEOF | ||
6443 | cat confdefs.h >>conftest.$ac_ext | ||
6444 | cat >>conftest.$ac_ext <<_ACEOF | ||
6445 | /* end confdefs.h. */ | ||
6446 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
6447 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
6448 | +#define $ac_func innocuous_$ac_func | ||
6449 | + | ||
6450 | /* System header to define __stub macros and hopefully few prototypes, | ||
6451 | which can conflict with char $ac_func (); below. | ||
6452 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
6453 | <limits.h> exists even on freestanding compilers. */ | ||
6454 | + | ||
6455 | #ifdef __STDC__ | ||
6456 | # include <limits.h> | ||
6457 | #else | ||
6458 | # include <assert.h> | ||
6459 | #endif | ||
6460 | + | ||
6461 | +#undef $ac_func | ||
6462 | + | ||
6463 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
6464 | #ifdef __cplusplus | ||
6465 | extern "C" | ||
6466 | @@ -8184,11 +8766,20 @@ | ||
6467 | _ACEOF | ||
6468 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6469 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6470 | - (eval $ac_link) 2>&5 | ||
6471 | + (eval $ac_link) 2>conftest.er1 | ||
6472 | ac_status=$? | ||
6473 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6474 | + rm -f conftest.er1 | ||
6475 | + cat conftest.err >&5 | ||
6476 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6477 | (exit $ac_status); } && | ||
6478 | - { ac_try='test -s conftest$ac_exeext' | ||
6479 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6480 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6481 | + (eval $ac_try) 2>&5 | ||
6482 | + ac_status=$? | ||
6483 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6484 | + (exit $ac_status); }; } && | ||
6485 | + { ac_try='test -s conftest$ac_exeext' | ||
6486 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6487 | (eval $ac_try) 2>&5 | ||
6488 | ac_status=$? | ||
6489 | @@ -8201,7 +8792,8 @@ | ||
6490 | |||
6491 | eval "$as_ac_var=no" | ||
6492 | fi | ||
6493 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
6494 | +rm -f conftest.err conftest.$ac_objext \ | ||
6495 | + conftest$ac_exeext conftest.$ac_ext | ||
6496 | fi | ||
6497 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
6498 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
6499 | @@ -8241,7 +8833,6 @@ | ||
6500 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6501 | else | ||
6502 | cat >conftest.$ac_ext <<_ACEOF | ||
6503 | -#line $LINENO "configure" | ||
6504 | /* confdefs.h. */ | ||
6505 | _ACEOF | ||
6506 | cat confdefs.h >>conftest.$ac_ext | ||
6507 | @@ -8259,11 +8850,20 @@ | ||
6508 | _ACEOF | ||
6509 | rm -f conftest.$ac_objext | ||
6510 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6511 | - (eval $ac_compile) 2>&5 | ||
6512 | + (eval $ac_compile) 2>conftest.er1 | ||
6513 | ac_status=$? | ||
6514 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6515 | + rm -f conftest.er1 | ||
6516 | + cat conftest.err >&5 | ||
6517 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6518 | (exit $ac_status); } && | ||
6519 | - { ac_try='test -s conftest.$ac_objext' | ||
6520 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6521 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6522 | + (eval $ac_try) 2>&5 | ||
6523 | + ac_status=$? | ||
6524 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6525 | + (exit $ac_status); }; } && | ||
6526 | + { ac_try='test -s conftest.$ac_objext' | ||
6527 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6528 | (eval $ac_try) 2>&5 | ||
6529 | ac_status=$? | ||
6530 | @@ -8276,7 +8876,7 @@ | ||
6531 | |||
6532 | ac_cv_type_mbstate_t=no | ||
6533 | fi | ||
6534 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6535 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6536 | fi | ||
6537 | echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 | ||
6538 | echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6 | ||
6539 | @@ -8300,7 +8900,6 @@ | ||
6540 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6541 | else | ||
6542 | cat >conftest.$ac_ext <<_ACEOF | ||
6543 | -#line $LINENO "configure" | ||
6544 | /* confdefs.h. */ | ||
6545 | _ACEOF | ||
6546 | cat confdefs.h >>conftest.$ac_ext | ||
6547 | @@ -8317,11 +8916,20 @@ | ||
6548 | _ACEOF | ||
6549 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6550 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6551 | - (eval $ac_link) 2>&5 | ||
6552 | + (eval $ac_link) 2>conftest.er1 | ||
6553 | ac_status=$? | ||
6554 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6555 | + rm -f conftest.er1 | ||
6556 | + cat conftest.err >&5 | ||
6557 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6558 | (exit $ac_status); } && | ||
6559 | - { ac_try='test -s conftest$ac_exeext' | ||
6560 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6561 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6562 | + (eval $ac_try) 2>&5 | ||
6563 | + ac_status=$? | ||
6564 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6565 | + (exit $ac_status); }; } && | ||
6566 | + { ac_try='test -s conftest$ac_exeext' | ||
6567 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6568 | (eval $ac_try) 2>&5 | ||
6569 | ac_status=$? | ||
6570 | @@ -8334,7 +8942,8 @@ | ||
6571 | |||
6572 | jm_cv_func_mbrtowc=no | ||
6573 | fi | ||
6574 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
6575 | +rm -f conftest.err conftest.$ac_objext \ | ||
6576 | + conftest$ac_exeext conftest.$ac_ext | ||
6577 | fi | ||
6578 | echo "$as_me:$LINENO: result: $jm_cv_func_mbrtowc" >&5 | ||
6579 | echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6 | ||
6580 | @@ -8348,69 +8957,465 @@ | ||
6581 | |||
6582 | |||
6583 | |||
6584 | - | ||
6585 | - | ||
6586 | - | ||
6587 | - | ||
6588 | -for ac_func in pathconf | ||
6589 | -do | ||
6590 | -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
6591 | -echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
6592 | -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
6593 | -if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
6594 | + echo "$as_me:$LINENO: checking whether free is declared" >&5 | ||
6595 | +echo $ECHO_N "checking whether free is declared... $ECHO_C" >&6 | ||
6596 | +if test "${ac_cv_have_decl_free+set}" = set; then | ||
6597 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6598 | else | ||
6599 | cat >conftest.$ac_ext <<_ACEOF | ||
6600 | -#line $LINENO "configure" | ||
6601 | /* confdefs.h. */ | ||
6602 | _ACEOF | ||
6603 | cat confdefs.h >>conftest.$ac_ext | ||
6604 | cat >>conftest.$ac_ext <<_ACEOF | ||
6605 | /* end confdefs.h. */ | ||
6606 | -/* System header to define __stub macros and hopefully few prototypes, | ||
6607 | - which can conflict with char $ac_func (); below. | ||
6608 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
6609 | - <limits.h> exists even on freestanding compilers. */ | ||
6610 | -#ifdef __STDC__ | ||
6611 | -# include <limits.h> | ||
6612 | -#else | ||
6613 | -# include <assert.h> | ||
6614 | -#endif | ||
6615 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
6616 | -#ifdef __cplusplus | ||
6617 | -extern "C" | ||
6618 | -{ | ||
6619 | -#endif | ||
6620 | -/* We use char because int might match the return type of a gcc2 | ||
6621 | - builtin and then its argument prototype would still apply. */ | ||
6622 | -char $ac_func (); | ||
6623 | -/* The GNU C library defines this for functions which it implements | ||
6624 | - to always fail with ENOSYS. Some functions are actually named | ||
6625 | - something starting with __ and the normal name is an alias. */ | ||
6626 | -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) | ||
6627 | -choke me | ||
6628 | -#else | ||
6629 | -char (*f) () = $ac_func; | ||
6630 | -#endif | ||
6631 | -#ifdef __cplusplus | ||
6632 | -} | ||
6633 | -#endif | ||
6634 | - | ||
6635 | +$ac_includes_default | ||
6636 | int | ||
6637 | main () | ||
6638 | { | ||
6639 | -return f != $ac_func; | ||
6640 | +#ifndef free | ||
6641 | + char *p = (char *) free; | ||
6642 | +#endif | ||
6643 | + | ||
6644 | ; | ||
6645 | return 0; | ||
6646 | } | ||
6647 | _ACEOF | ||
6648 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
6649 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6650 | - (eval $ac_link) 2>&5 | ||
6651 | +rm -f conftest.$ac_objext | ||
6652 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6653 | + (eval $ac_compile) 2>conftest.er1 | ||
6654 | + ac_status=$? | ||
6655 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6656 | + rm -f conftest.er1 | ||
6657 | + cat conftest.err >&5 | ||
6658 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6659 | + (exit $ac_status); } && | ||
6660 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6661 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6662 | + (eval $ac_try) 2>&5 | ||
6663 | + ac_status=$? | ||
6664 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6665 | + (exit $ac_status); }; } && | ||
6666 | + { ac_try='test -s conftest.$ac_objext' | ||
6667 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6668 | + (eval $ac_try) 2>&5 | ||
6669 | + ac_status=$? | ||
6670 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6671 | + (exit $ac_status); }; }; then | ||
6672 | + ac_cv_have_decl_free=yes | ||
6673 | +else | ||
6674 | + echo "$as_me: failed program was:" >&5 | ||
6675 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6676 | + | ||
6677 | +ac_cv_have_decl_free=no | ||
6678 | +fi | ||
6679 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6680 | +fi | ||
6681 | +echo "$as_me:$LINENO: result: $ac_cv_have_decl_free" >&5 | ||
6682 | +echo "${ECHO_T}$ac_cv_have_decl_free" >&6 | ||
6683 | +if test $ac_cv_have_decl_free = yes; then | ||
6684 | + | ||
6685 | +cat >>confdefs.h <<_ACEOF | ||
6686 | +#define HAVE_DECL_FREE 1 | ||
6687 | +_ACEOF | ||
6688 | + | ||
6689 | + | ||
6690 | +else | ||
6691 | + cat >>confdefs.h <<_ACEOF | ||
6692 | +#define HAVE_DECL_FREE 0 | ||
6693 | +_ACEOF | ||
6694 | + | ||
6695 | + | ||
6696 | +fi | ||
6697 | + | ||
6698 | + | ||
6699 | + | ||
6700 | + | ||
6701 | + | ||
6702 | + : | ||
6703 | + | ||
6704 | + | ||
6705 | + | ||
6706 | + | ||
6707 | + | ||
6708 | + echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 | ||
6709 | +echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 | ||
6710 | +if test "${ac_cv_header_stdbool_h+set}" = set; then | ||
6711 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6712 | +else | ||
6713 | + cat >conftest.$ac_ext <<_ACEOF | ||
6714 | +/* confdefs.h. */ | ||
6715 | +_ACEOF | ||
6716 | +cat confdefs.h >>conftest.$ac_ext | ||
6717 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6718 | +/* end confdefs.h. */ | ||
6719 | + | ||
6720 | + #include <stdbool.h> | ||
6721 | + #ifndef bool | ||
6722 | + "error: bool is not defined" | ||
6723 | + #endif | ||
6724 | + #ifndef false | ||
6725 | + "error: false is not defined" | ||
6726 | + #endif | ||
6727 | + #if false | ||
6728 | + "error: false is not 0" | ||
6729 | + #endif | ||
6730 | + #ifndef true | ||
6731 | + "error: false is not defined" | ||
6732 | + #endif | ||
6733 | + #if true != 1 | ||
6734 | + "error: true is not 1" | ||
6735 | + #endif | ||
6736 | + #ifndef __bool_true_false_are_defined | ||
6737 | + "error: __bool_true_false_are_defined is not defined" | ||
6738 | + #endif | ||
6739 | + | ||
6740 | + struct s { _Bool s: 1; _Bool t; } s; | ||
6741 | + | ||
6742 | + char a[true == 1 ? 1 : -1]; | ||
6743 | + char b[false == 0 ? 1 : -1]; | ||
6744 | + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
6745 | + char d[(bool) -0.5 == true ? 1 : -1]; | ||
6746 | + bool e = &s; | ||
6747 | + char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
6748 | + char g[true]; | ||
6749 | + char h[sizeof (_Bool)]; | ||
6750 | + char i[sizeof s.t]; | ||
6751 | + | ||
6752 | +int | ||
6753 | +main () | ||
6754 | +{ | ||
6755 | + return !a + !b + !c + !d + !e + !f + !g + !h + !i; | ||
6756 | + ; | ||
6757 | + return 0; | ||
6758 | +} | ||
6759 | +_ACEOF | ||
6760 | +rm -f conftest.$ac_objext | ||
6761 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6762 | + (eval $ac_compile) 2>conftest.er1 | ||
6763 | + ac_status=$? | ||
6764 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6765 | + rm -f conftest.er1 | ||
6766 | + cat conftest.err >&5 | ||
6767 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6768 | + (exit $ac_status); } && | ||
6769 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6770 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6771 | + (eval $ac_try) 2>&5 | ||
6772 | + ac_status=$? | ||
6773 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6774 | + (exit $ac_status); }; } && | ||
6775 | + { ac_try='test -s conftest.$ac_objext' | ||
6776 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6777 | + (eval $ac_try) 2>&5 | ||
6778 | + ac_status=$? | ||
6779 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6780 | + (exit $ac_status); }; }; then | ||
6781 | + ac_cv_header_stdbool_h=yes | ||
6782 | +else | ||
6783 | + echo "$as_me: failed program was:" >&5 | ||
6784 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6785 | + | ||
6786 | +ac_cv_header_stdbool_h=no | ||
6787 | +fi | ||
6788 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6789 | +fi | ||
6790 | +echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 | ||
6791 | +echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 | ||
6792 | + echo "$as_me:$LINENO: checking for _Bool" >&5 | ||
6793 | +echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 | ||
6794 | +if test "${ac_cv_type__Bool+set}" = set; then | ||
6795 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6796 | +else | ||
6797 | + cat >conftest.$ac_ext <<_ACEOF | ||
6798 | +/* confdefs.h. */ | ||
6799 | +_ACEOF | ||
6800 | +cat confdefs.h >>conftest.$ac_ext | ||
6801 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6802 | +/* end confdefs.h. */ | ||
6803 | +$ac_includes_default | ||
6804 | +int | ||
6805 | +main () | ||
6806 | +{ | ||
6807 | +if ((_Bool *) 0) | ||
6808 | + return 0; | ||
6809 | +if (sizeof (_Bool)) | ||
6810 | + return 0; | ||
6811 | + ; | ||
6812 | + return 0; | ||
6813 | +} | ||
6814 | +_ACEOF | ||
6815 | +rm -f conftest.$ac_objext | ||
6816 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6817 | + (eval $ac_compile) 2>conftest.er1 | ||
6818 | + ac_status=$? | ||
6819 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6820 | + rm -f conftest.er1 | ||
6821 | + cat conftest.err >&5 | ||
6822 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6823 | + (exit $ac_status); } && | ||
6824 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6825 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6826 | + (eval $ac_try) 2>&5 | ||
6827 | + ac_status=$? | ||
6828 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6829 | + (exit $ac_status); }; } && | ||
6830 | + { ac_try='test -s conftest.$ac_objext' | ||
6831 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6832 | + (eval $ac_try) 2>&5 | ||
6833 | + ac_status=$? | ||
6834 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6835 | + (exit $ac_status); }; }; then | ||
6836 | + ac_cv_type__Bool=yes | ||
6837 | +else | ||
6838 | + echo "$as_me: failed program was:" >&5 | ||
6839 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6840 | + | ||
6841 | +ac_cv_type__Bool=no | ||
6842 | +fi | ||
6843 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6844 | +fi | ||
6845 | +echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 | ||
6846 | +echo "${ECHO_T}$ac_cv_type__Bool" >&6 | ||
6847 | +if test $ac_cv_type__Bool = yes; then | ||
6848 | + | ||
6849 | +cat >>confdefs.h <<_ACEOF | ||
6850 | +#define HAVE__BOOL 1 | ||
6851 | +_ACEOF | ||
6852 | + | ||
6853 | + | ||
6854 | +fi | ||
6855 | + | ||
6856 | + if test $ac_cv_header_stdbool_h = yes; then | ||
6857 | + | ||
6858 | +cat >>confdefs.h <<\_ACEOF | ||
6859 | +#define HAVE_STDBOOL_H 1 | ||
6860 | +_ACEOF | ||
6861 | + | ||
6862 | + fi | ||
6863 | + | ||
6864 | + : | ||
6865 | + | ||
6866 | + | ||
6867 | + | ||
6868 | + | ||
6869 | + | ||
6870 | + | ||
6871 | + | ||
6872 | + | ||
6873 | + | ||
6874 | + | ||
6875 | +echo "$as_me:$LINENO: checking for nanosecond timestamps in struct stat" >&5 | ||
6876 | +echo $ECHO_N "checking for nanosecond timestamps in struct stat... $ECHO_C" >&6 | ||
6877 | +if test "${ac_cv_stat_nsec+set}" = set; then | ||
6878 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6879 | +else | ||
6880 | + cat >conftest.$ac_ext <<_ACEOF | ||
6881 | +/* confdefs.h. */ | ||
6882 | +_ACEOF | ||
6883 | +cat confdefs.h >>conftest.$ac_ext | ||
6884 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6885 | +/* end confdefs.h. */ | ||
6886 | + | ||
6887 | + #include <sys/types.h> | ||
6888 | + #include <sys/stat.h> | ||
6889 | + #include <unistd.h> | ||
6890 | + struct stat st; | ||
6891 | + | ||
6892 | +int | ||
6893 | +main () | ||
6894 | +{ | ||
6895 | + return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; | ||
6896 | + ; | ||
6897 | + return 0; | ||
6898 | +} | ||
6899 | +_ACEOF | ||
6900 | +rm -f conftest.$ac_objext | ||
6901 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6902 | + (eval $ac_compile) 2>conftest.er1 | ||
6903 | ac_status=$? | ||
6904 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6905 | + rm -f conftest.er1 | ||
6906 | + cat conftest.err >&5 | ||
6907 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6908 | (exit $ac_status); } && | ||
6909 | - { ac_try='test -s conftest$ac_exeext' | ||
6910 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6911 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6912 | + (eval $ac_try) 2>&5 | ||
6913 | + ac_status=$? | ||
6914 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6915 | + (exit $ac_status); }; } && | ||
6916 | + { ac_try='test -s conftest.$ac_objext' | ||
6917 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6918 | + (eval $ac_try) 2>&5 | ||
6919 | + ac_status=$? | ||
6920 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6921 | + (exit $ac_status); }; }; then | ||
6922 | + ac_cv_stat_nsec=yes | ||
6923 | +else | ||
6924 | + echo "$as_me: failed program was:" >&5 | ||
6925 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6926 | + | ||
6927 | +ac_cv_stat_nsec=no | ||
6928 | +fi | ||
6929 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6930 | + | ||
6931 | +fi | ||
6932 | +echo "$as_me:$LINENO: result: $ac_cv_stat_nsec" >&5 | ||
6933 | +echo "${ECHO_T}$ac_cv_stat_nsec" >&6 | ||
6934 | + if test $ac_cv_stat_nsec = yes; then | ||
6935 | + | ||
6936 | +cat >>confdefs.h <<\_ACEOF | ||
6937 | +#define HAVE_STAT_NSEC 1 | ||
6938 | +_ACEOF | ||
6939 | + | ||
6940 | + fi | ||
6941 | + | ||
6942 | + echo "$as_me:$LINENO: checking for nanosecond timestamps in struct stat" >&5 | ||
6943 | +echo $ECHO_N "checking for nanosecond timestamps in struct stat... $ECHO_C" >&6 | ||
6944 | +if test "${ac_cv_stat_timeval+set}" = set; then | ||
6945 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6946 | +else | ||
6947 | + cat >conftest.$ac_ext <<_ACEOF | ||
6948 | +/* confdefs.h. */ | ||
6949 | +_ACEOF | ||
6950 | +cat confdefs.h >>conftest.$ac_ext | ||
6951 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6952 | +/* end confdefs.h. */ | ||
6953 | + | ||
6954 | + #include <time.h> | ||
6955 | + #include <sys/types.h> | ||
6956 | + #include <sys/stat.h> | ||
6957 | + #include <unistd.h> | ||
6958 | + struct stat st; | ||
6959 | + | ||
6960 | +int | ||
6961 | +main () | ||
6962 | +{ | ||
6963 | + return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; | ||
6964 | + ; | ||
6965 | + return 0; | ||
6966 | +} | ||
6967 | +_ACEOF | ||
6968 | +rm -f conftest.$ac_objext | ||
6969 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6970 | + (eval $ac_compile) 2>conftest.er1 | ||
6971 | + ac_status=$? | ||
6972 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6973 | + rm -f conftest.er1 | ||
6974 | + cat conftest.err >&5 | ||
6975 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6976 | + (exit $ac_status); } && | ||
6977 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6978 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6979 | + (eval $ac_try) 2>&5 | ||
6980 | + ac_status=$? | ||
6981 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6982 | + (exit $ac_status); }; } && | ||
6983 | + { ac_try='test -s conftest.$ac_objext' | ||
6984 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6985 | + (eval $ac_try) 2>&5 | ||
6986 | + ac_status=$? | ||
6987 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6988 | + (exit $ac_status); }; }; then | ||
6989 | + ac_cv_stat_timeval=yes | ||
6990 | +else | ||
6991 | + echo "$as_me: failed program was:" >&5 | ||
6992 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6993 | + | ||
6994 | +ac_cv_stat_timeval=no | ||
6995 | +fi | ||
6996 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6997 | + | ||
6998 | +fi | ||
6999 | +echo "$as_me:$LINENO: result: $ac_cv_stat_timeval" >&5 | ||
7000 | +echo "${ECHO_T}$ac_cv_stat_timeval" >&6 | ||
7001 | + if test $ac_cv_stat_timeval = yes; then | ||
7002 | + | ||
7003 | +cat >>confdefs.h <<\_ACEOF | ||
7004 | +#define HAVE_STAT_TIMEVAL 1 | ||
7005 | +_ACEOF | ||
7006 | + | ||
7007 | + fi | ||
7008 | + | ||
7009 | + | ||
7010 | + | ||
7011 | + | ||
7012 | + | ||
7013 | +for ac_func in pathconf | ||
7014 | +do | ||
7015 | +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
7016 | +echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
7017 | +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
7018 | +if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
7019 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7020 | +else | ||
7021 | + cat >conftest.$ac_ext <<_ACEOF | ||
7022 | +/* confdefs.h. */ | ||
7023 | +_ACEOF | ||
7024 | +cat confdefs.h >>conftest.$ac_ext | ||
7025 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7026 | +/* end confdefs.h. */ | ||
7027 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7028 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7029 | +#define $ac_func innocuous_$ac_func | ||
7030 | + | ||
7031 | +/* System header to define __stub macros and hopefully few prototypes, | ||
7032 | + which can conflict with char $ac_func (); below. | ||
7033 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7034 | + <limits.h> exists even on freestanding compilers. */ | ||
7035 | + | ||
7036 | +#ifdef __STDC__ | ||
7037 | +# include <limits.h> | ||
7038 | +#else | ||
7039 | +# include <assert.h> | ||
7040 | +#endif | ||
7041 | + | ||
7042 | +#undef $ac_func | ||
7043 | + | ||
7044 | +/* Override any gcc2 internal prototype to avoid an error. */ | ||
7045 | +#ifdef __cplusplus | ||
7046 | +extern "C" | ||
7047 | +{ | ||
7048 | +#endif | ||
7049 | +/* We use char because int might match the return type of a gcc2 | ||
7050 | + builtin and then its argument prototype would still apply. */ | ||
7051 | +char $ac_func (); | ||
7052 | +/* The GNU C library defines this for functions which it implements | ||
7053 | + to always fail with ENOSYS. Some functions are actually named | ||
7054 | + something starting with __ and the normal name is an alias. */ | ||
7055 | +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) | ||
7056 | +choke me | ||
7057 | +#else | ||
7058 | +char (*f) () = $ac_func; | ||
7059 | +#endif | ||
7060 | +#ifdef __cplusplus | ||
7061 | +} | ||
7062 | +#endif | ||
7063 | + | ||
7064 | +int | ||
7065 | +main () | ||
7066 | +{ | ||
7067 | +return f != $ac_func; | ||
7068 | + ; | ||
7069 | + return 0; | ||
7070 | +} | ||
7071 | +_ACEOF | ||
7072 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
7073 | +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7074 | + (eval $ac_link) 2>conftest.er1 | ||
7075 | + ac_status=$? | ||
7076 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7077 | + rm -f conftest.er1 | ||
7078 | + cat conftest.err >&5 | ||
7079 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7080 | + (exit $ac_status); } && | ||
7081 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7082 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7083 | + (eval $ac_try) 2>&5 | ||
7084 | + ac_status=$? | ||
7085 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7086 | + (exit $ac_status); }; } && | ||
7087 | + { ac_try='test -s conftest$ac_exeext' | ||
7088 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7089 | (eval $ac_try) 2>&5 | ||
7090 | ac_status=$? | ||
7091 | @@ -8423,7 +9428,8 @@ | ||
7092 | |||
7093 | eval "$as_ac_var=no" | ||
7094 | fi | ||
7095 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7096 | +rm -f conftest.err conftest.$ac_objext \ | ||
7097 | + conftest$ac_exeext conftest.$ac_ext | ||
7098 | fi | ||
7099 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
7100 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
7101 | @@ -8454,7 +9460,6 @@ | ||
7102 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
7103 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
7104 | cat >conftest.$ac_ext <<_ACEOF | ||
7105 | -#line $LINENO "configure" | ||
7106 | /* confdefs.h. */ | ||
7107 | _ACEOF | ||
7108 | cat confdefs.h >>conftest.$ac_ext | ||
7109 | @@ -8465,11 +9470,20 @@ | ||
7110 | _ACEOF | ||
7111 | rm -f conftest.$ac_objext | ||
7112 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7113 | - (eval $ac_compile) 2>&5 | ||
7114 | + (eval $ac_compile) 2>conftest.er1 | ||
7115 | ac_status=$? | ||
7116 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7117 | + rm -f conftest.er1 | ||
7118 | + cat conftest.err >&5 | ||
7119 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7120 | (exit $ac_status); } && | ||
7121 | - { ac_try='test -s conftest.$ac_objext' | ||
7122 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7123 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7124 | + (eval $ac_try) 2>&5 | ||
7125 | + ac_status=$? | ||
7126 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7127 | + (exit $ac_status); }; } && | ||
7128 | + { ac_try='test -s conftest.$ac_objext' | ||
7129 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7130 | (eval $ac_try) 2>&5 | ||
7131 | ac_status=$? | ||
7132 | @@ -8482,7 +9496,7 @@ | ||
7133 | |||
7134 | ac_header_compiler=no | ||
7135 | fi | ||
7136 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7137 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7138 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
7139 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
7140 | |||
7141 | @@ -8490,7 +9504,6 @@ | ||
7142 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
7143 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
7144 | cat >conftest.$ac_ext <<_ACEOF | ||
7145 | -#line $LINENO "configure" | ||
7146 | /* confdefs.h. */ | ||
7147 | _ACEOF | ||
7148 | cat confdefs.h >>conftest.$ac_ext | ||
7149 | @@ -8508,6 +9521,7 @@ | ||
7150 | (exit $ac_status); } >/dev/null; then | ||
7151 | if test -s conftest.err; then | ||
7152 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
7153 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
7154 | else | ||
7155 | ac_cpp_err= | ||
7156 | fi | ||
7157 | @@ -8527,33 +9541,32 @@ | ||
7158 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
7159 | |||
7160 | # So? What about this header? | ||
7161 | -case $ac_header_compiler:$ac_header_preproc in | ||
7162 | - yes:no ) | ||
7163 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
7164 | + yes:no: ) | ||
7165 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
7166 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
7167 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
7168 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
7169 | - ( | ||
7170 | - cat <<\_ASBOX | ||
7171 | -## ------------------------------------ ## | ||
7172 | -## Report this to bug-autoconf@gnu.org. ## | ||
7173 | -## ------------------------------------ ## | ||
7174 | -_ASBOX | ||
7175 | - ) | | ||
7176 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
7177 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
7178 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
7179 | + ac_header_preproc=yes | ||
7180 | ;; | ||
7181 | - no:yes ) | ||
7182 | + no:yes:* ) | ||
7183 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
7184 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
7185 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
7186 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
7187 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
7188 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
7189 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
7190 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
7191 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
7192 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
7193 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
7194 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
7195 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
7196 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
7197 | ( | ||
7198 | cat <<\_ASBOX | ||
7199 | -## ------------------------------------ ## | ||
7200 | -## Report this to bug-autoconf@gnu.org. ## | ||
7201 | -## ------------------------------------ ## | ||
7202 | +## -------------------------------- ## | ||
7203 | +## Report this to bug-patch@gnu.org ## | ||
7204 | +## -------------------------------- ## | ||
7205 | _ASBOX | ||
7206 | ) | | ||
7207 | sed "s/^/$as_me: WARNING: /" >&2 | ||
7208 | @@ -8564,7 +9577,7 @@ | ||
7209 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
7210 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7211 | else | ||
7212 | - eval "$as_ac_Header=$ac_header_preproc" | ||
7213 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
7214 | fi | ||
7215 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7216 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
7217 | @@ -8587,7 +9600,6 @@ | ||
7218 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7219 | else | ||
7220 | cat >conftest.$ac_ext <<_ACEOF | ||
7221 | -#line $LINENO "configure" | ||
7222 | /* confdefs.h. */ | ||
7223 | _ACEOF | ||
7224 | cat confdefs.h >>conftest.$ac_ext | ||
7225 | @@ -8607,11 +9619,20 @@ | ||
7226 | _ACEOF | ||
7227 | rm -f conftest.$ac_objext | ||
7228 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7229 | - (eval $ac_compile) 2>&5 | ||
7230 | + (eval $ac_compile) 2>conftest.er1 | ||
7231 | ac_status=$? | ||
7232 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7233 | + rm -f conftest.er1 | ||
7234 | + cat conftest.err >&5 | ||
7235 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7236 | (exit $ac_status); } && | ||
7237 | - { ac_try='test -s conftest.$ac_objext' | ||
7238 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7239 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7240 | + (eval $ac_try) 2>&5 | ||
7241 | + ac_status=$? | ||
7242 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7243 | + (exit $ac_status); }; } && | ||
7244 | + { ac_try='test -s conftest.$ac_objext' | ||
7245 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7246 | (eval $ac_try) 2>&5 | ||
7247 | ac_status=$? | ||
7248 | @@ -8624,7 +9645,7 @@ | ||
7249 | |||
7250 | ac_cv_have_decl_free=no | ||
7251 | fi | ||
7252 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7253 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7254 | fi | ||
7255 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_free" >&5 | ||
7256 | echo "${ECHO_T}$ac_cv_have_decl_free" >&6 | ||
7257 | @@ -8648,7 +9669,6 @@ | ||
7258 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7259 | else | ||
7260 | cat >conftest.$ac_ext <<_ACEOF | ||
7261 | -#line $LINENO "configure" | ||
7262 | /* confdefs.h. */ | ||
7263 | _ACEOF | ||
7264 | cat confdefs.h >>conftest.$ac_ext | ||
7265 | @@ -8668,11 +9688,20 @@ | ||
7266 | _ACEOF | ||
7267 | rm -f conftest.$ac_objext | ||
7268 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7269 | - (eval $ac_compile) 2>&5 | ||
7270 | + (eval $ac_compile) 2>conftest.er1 | ||
7271 | ac_status=$? | ||
7272 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7273 | + rm -f conftest.er1 | ||
7274 | + cat conftest.err >&5 | ||
7275 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7276 | (exit $ac_status); } && | ||
7277 | - { ac_try='test -s conftest.$ac_objext' | ||
7278 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7279 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7280 | + (eval $ac_try) 2>&5 | ||
7281 | + ac_status=$? | ||
7282 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7283 | + (exit $ac_status); }; } && | ||
7284 | + { ac_try='test -s conftest.$ac_objext' | ||
7285 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7286 | (eval $ac_try) 2>&5 | ||
7287 | ac_status=$? | ||
7288 | @@ -8685,7 +9714,7 @@ | ||
7289 | |||
7290 | ac_cv_have_decl_getenv=no | ||
7291 | fi | ||
7292 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7293 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7294 | fi | ||
7295 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5 | ||
7296 | echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6 | ||
7297 | @@ -8709,7 +9738,6 @@ | ||
7298 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7299 | else | ||
7300 | cat >conftest.$ac_ext <<_ACEOF | ||
7301 | -#line $LINENO "configure" | ||
7302 | /* confdefs.h. */ | ||
7303 | _ACEOF | ||
7304 | cat confdefs.h >>conftest.$ac_ext | ||
7305 | @@ -8729,11 +9757,20 @@ | ||
7306 | _ACEOF | ||
7307 | rm -f conftest.$ac_objext | ||
7308 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7309 | - (eval $ac_compile) 2>&5 | ||
7310 | + (eval $ac_compile) 2>conftest.er1 | ||
7311 | ac_status=$? | ||
7312 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7313 | + rm -f conftest.er1 | ||
7314 | + cat conftest.err >&5 | ||
7315 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7316 | (exit $ac_status); } && | ||
7317 | - { ac_try='test -s conftest.$ac_objext' | ||
7318 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7319 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7320 | + (eval $ac_try) 2>&5 | ||
7321 | + ac_status=$? | ||
7322 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7323 | + (exit $ac_status); }; } && | ||
7324 | + { ac_try='test -s conftest.$ac_objext' | ||
7325 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7326 | (eval $ac_try) 2>&5 | ||
7327 | ac_status=$? | ||
7328 | @@ -8746,7 +9783,7 @@ | ||
7329 | |||
7330 | ac_cv_have_decl_malloc=no | ||
7331 | fi | ||
7332 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7333 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7334 | fi | ||
7335 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_malloc" >&5 | ||
7336 | echo "${ECHO_T}$ac_cv_have_decl_malloc" >&6 | ||
7337 | @@ -8770,7 +9807,6 @@ | ||
7338 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7339 | else | ||
7340 | cat >conftest.$ac_ext <<_ACEOF | ||
7341 | -#line $LINENO "configure" | ||
7342 | /* confdefs.h. */ | ||
7343 | _ACEOF | ||
7344 | cat confdefs.h >>conftest.$ac_ext | ||
7345 | @@ -8790,11 +9826,20 @@ | ||
7346 | _ACEOF | ||
7347 | rm -f conftest.$ac_objext | ||
7348 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7349 | - (eval $ac_compile) 2>&5 | ||
7350 | + (eval $ac_compile) 2>conftest.er1 | ||
7351 | ac_status=$? | ||
7352 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7353 | + rm -f conftest.er1 | ||
7354 | + cat conftest.err >&5 | ||
7355 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7356 | (exit $ac_status); } && | ||
7357 | - { ac_try='test -s conftest.$ac_objext' | ||
7358 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7359 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7360 | + (eval $ac_try) 2>&5 | ||
7361 | + ac_status=$? | ||
7362 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7363 | + (exit $ac_status); }; } && | ||
7364 | + { ac_try='test -s conftest.$ac_objext' | ||
7365 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7366 | (eval $ac_try) 2>&5 | ||
7367 | ac_status=$? | ||
7368 | @@ -8807,7 +9852,7 @@ | ||
7369 | |||
7370 | ac_cv_have_decl_mktemp=no | ||
7371 | fi | ||
7372 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7373 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7374 | fi | ||
7375 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_mktemp" >&5 | ||
7376 | echo "${ECHO_T}$ac_cv_have_decl_mktemp" >&6 | ||
7377 | @@ -8849,21 +9894,28 @@ | ||
7378 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7379 | else | ||
7380 | cat >conftest.$ac_ext <<_ACEOF | ||
7381 | -#line $LINENO "configure" | ||
7382 | /* confdefs.h. */ | ||
7383 | _ACEOF | ||
7384 | cat confdefs.h >>conftest.$ac_ext | ||
7385 | cat >>conftest.$ac_ext <<_ACEOF | ||
7386 | /* end confdefs.h. */ | ||
7387 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7388 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7389 | +#define $ac_func innocuous_$ac_func | ||
7390 | + | ||
7391 | /* System header to define __stub macros and hopefully few prototypes, | ||
7392 | which can conflict with char $ac_func (); below. | ||
7393 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7394 | <limits.h> exists even on freestanding compilers. */ | ||
7395 | + | ||
7396 | #ifdef __STDC__ | ||
7397 | # include <limits.h> | ||
7398 | #else | ||
7399 | # include <assert.h> | ||
7400 | #endif | ||
7401 | + | ||
7402 | +#undef $ac_func | ||
7403 | + | ||
7404 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7405 | #ifdef __cplusplus | ||
7406 | extern "C" | ||
7407 | @@ -8894,11 +9946,20 @@ | ||
7408 | _ACEOF | ||
7409 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7410 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7411 | - (eval $ac_link) 2>&5 | ||
7412 | + (eval $ac_link) 2>conftest.er1 | ||
7413 | ac_status=$? | ||
7414 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7415 | + rm -f conftest.er1 | ||
7416 | + cat conftest.err >&5 | ||
7417 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7418 | (exit $ac_status); } && | ||
7419 | - { ac_try='test -s conftest$ac_exeext' | ||
7420 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7421 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7422 | + (eval $ac_try) 2>&5 | ||
7423 | + ac_status=$? | ||
7424 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7425 | + (exit $ac_status); }; } && | ||
7426 | + { ac_try='test -s conftest$ac_exeext' | ||
7427 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7428 | (eval $ac_try) 2>&5 | ||
7429 | ac_status=$? | ||
7430 | @@ -8911,7 +9972,8 @@ | ||
7431 | |||
7432 | eval "$as_ac_var=no" | ||
7433 | fi | ||
7434 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7435 | +rm -f conftest.err conftest.$ac_objext \ | ||
7436 | + conftest$ac_exeext conftest.$ac_ext | ||
7437 | fi | ||
7438 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
7439 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
7440 | @@ -8934,21 +9996,28 @@ | ||
7441 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7442 | else | ||
7443 | cat >conftest.$ac_ext <<_ACEOF | ||
7444 | -#line $LINENO "configure" | ||
7445 | /* confdefs.h. */ | ||
7446 | _ACEOF | ||
7447 | cat confdefs.h >>conftest.$ac_ext | ||
7448 | cat >>conftest.$ac_ext <<_ACEOF | ||
7449 | /* end confdefs.h. */ | ||
7450 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7451 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7452 | +#define $ac_func innocuous_$ac_func | ||
7453 | + | ||
7454 | /* System header to define __stub macros and hopefully few prototypes, | ||
7455 | which can conflict with char $ac_func (); below. | ||
7456 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7457 | <limits.h> exists even on freestanding compilers. */ | ||
7458 | + | ||
7459 | #ifdef __STDC__ | ||
7460 | # include <limits.h> | ||
7461 | #else | ||
7462 | # include <assert.h> | ||
7463 | #endif | ||
7464 | + | ||
7465 | +#undef $ac_func | ||
7466 | + | ||
7467 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7468 | #ifdef __cplusplus | ||
7469 | extern "C" | ||
7470 | @@ -8979,11 +10048,20 @@ | ||
7471 | _ACEOF | ||
7472 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7473 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7474 | - (eval $ac_link) 2>&5 | ||
7475 | + (eval $ac_link) 2>conftest.er1 | ||
7476 | ac_status=$? | ||
7477 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7478 | + rm -f conftest.er1 | ||
7479 | + cat conftest.err >&5 | ||
7480 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7481 | (exit $ac_status); } && | ||
7482 | - { ac_try='test -s conftest$ac_exeext' | ||
7483 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7484 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7485 | + (eval $ac_try) 2>&5 | ||
7486 | + ac_status=$? | ||
7487 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7488 | + (exit $ac_status); }; } && | ||
7489 | + { ac_try='test -s conftest$ac_exeext' | ||
7490 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7491 | (eval $ac_try) 2>&5 | ||
7492 | ac_status=$? | ||
7493 | @@ -8996,7 +10074,8 @@ | ||
7494 | |||
7495 | eval "$as_ac_var=no" | ||
7496 | fi | ||
7497 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7498 | +rm -f conftest.err conftest.$ac_objext \ | ||
7499 | + conftest$ac_exeext conftest.$ac_ext | ||
7500 | fi | ||
7501 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
7502 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
7503 | @@ -9006,7 +10085,14 @@ | ||
7504 | _ACEOF | ||
7505 | |||
7506 | else | ||
7507 | - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" | ||
7508 | + case $LIBOBJS in | ||
7509 | + "$ac_func.$ac_objext" | \ | ||
7510 | + *" $ac_func.$ac_objext" | \ | ||
7511 | + "$ac_func.$ac_objext "* | \ | ||
7512 | + *" $ac_func.$ac_objext "* ) ;; | ||
7513 | + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; | ||
7514 | +esac | ||
7515 | + | ||
7516 | fi | ||
7517 | done | ||
7518 | |||
7519 | @@ -9019,7 +10105,6 @@ | ||
7520 | while :; do | ||
7521 | ac_cv_sys_largefile_source=no | ||
7522 | cat >conftest.$ac_ext <<_ACEOF | ||
7523 | -#line $LINENO "configure" | ||
7524 | /* confdefs.h. */ | ||
7525 | _ACEOF | ||
7526 | cat confdefs.h >>conftest.$ac_ext | ||
7527 | @@ -9036,11 +10121,20 @@ | ||
7528 | _ACEOF | ||
7529 | rm -f conftest.$ac_objext | ||
7530 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7531 | - (eval $ac_compile) 2>&5 | ||
7532 | + (eval $ac_compile) 2>conftest.er1 | ||
7533 | ac_status=$? | ||
7534 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7535 | + rm -f conftest.er1 | ||
7536 | + cat conftest.err >&5 | ||
7537 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7538 | (exit $ac_status); } && | ||
7539 | - { ac_try='test -s conftest.$ac_objext' | ||
7540 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7541 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7542 | + (eval $ac_try) 2>&5 | ||
7543 | + ac_status=$? | ||
7544 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7545 | + (exit $ac_status); }; } && | ||
7546 | + { ac_try='test -s conftest.$ac_objext' | ||
7547 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7548 | (eval $ac_try) 2>&5 | ||
7549 | ac_status=$? | ||
7550 | @@ -9052,9 +10146,8 @@ | ||
7551 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7552 | |||
7553 | fi | ||
7554 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7555 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7556 | cat >conftest.$ac_ext <<_ACEOF | ||
7557 | -#line $LINENO "configure" | ||
7558 | /* confdefs.h. */ | ||
7559 | _ACEOF | ||
7560 | cat confdefs.h >>conftest.$ac_ext | ||
7561 | @@ -9072,11 +10165,20 @@ | ||
7562 | _ACEOF | ||
7563 | rm -f conftest.$ac_objext | ||
7564 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7565 | - (eval $ac_compile) 2>&5 | ||
7566 | + (eval $ac_compile) 2>conftest.er1 | ||
7567 | ac_status=$? | ||
7568 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7569 | + rm -f conftest.er1 | ||
7570 | + cat conftest.err >&5 | ||
7571 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7572 | (exit $ac_status); } && | ||
7573 | - { ac_try='test -s conftest.$ac_objext' | ||
7574 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7575 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7576 | + (eval $ac_try) 2>&5 | ||
7577 | + ac_status=$? | ||
7578 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7579 | + (exit $ac_status); }; } && | ||
7580 | + { ac_try='test -s conftest.$ac_objext' | ||
7581 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7582 | (eval $ac_try) 2>&5 | ||
7583 | ac_status=$? | ||
7584 | @@ -9088,7 +10190,7 @@ | ||
7585 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7586 | |||
7587 | fi | ||
7588 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7589 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7590 | break | ||
7591 | done | ||
7592 | fi | ||
7593 | @@ -9112,7 +10214,6 @@ | ||
7594 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7595 | else | ||
7596 | cat >conftest.$ac_ext <<_ACEOF | ||
7597 | -#line $LINENO "configure" | ||
7598 | /* confdefs.h. */ | ||
7599 | _ACEOF | ||
7600 | cat confdefs.h >>conftest.$ac_ext | ||
7601 | @@ -9129,11 +10230,20 @@ | ||
7602 | _ACEOF | ||
7603 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7604 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7605 | - (eval $ac_link) 2>&5 | ||
7606 | + (eval $ac_link) 2>conftest.er1 | ||
7607 | ac_status=$? | ||
7608 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7609 | + rm -f conftest.er1 | ||
7610 | + cat conftest.err >&5 | ||
7611 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7612 | (exit $ac_status); } && | ||
7613 | - { ac_try='test -s conftest$ac_exeext' | ||
7614 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7615 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7616 | + (eval $ac_try) 2>&5 | ||
7617 | + ac_status=$? | ||
7618 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7619 | + (exit $ac_status); }; } && | ||
7620 | + { ac_try='test -s conftest$ac_exeext' | ||
7621 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7622 | (eval $ac_try) 2>&5 | ||
7623 | ac_status=$? | ||
7624 | @@ -9146,7 +10256,8 @@ | ||
7625 | |||
7626 | ac_cv_func_fseeko=no | ||
7627 | fi | ||
7628 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7629 | +rm -f conftest.err conftest.$ac_objext \ | ||
7630 | + conftest$ac_exeext conftest.$ac_ext | ||
7631 | fi | ||
7632 | echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5 | ||
7633 | echo "${ECHO_T}$ac_cv_func_fseeko" >&6 | ||
7634 | @@ -9165,7 +10276,6 @@ | ||
7635 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7636 | else | ||
7637 | cat >conftest.$ac_ext <<_ACEOF | ||
7638 | -#line $LINENO "configure" | ||
7639 | /* confdefs.h. */ | ||
7640 | _ACEOF | ||
7641 | cat confdefs.h >>conftest.$ac_ext | ||
7642 | @@ -9185,11 +10295,20 @@ | ||
7643 | _ACEOF | ||
7644 | rm -f conftest.$ac_objext | ||
7645 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7646 | - (eval $ac_compile) 2>&5 | ||
7647 | + (eval $ac_compile) 2>conftest.er1 | ||
7648 | ac_status=$? | ||
7649 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7650 | + rm -f conftest.er1 | ||
7651 | + cat conftest.err >&5 | ||
7652 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7653 | (exit $ac_status); } && | ||
7654 | - { ac_try='test -s conftest.$ac_objext' | ||
7655 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7656 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7657 | + (eval $ac_try) 2>&5 | ||
7658 | + ac_status=$? | ||
7659 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7660 | + (exit $ac_status); }; } && | ||
7661 | + { ac_try='test -s conftest.$ac_objext' | ||
7662 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7663 | (eval $ac_try) 2>&5 | ||
7664 | ac_status=$? | ||
7665 | @@ -9202,7 +10321,7 @@ | ||
7666 | |||
7667 | ac_cv_have_decl_clearerr_unlocked=no | ||
7668 | fi | ||
7669 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7670 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7671 | fi | ||
7672 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_clearerr_unlocked" >&5 | ||
7673 | echo "${ECHO_T}$ac_cv_have_decl_clearerr_unlocked" >&6 | ||
7674 | @@ -9230,7 +10349,6 @@ | ||
7675 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7676 | else | ||
7677 | cat >conftest.$ac_ext <<_ACEOF | ||
7678 | -#line $LINENO "configure" | ||
7679 | /* confdefs.h. */ | ||
7680 | _ACEOF | ||
7681 | cat confdefs.h >>conftest.$ac_ext | ||
7682 | @@ -9250,11 +10368,20 @@ | ||
7683 | _ACEOF | ||
7684 | rm -f conftest.$ac_objext | ||
7685 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7686 | - (eval $ac_compile) 2>&5 | ||
7687 | + (eval $ac_compile) 2>conftest.er1 | ||
7688 | ac_status=$? | ||
7689 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7690 | + rm -f conftest.er1 | ||
7691 | + cat conftest.err >&5 | ||
7692 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7693 | (exit $ac_status); } && | ||
7694 | - { ac_try='test -s conftest.$ac_objext' | ||
7695 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7696 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7697 | + (eval $ac_try) 2>&5 | ||
7698 | + ac_status=$? | ||
7699 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7700 | + (exit $ac_status); }; } && | ||
7701 | + { ac_try='test -s conftest.$ac_objext' | ||
7702 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7703 | (eval $ac_try) 2>&5 | ||
7704 | ac_status=$? | ||
7705 | @@ -9267,7 +10394,7 @@ | ||
7706 | |||
7707 | ac_cv_have_decl_feof_unlocked=no | ||
7708 | fi | ||
7709 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7710 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7711 | fi | ||
7712 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5 | ||
7713 | echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6 | ||
7714 | @@ -9295,7 +10422,6 @@ | ||
7715 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7716 | else | ||
7717 | cat >conftest.$ac_ext <<_ACEOF | ||
7718 | -#line $LINENO "configure" | ||
7719 | /* confdefs.h. */ | ||
7720 | _ACEOF | ||
7721 | cat confdefs.h >>conftest.$ac_ext | ||
7722 | @@ -9315,11 +10441,20 @@ | ||
7723 | _ACEOF | ||
7724 | rm -f conftest.$ac_objext | ||
7725 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7726 | - (eval $ac_compile) 2>&5 | ||
7727 | + (eval $ac_compile) 2>conftest.er1 | ||
7728 | ac_status=$? | ||
7729 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7730 | + rm -f conftest.er1 | ||
7731 | + cat conftest.err >&5 | ||
7732 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7733 | (exit $ac_status); } && | ||
7734 | - { ac_try='test -s conftest.$ac_objext' | ||
7735 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7736 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7737 | + (eval $ac_try) 2>&5 | ||
7738 | + ac_status=$? | ||
7739 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7740 | + (exit $ac_status); }; } && | ||
7741 | + { ac_try='test -s conftest.$ac_objext' | ||
7742 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7743 | (eval $ac_try) 2>&5 | ||
7744 | ac_status=$? | ||
7745 | @@ -9332,7 +10467,7 @@ | ||
7746 | |||
7747 | ac_cv_have_decl_ferror_unlocked=no | ||
7748 | fi | ||
7749 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7750 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7751 | fi | ||
7752 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_ferror_unlocked" >&5 | ||
7753 | echo "${ECHO_T}$ac_cv_have_decl_ferror_unlocked" >&6 | ||
7754 | @@ -9360,7 +10495,6 @@ | ||
7755 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7756 | else | ||
7757 | cat >conftest.$ac_ext <<_ACEOF | ||
7758 | -#line $LINENO "configure" | ||
7759 | /* confdefs.h. */ | ||
7760 | _ACEOF | ||
7761 | cat confdefs.h >>conftest.$ac_ext | ||
7762 | @@ -9380,11 +10514,20 @@ | ||
7763 | _ACEOF | ||
7764 | rm -f conftest.$ac_objext | ||
7765 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7766 | - (eval $ac_compile) 2>&5 | ||
7767 | + (eval $ac_compile) 2>conftest.er1 | ||
7768 | ac_status=$? | ||
7769 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7770 | + rm -f conftest.er1 | ||
7771 | + cat conftest.err >&5 | ||
7772 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7773 | (exit $ac_status); } && | ||
7774 | - { ac_try='test -s conftest.$ac_objext' | ||
7775 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7776 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7777 | + (eval $ac_try) 2>&5 | ||
7778 | + ac_status=$? | ||
7779 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7780 | + (exit $ac_status); }; } && | ||
7781 | + { ac_try='test -s conftest.$ac_objext' | ||
7782 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7783 | (eval $ac_try) 2>&5 | ||
7784 | ac_status=$? | ||
7785 | @@ -9397,7 +10540,7 @@ | ||
7786 | |||
7787 | ac_cv_have_decl_fflush_unlocked=no | ||
7788 | fi | ||
7789 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7790 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7791 | fi | ||
7792 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fflush_unlocked" >&5 | ||
7793 | echo "${ECHO_T}$ac_cv_have_decl_fflush_unlocked" >&6 | ||
7794 | @@ -9425,7 +10568,6 @@ | ||
7795 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7796 | else | ||
7797 | cat >conftest.$ac_ext <<_ACEOF | ||
7798 | -#line $LINENO "configure" | ||
7799 | /* confdefs.h. */ | ||
7800 | _ACEOF | ||
7801 | cat confdefs.h >>conftest.$ac_ext | ||
7802 | @@ -9445,11 +10587,20 @@ | ||
7803 | _ACEOF | ||
7804 | rm -f conftest.$ac_objext | ||
7805 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7806 | - (eval $ac_compile) 2>&5 | ||
7807 | + (eval $ac_compile) 2>conftest.er1 | ||
7808 | ac_status=$? | ||
7809 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7810 | + rm -f conftest.er1 | ||
7811 | + cat conftest.err >&5 | ||
7812 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7813 | (exit $ac_status); } && | ||
7814 | - { ac_try='test -s conftest.$ac_objext' | ||
7815 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7816 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7817 | + (eval $ac_try) 2>&5 | ||
7818 | + ac_status=$? | ||
7819 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7820 | + (exit $ac_status); }; } && | ||
7821 | + { ac_try='test -s conftest.$ac_objext' | ||
7822 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7823 | (eval $ac_try) 2>&5 | ||
7824 | ac_status=$? | ||
7825 | @@ -9462,7 +10613,7 @@ | ||
7826 | |||
7827 | ac_cv_have_decl_fgets_unlocked=no | ||
7828 | fi | ||
7829 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7830 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7831 | fi | ||
7832 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5 | ||
7833 | echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6 | ||
7834 | @@ -9490,7 +10641,6 @@ | ||
7835 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7836 | else | ||
7837 | cat >conftest.$ac_ext <<_ACEOF | ||
7838 | -#line $LINENO "configure" | ||
7839 | /* confdefs.h. */ | ||
7840 | _ACEOF | ||
7841 | cat confdefs.h >>conftest.$ac_ext | ||
7842 | @@ -9510,11 +10660,20 @@ | ||
7843 | _ACEOF | ||
7844 | rm -f conftest.$ac_objext | ||
7845 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7846 | - (eval $ac_compile) 2>&5 | ||
7847 | + (eval $ac_compile) 2>conftest.er1 | ||
7848 | ac_status=$? | ||
7849 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7850 | + rm -f conftest.er1 | ||
7851 | + cat conftest.err >&5 | ||
7852 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7853 | (exit $ac_status); } && | ||
7854 | - { ac_try='test -s conftest.$ac_objext' | ||
7855 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7856 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7857 | + (eval $ac_try) 2>&5 | ||
7858 | + ac_status=$? | ||
7859 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7860 | + (exit $ac_status); }; } && | ||
7861 | + { ac_try='test -s conftest.$ac_objext' | ||
7862 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7863 | (eval $ac_try) 2>&5 | ||
7864 | ac_status=$? | ||
7865 | @@ -9527,7 +10686,7 @@ | ||
7866 | |||
7867 | ac_cv_have_decl_fputc_unlocked=no | ||
7868 | fi | ||
7869 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7870 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7871 | fi | ||
7872 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputc_unlocked" >&5 | ||
7873 | echo "${ECHO_T}$ac_cv_have_decl_fputc_unlocked" >&6 | ||
7874 | @@ -9555,7 +10714,6 @@ | ||
7875 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7876 | else | ||
7877 | cat >conftest.$ac_ext <<_ACEOF | ||
7878 | -#line $LINENO "configure" | ||
7879 | /* confdefs.h. */ | ||
7880 | _ACEOF | ||
7881 | cat confdefs.h >>conftest.$ac_ext | ||
7882 | @@ -9575,11 +10733,20 @@ | ||
7883 | _ACEOF | ||
7884 | rm -f conftest.$ac_objext | ||
7885 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7886 | - (eval $ac_compile) 2>&5 | ||
7887 | + (eval $ac_compile) 2>conftest.er1 | ||
7888 | ac_status=$? | ||
7889 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7890 | + rm -f conftest.er1 | ||
7891 | + cat conftest.err >&5 | ||
7892 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7893 | (exit $ac_status); } && | ||
7894 | - { ac_try='test -s conftest.$ac_objext' | ||
7895 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7896 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7897 | + (eval $ac_try) 2>&5 | ||
7898 | + ac_status=$? | ||
7899 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7900 | + (exit $ac_status); }; } && | ||
7901 | + { ac_try='test -s conftest.$ac_objext' | ||
7902 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7903 | (eval $ac_try) 2>&5 | ||
7904 | ac_status=$? | ||
7905 | @@ -9592,7 +10759,7 @@ | ||
7906 | |||
7907 | ac_cv_have_decl_fputs_unlocked=no | ||
7908 | fi | ||
7909 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7910 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7911 | fi | ||
7912 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputs_unlocked" >&5 | ||
7913 | echo "${ECHO_T}$ac_cv_have_decl_fputs_unlocked" >&6 | ||
7914 | @@ -9620,7 +10787,6 @@ | ||
7915 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7916 | else | ||
7917 | cat >conftest.$ac_ext <<_ACEOF | ||
7918 | -#line $LINENO "configure" | ||
7919 | /* confdefs.h. */ | ||
7920 | _ACEOF | ||
7921 | cat confdefs.h >>conftest.$ac_ext | ||
7922 | @@ -9640,11 +10806,20 @@ | ||
7923 | _ACEOF | ||
7924 | rm -f conftest.$ac_objext | ||
7925 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7926 | - (eval $ac_compile) 2>&5 | ||
7927 | + (eval $ac_compile) 2>conftest.er1 | ||
7928 | ac_status=$? | ||
7929 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7930 | + rm -f conftest.er1 | ||
7931 | + cat conftest.err >&5 | ||
7932 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7933 | (exit $ac_status); } && | ||
7934 | - { ac_try='test -s conftest.$ac_objext' | ||
7935 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7936 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7937 | + (eval $ac_try) 2>&5 | ||
7938 | + ac_status=$? | ||
7939 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7940 | + (exit $ac_status); }; } && | ||
7941 | + { ac_try='test -s conftest.$ac_objext' | ||
7942 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7943 | (eval $ac_try) 2>&5 | ||
7944 | ac_status=$? | ||
7945 | @@ -9657,7 +10832,7 @@ | ||
7946 | |||
7947 | ac_cv_have_decl_fread_unlocked=no | ||
7948 | fi | ||
7949 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7950 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7951 | fi | ||
7952 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fread_unlocked" >&5 | ||
7953 | echo "${ECHO_T}$ac_cv_have_decl_fread_unlocked" >&6 | ||
7954 | @@ -9685,7 +10860,6 @@ | ||
7955 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7956 | else | ||
7957 | cat >conftest.$ac_ext <<_ACEOF | ||
7958 | -#line $LINENO "configure" | ||
7959 | /* confdefs.h. */ | ||
7960 | _ACEOF | ||
7961 | cat confdefs.h >>conftest.$ac_ext | ||
7962 | @@ -9705,11 +10879,20 @@ | ||
7963 | _ACEOF | ||
7964 | rm -f conftest.$ac_objext | ||
7965 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7966 | - (eval $ac_compile) 2>&5 | ||
7967 | + (eval $ac_compile) 2>conftest.er1 | ||
7968 | ac_status=$? | ||
7969 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7970 | + rm -f conftest.er1 | ||
7971 | + cat conftest.err >&5 | ||
7972 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7973 | (exit $ac_status); } && | ||
7974 | - { ac_try='test -s conftest.$ac_objext' | ||
7975 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7976 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7977 | + (eval $ac_try) 2>&5 | ||
7978 | + ac_status=$? | ||
7979 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7980 | + (exit $ac_status); }; } && | ||
7981 | + { ac_try='test -s conftest.$ac_objext' | ||
7982 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7983 | (eval $ac_try) 2>&5 | ||
7984 | ac_status=$? | ||
7985 | @@ -9722,7 +10905,7 @@ | ||
7986 | |||
7987 | ac_cv_have_decl_fwrite_unlocked=no | ||
7988 | fi | ||
7989 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7990 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7991 | fi | ||
7992 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fwrite_unlocked" >&5 | ||
7993 | echo "${ECHO_T}$ac_cv_have_decl_fwrite_unlocked" >&6 | ||
7994 | @@ -9750,7 +10933,6 @@ | ||
7995 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7996 | else | ||
7997 | cat >conftest.$ac_ext <<_ACEOF | ||
7998 | -#line $LINENO "configure" | ||
7999 | /* confdefs.h. */ | ||
8000 | _ACEOF | ||
8001 | cat confdefs.h >>conftest.$ac_ext | ||
8002 | @@ -9770,11 +10952,20 @@ | ||
8003 | _ACEOF | ||
8004 | rm -f conftest.$ac_objext | ||
8005 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8006 | - (eval $ac_compile) 2>&5 | ||
8007 | + (eval $ac_compile) 2>conftest.er1 | ||
8008 | ac_status=$? | ||
8009 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8010 | + rm -f conftest.er1 | ||
8011 | + cat conftest.err >&5 | ||
8012 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8013 | (exit $ac_status); } && | ||
8014 | - { ac_try='test -s conftest.$ac_objext' | ||
8015 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8016 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8017 | + (eval $ac_try) 2>&5 | ||
8018 | + ac_status=$? | ||
8019 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8020 | + (exit $ac_status); }; } && | ||
8021 | + { ac_try='test -s conftest.$ac_objext' | ||
8022 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8023 | (eval $ac_try) 2>&5 | ||
8024 | ac_status=$? | ||
8025 | @@ -9787,7 +10978,7 @@ | ||
8026 | |||
8027 | ac_cv_have_decl_getc_unlocked=no | ||
8028 | fi | ||
8029 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8030 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8031 | fi | ||
8032 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5 | ||
8033 | echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6 | ||
8034 | @@ -9815,7 +11006,6 @@ | ||
8035 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8036 | else | ||
8037 | cat >conftest.$ac_ext <<_ACEOF | ||
8038 | -#line $LINENO "configure" | ||
8039 | /* confdefs.h. */ | ||
8040 | _ACEOF | ||
8041 | cat confdefs.h >>conftest.$ac_ext | ||
8042 | @@ -9835,11 +11025,20 @@ | ||
8043 | _ACEOF | ||
8044 | rm -f conftest.$ac_objext | ||
8045 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8046 | - (eval $ac_compile) 2>&5 | ||
8047 | + (eval $ac_compile) 2>conftest.er1 | ||
8048 | ac_status=$? | ||
8049 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8050 | + rm -f conftest.er1 | ||
8051 | + cat conftest.err >&5 | ||
8052 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8053 | (exit $ac_status); } && | ||
8054 | - { ac_try='test -s conftest.$ac_objext' | ||
8055 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8056 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8057 | + (eval $ac_try) 2>&5 | ||
8058 | + ac_status=$? | ||
8059 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8060 | + (exit $ac_status); }; } && | ||
8061 | + { ac_try='test -s conftest.$ac_objext' | ||
8062 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8063 | (eval $ac_try) 2>&5 | ||
8064 | ac_status=$? | ||
8065 | @@ -9852,7 +11051,7 @@ | ||
8066 | |||
8067 | ac_cv_have_decl_getchar_unlocked=no | ||
8068 | fi | ||
8069 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8070 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8071 | fi | ||
8072 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getchar_unlocked" >&5 | ||
8073 | echo "${ECHO_T}$ac_cv_have_decl_getchar_unlocked" >&6 | ||
8074 | @@ -9880,7 +11079,6 @@ | ||
8075 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8076 | else | ||
8077 | cat >conftest.$ac_ext <<_ACEOF | ||
8078 | -#line $LINENO "configure" | ||
8079 | /* confdefs.h. */ | ||
8080 | _ACEOF | ||
8081 | cat confdefs.h >>conftest.$ac_ext | ||
8082 | @@ -9900,11 +11098,20 @@ | ||
8083 | _ACEOF | ||
8084 | rm -f conftest.$ac_objext | ||
8085 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8086 | - (eval $ac_compile) 2>&5 | ||
8087 | + (eval $ac_compile) 2>conftest.er1 | ||
8088 | ac_status=$? | ||
8089 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8090 | + rm -f conftest.er1 | ||
8091 | + cat conftest.err >&5 | ||
8092 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8093 | (exit $ac_status); } && | ||
8094 | - { ac_try='test -s conftest.$ac_objext' | ||
8095 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8096 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8097 | + (eval $ac_try) 2>&5 | ||
8098 | + ac_status=$? | ||
8099 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8100 | + (exit $ac_status); }; } && | ||
8101 | + { ac_try='test -s conftest.$ac_objext' | ||
8102 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8103 | (eval $ac_try) 2>&5 | ||
8104 | ac_status=$? | ||
8105 | @@ -9917,7 +11124,7 @@ | ||
8106 | |||
8107 | ac_cv_have_decl_putc_unlocked=no | ||
8108 | fi | ||
8109 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8110 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8111 | fi | ||
8112 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_putc_unlocked" >&5 | ||
8113 | echo "${ECHO_T}$ac_cv_have_decl_putc_unlocked" >&6 | ||
8114 | @@ -9945,7 +11152,6 @@ | ||
8115 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8116 | else | ||
8117 | cat >conftest.$ac_ext <<_ACEOF | ||
8118 | -#line $LINENO "configure" | ||
8119 | /* confdefs.h. */ | ||
8120 | _ACEOF | ||
8121 | cat confdefs.h >>conftest.$ac_ext | ||
8122 | @@ -9965,11 +11171,20 @@ | ||
8123 | _ACEOF | ||
8124 | rm -f conftest.$ac_objext | ||
8125 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8126 | - (eval $ac_compile) 2>&5 | ||
8127 | + (eval $ac_compile) 2>conftest.er1 | ||
8128 | ac_status=$? | ||
8129 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8130 | + rm -f conftest.er1 | ||
8131 | + cat conftest.err >&5 | ||
8132 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8133 | (exit $ac_status); } && | ||
8134 | - { ac_try='test -s conftest.$ac_objext' | ||
8135 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8136 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8137 | + (eval $ac_try) 2>&5 | ||
8138 | + ac_status=$? | ||
8139 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8140 | + (exit $ac_status); }; } && | ||
8141 | + { ac_try='test -s conftest.$ac_objext' | ||
8142 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8143 | (eval $ac_try) 2>&5 | ||
8144 | ac_status=$? | ||
8145 | @@ -9982,7 +11197,7 @@ | ||
8146 | |||
8147 | ac_cv_have_decl_putchar_unlocked=no | ||
8148 | fi | ||
8149 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8150 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8151 | fi | ||
8152 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_putchar_unlocked" >&5 | ||
8153 | echo "${ECHO_T}$ac_cv_have_decl_putchar_unlocked" >&6 | ||
8154 | @@ -10075,7 +11290,6 @@ | ||
8155 | ac_cv_func_closedir_void=yes | ||
8156 | else | ||
8157 | cat >conftest.$ac_ext <<_ACEOF | ||
8158 | -#line $LINENO "configure" | ||
8159 | /* confdefs.h. */ | ||
8160 | _ACEOF | ||
8161 | cat confdefs.h >>conftest.$ac_ext | ||
8162 | @@ -10115,7 +11329,7 @@ | ||
8163 | ( exit $ac_status ) | ||
8164 | ac_cv_func_closedir_void=yes | ||
8165 | fi | ||
8166 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8167 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8168 | fi | ||
8169 | fi | ||
8170 | echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 | ||
8171 | @@ -10146,7 +11360,6 @@ | ||
8172 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
8173 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
8174 | cat >conftest.$ac_ext <<_ACEOF | ||
8175 | -#line $LINENO "configure" | ||
8176 | /* confdefs.h. */ | ||
8177 | _ACEOF | ||
8178 | cat confdefs.h >>conftest.$ac_ext | ||
8179 | @@ -10157,11 +11370,20 @@ | ||
8180 | _ACEOF | ||
8181 | rm -f conftest.$ac_objext | ||
8182 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8183 | - (eval $ac_compile) 2>&5 | ||
8184 | + (eval $ac_compile) 2>conftest.er1 | ||
8185 | ac_status=$? | ||
8186 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8187 | + rm -f conftest.er1 | ||
8188 | + cat conftest.err >&5 | ||
8189 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8190 | (exit $ac_status); } && | ||
8191 | - { ac_try='test -s conftest.$ac_objext' | ||
8192 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8193 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8194 | + (eval $ac_try) 2>&5 | ||
8195 | + ac_status=$? | ||
8196 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8197 | + (exit $ac_status); }; } && | ||
8198 | + { ac_try='test -s conftest.$ac_objext' | ||
8199 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8200 | (eval $ac_try) 2>&5 | ||
8201 | ac_status=$? | ||
8202 | @@ -10174,7 +11396,7 @@ | ||
8203 | |||
8204 | ac_header_compiler=no | ||
8205 | fi | ||
8206 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8207 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8208 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
8209 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
8210 | |||
8211 | @@ -10182,7 +11404,6 @@ | ||
8212 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
8213 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
8214 | cat >conftest.$ac_ext <<_ACEOF | ||
8215 | -#line $LINENO "configure" | ||
8216 | /* confdefs.h. */ | ||
8217 | _ACEOF | ||
8218 | cat confdefs.h >>conftest.$ac_ext | ||
8219 | @@ -10200,6 +11421,7 @@ | ||
8220 | (exit $ac_status); } >/dev/null; then | ||
8221 | if test -s conftest.err; then | ||
8222 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
8223 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
8224 | else | ||
8225 | ac_cpp_err= | ||
8226 | fi | ||
8227 | @@ -10219,33 +11441,32 @@ | ||
8228 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
8229 | |||
8230 | # So? What about this header? | ||
8231 | -case $ac_header_compiler:$ac_header_preproc in | ||
8232 | - yes:no ) | ||
8233 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
8234 | + yes:no: ) | ||
8235 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
8236 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
8237 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
8238 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
8239 | - ( | ||
8240 | - cat <<\_ASBOX | ||
8241 | -## ------------------------------------ ## | ||
8242 | -## Report this to bug-autoconf@gnu.org. ## | ||
8243 | -## ------------------------------------ ## | ||
8244 | -_ASBOX | ||
8245 | - ) | | ||
8246 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
8247 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
8248 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
8249 | + ac_header_preproc=yes | ||
8250 | ;; | ||
8251 | - no:yes ) | ||
8252 | + no:yes:* ) | ||
8253 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
8254 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
8255 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
8256 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
8257 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
8258 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
8259 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
8260 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
8261 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
8262 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
8263 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
8264 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
8265 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
8266 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
8267 | ( | ||
8268 | cat <<\_ASBOX | ||
8269 | -## ------------------------------------ ## | ||
8270 | -## Report this to bug-autoconf@gnu.org. ## | ||
8271 | -## ------------------------------------ ## | ||
8272 | +## -------------------------------- ## | ||
8273 | +## Report this to bug-patch@gnu.org ## | ||
8274 | +## -------------------------------- ## | ||
8275 | _ASBOX | ||
8276 | ) | | ||
8277 | sed "s/^/$as_me: WARNING: /" >&2 | ||
8278 | @@ -10256,7 +11477,7 @@ | ||
8279 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
8280 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8281 | else | ||
8282 | - eval "$as_ac_Header=$ac_header_preproc" | ||
8283 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
8284 | fi | ||
8285 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
8286 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
8287 | @@ -10277,7 +11498,6 @@ | ||
8288 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8289 | else | ||
8290 | cat >conftest.$ac_ext <<_ACEOF | ||
8291 | -#line $LINENO "configure" | ||
8292 | /* confdefs.h. */ | ||
8293 | _ACEOF | ||
8294 | cat confdefs.h >>conftest.$ac_ext | ||
8295 | @@ -10300,11 +11520,20 @@ | ||
8296 | _ACEOF | ||
8297 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8298 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8299 | - (eval $ac_link) 2>&5 | ||
8300 | + (eval $ac_link) 2>conftest.er1 | ||
8301 | ac_status=$? | ||
8302 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8303 | + rm -f conftest.er1 | ||
8304 | + cat conftest.err >&5 | ||
8305 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8306 | (exit $ac_status); } && | ||
8307 | - { ac_try='test -s conftest$ac_exeext' | ||
8308 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8309 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8310 | + (eval $ac_try) 2>&5 | ||
8311 | + ac_status=$? | ||
8312 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8313 | + (exit $ac_status); }; } && | ||
8314 | + { ac_try='test -s conftest$ac_exeext' | ||
8315 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8316 | (eval $ac_try) 2>&5 | ||
8317 | ac_status=$? | ||
8318 | @@ -10317,7 +11546,8 @@ | ||
8319 | |||
8320 | ac_cv_func_setmode_dos=no | ||
8321 | fi | ||
8322 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8323 | +rm -f conftest.err conftest.$ac_objext \ | ||
8324 | + conftest$ac_exeext conftest.$ac_ext | ||
8325 | fi | ||
8326 | echo "$as_me:$LINENO: result: $ac_cv_func_setmode_dos" >&5 | ||
8327 | echo "${ECHO_T}$ac_cv_func_setmode_dos" >&6 | ||
8328 | @@ -10338,21 +11568,28 @@ | ||
8329 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8330 | else | ||
8331 | cat >conftest.$ac_ext <<_ACEOF | ||
8332 | -#line $LINENO "configure" | ||
8333 | /* confdefs.h. */ | ||
8334 | _ACEOF | ||
8335 | cat confdefs.h >>conftest.$ac_ext | ||
8336 | cat >>conftest.$ac_ext <<_ACEOF | ||
8337 | /* end confdefs.h. */ | ||
8338 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
8339 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8340 | +#define $ac_func innocuous_$ac_func | ||
8341 | + | ||
8342 | /* System header to define __stub macros and hopefully few prototypes, | ||
8343 | which can conflict with char $ac_func (); below. | ||
8344 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
8345 | <limits.h> exists even on freestanding compilers. */ | ||
8346 | + | ||
8347 | #ifdef __STDC__ | ||
8348 | # include <limits.h> | ||
8349 | #else | ||
8350 | # include <assert.h> | ||
8351 | #endif | ||
8352 | + | ||
8353 | +#undef $ac_func | ||
8354 | + | ||
8355 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
8356 | #ifdef __cplusplus | ||
8357 | extern "C" | ||
8358 | @@ -10383,11 +11620,20 @@ | ||
8359 | _ACEOF | ||
8360 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8361 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8362 | - (eval $ac_link) 2>&5 | ||
8363 | + (eval $ac_link) 2>conftest.er1 | ||
8364 | ac_status=$? | ||
8365 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8366 | + rm -f conftest.er1 | ||
8367 | + cat conftest.err >&5 | ||
8368 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8369 | (exit $ac_status); } && | ||
8370 | - { ac_try='test -s conftest$ac_exeext' | ||
8371 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8372 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8373 | + (eval $ac_try) 2>&5 | ||
8374 | + ac_status=$? | ||
8375 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8376 | + (exit $ac_status); }; } && | ||
8377 | + { ac_try='test -s conftest$ac_exeext' | ||
8378 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8379 | (eval $ac_try) 2>&5 | ||
8380 | ac_status=$? | ||
8381 | @@ -10400,7 +11646,8 @@ | ||
8382 | |||
8383 | eval "$as_ac_var=no" | ||
8384 | fi | ||
8385 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8386 | +rm -f conftest.err conftest.$ac_objext \ | ||
8387 | + conftest$ac_exeext conftest.$ac_ext | ||
8388 | fi | ||
8389 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
8390 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
8391 | @@ -10415,21 +11662,28 @@ | ||
8392 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8393 | else | ||
8394 | cat >conftest.$ac_ext <<_ACEOF | ||
8395 | -#line $LINENO "configure" | ||
8396 | /* confdefs.h. */ | ||
8397 | _ACEOF | ||
8398 | cat confdefs.h >>conftest.$ac_ext | ||
8399 | cat >>conftest.$ac_ext <<_ACEOF | ||
8400 | /* end confdefs.h. */ | ||
8401 | +/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. | ||
8402 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8403 | +#define _doprnt innocuous__doprnt | ||
8404 | + | ||
8405 | /* System header to define __stub macros and hopefully few prototypes, | ||
8406 | which can conflict with char _doprnt (); below. | ||
8407 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
8408 | <limits.h> exists even on freestanding compilers. */ | ||
8409 | + | ||
8410 | #ifdef __STDC__ | ||
8411 | # include <limits.h> | ||
8412 | #else | ||
8413 | # include <assert.h> | ||
8414 | #endif | ||
8415 | + | ||
8416 | +#undef _doprnt | ||
8417 | + | ||
8418 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
8419 | #ifdef __cplusplus | ||
8420 | extern "C" | ||
8421 | @@ -10460,11 +11714,20 @@ | ||
8422 | _ACEOF | ||
8423 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8424 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8425 | - (eval $ac_link) 2>&5 | ||
8426 | + (eval $ac_link) 2>conftest.er1 | ||
8427 | ac_status=$? | ||
8428 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8429 | + rm -f conftest.er1 | ||
8430 | + cat conftest.err >&5 | ||
8431 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8432 | (exit $ac_status); } && | ||
8433 | - { ac_try='test -s conftest$ac_exeext' | ||
8434 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8435 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8436 | + (eval $ac_try) 2>&5 | ||
8437 | + ac_status=$? | ||
8438 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8439 | + (exit $ac_status); }; } && | ||
8440 | + { ac_try='test -s conftest$ac_exeext' | ||
8441 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8442 | (eval $ac_try) 2>&5 | ||
8443 | ac_status=$? | ||
8444 | @@ -10477,7 +11740,8 @@ | ||
8445 | |||
8446 | ac_cv_func__doprnt=no | ||
8447 | fi | ||
8448 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8449 | +rm -f conftest.err conftest.$ac_objext \ | ||
8450 | + conftest$ac_exeext conftest.$ac_ext | ||
8451 | fi | ||
8452 | echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 | ||
8453 | echo "${ECHO_T}$ac_cv_func__doprnt" >&6 | ||
8454 | @@ -10503,21 +11767,28 @@ | ||
8455 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8456 | else | ||
8457 | cat >conftest.$ac_ext <<_ACEOF | ||
8458 | -#line $LINENO "configure" | ||
8459 | /* confdefs.h. */ | ||
8460 | _ACEOF | ||
8461 | cat confdefs.h >>conftest.$ac_ext | ||
8462 | cat >>conftest.$ac_ext <<_ACEOF | ||
8463 | /* end confdefs.h. */ | ||
8464 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
8465 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8466 | +#define $ac_func innocuous_$ac_func | ||
8467 | + | ||
8468 | /* System header to define __stub macros and hopefully few prototypes, | ||
8469 | which can conflict with char $ac_func (); below. | ||
8470 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
8471 | <limits.h> exists even on freestanding compilers. */ | ||
8472 | + | ||
8473 | #ifdef __STDC__ | ||
8474 | # include <limits.h> | ||
8475 | #else | ||
8476 | # include <assert.h> | ||
8477 | #endif | ||
8478 | + | ||
8479 | +#undef $ac_func | ||
8480 | + | ||
8481 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
8482 | #ifdef __cplusplus | ||
8483 | extern "C" | ||
8484 | @@ -10548,11 +11819,20 @@ | ||
8485 | _ACEOF | ||
8486 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8487 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8488 | - (eval $ac_link) 2>&5 | ||
8489 | + (eval $ac_link) 2>conftest.er1 | ||
8490 | ac_status=$? | ||
8491 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8492 | + rm -f conftest.er1 | ||
8493 | + cat conftest.err >&5 | ||
8494 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8495 | (exit $ac_status); } && | ||
8496 | - { ac_try='test -s conftest$ac_exeext' | ||
8497 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8498 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8499 | + (eval $ac_try) 2>&5 | ||
8500 | + ac_status=$? | ||
8501 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8502 | + (exit $ac_status); }; } && | ||
8503 | + { ac_try='test -s conftest$ac_exeext' | ||
8504 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8505 | (eval $ac_try) 2>&5 | ||
8506 | ac_status=$? | ||
8507 | @@ -10565,7 +11845,8 @@ | ||
8508 | |||
8509 | eval "$as_ac_var=no" | ||
8510 | fi | ||
8511 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8512 | +rm -f conftest.err conftest.$ac_objext \ | ||
8513 | + conftest$ac_exeext conftest.$ac_ext | ||
8514 | fi | ||
8515 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
8516 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
8517 | @@ -10585,7 +11866,6 @@ | ||
8518 | patch_cv_mkdir_takes_one_arg=no | ||
8519 | if test $ac_cv_func_mkdir = yes; then | ||
8520 | cat >conftest.$ac_ext <<_ACEOF | ||
8521 | -#line $LINENO "configure" | ||
8522 | /* confdefs.h. */ | ||
8523 | _ACEOF | ||
8524 | cat confdefs.h >>conftest.$ac_ext | ||
8525 | @@ -10605,11 +11885,20 @@ | ||
8526 | _ACEOF | ||
8527 | rm -f conftest.$ac_objext | ||
8528 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8529 | - (eval $ac_compile) 2>&5 | ||
8530 | + (eval $ac_compile) 2>conftest.er1 | ||
8531 | ac_status=$? | ||
8532 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8533 | + rm -f conftest.er1 | ||
8534 | + cat conftest.err >&5 | ||
8535 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8536 | (exit $ac_status); } && | ||
8537 | - { ac_try='test -s conftest.$ac_objext' | ||
8538 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8539 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8540 | + (eval $ac_try) 2>&5 | ||
8541 | + ac_status=$? | ||
8542 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8543 | + (exit $ac_status); }; } && | ||
8544 | + { ac_try='test -s conftest.$ac_objext' | ||
8545 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8546 | (eval $ac_try) 2>&5 | ||
8547 | ac_status=$? | ||
8548 | @@ -10621,7 +11910,6 @@ | ||
8549 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8550 | |||
8551 | cat >conftest.$ac_ext <<_ACEOF | ||
8552 | -#line $LINENO "configure" | ||
8553 | /* confdefs.h. */ | ||
8554 | _ACEOF | ||
8555 | cat confdefs.h >>conftest.$ac_ext | ||
8556 | @@ -10641,11 +11929,20 @@ | ||
8557 | _ACEOF | ||
8558 | rm -f conftest.$ac_objext | ||
8559 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8560 | - (eval $ac_compile) 2>&5 | ||
8561 | + (eval $ac_compile) 2>conftest.er1 | ||
8562 | ac_status=$? | ||
8563 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8564 | + rm -f conftest.er1 | ||
8565 | + cat conftest.err >&5 | ||
8566 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8567 | (exit $ac_status); } && | ||
8568 | - { ac_try='test -s conftest.$ac_objext' | ||
8569 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8570 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8571 | + (eval $ac_try) 2>&5 | ||
8572 | + ac_status=$? | ||
8573 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8574 | + (exit $ac_status); }; } && | ||
8575 | + { ac_try='test -s conftest.$ac_objext' | ||
8576 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8577 | (eval $ac_try) 2>&5 | ||
8578 | ac_status=$? | ||
8579 | @@ -10658,10 +11955,10 @@ | ||
8580 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8581 | |||
8582 | fi | ||
8583 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8584 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8585 | |||
8586 | fi | ||
8587 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8588 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8589 | fi | ||
8590 | |||
8591 | |||
8592 | @@ -10686,7 +11983,6 @@ | ||
8593 | else | ||
8594 | |||
8595 | cat >conftest.$ac_ext <<_ACEOF | ||
8596 | -#line $LINENO "configure" | ||
8597 | /* confdefs.h. */ | ||
8598 | _ACEOF | ||
8599 | cat confdefs.h >>conftest.$ac_ext | ||
8600 | @@ -10705,11 +12001,20 @@ | ||
8601 | _ACEOF | ||
8602 | rm -f conftest.$ac_objext | ||
8603 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8604 | - (eval $ac_compile) 2>&5 | ||
8605 | + (eval $ac_compile) 2>conftest.er1 | ||
8606 | ac_status=$? | ||
8607 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8608 | + rm -f conftest.er1 | ||
8609 | + cat conftest.err >&5 | ||
8610 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8611 | (exit $ac_status); } && | ||
8612 | - { ac_try='test -s conftest.$ac_objext' | ||
8613 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8614 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8615 | + (eval $ac_try) 2>&5 | ||
8616 | + ac_status=$? | ||
8617 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8618 | + (exit $ac_status); }; } && | ||
8619 | + { ac_try='test -s conftest.$ac_objext' | ||
8620 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8621 | (eval $ac_try) 2>&5 | ||
8622 | ac_status=$? | ||
8623 | @@ -10722,7 +12027,7 @@ | ||
8624 | |||
8625 | ac_cv_win_or_dos=no | ||
8626 | fi | ||
8627 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8628 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8629 | |||
8630 | fi | ||
8631 | echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 | ||
8632 | @@ -10834,13 +12139,13 @@ | ||
8633 | # `set' does not quote correctly, so add quotes (double-quote | ||
8634 | # substitution turns \\\\ into \\, and sed turns \\ into \). | ||
8635 | sed -n \ | ||
8636 | - "s/'/'\\\\''/g; | ||
8637 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
8638 | + "s/'/'\\\\''/g; | ||
8639 | + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
8640 | ;; | ||
8641 | *) | ||
8642 | # `set' quotes correctly as required by POSIX, so do not add quotes. | ||
8643 | sed -n \ | ||
8644 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
8645 | + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
8646 | ;; | ||
8647 | esac; | ||
8648 | } | | ||
8649 | @@ -10870,13 +12175,13 @@ | ||
8650 | # trailing colons and then remove the whole line if VPATH becomes empty | ||
8651 | # (actually we leave an empty line to preserve line numbers). | ||
8652 | if test "x$srcdir" = x.; then | ||
8653 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
8654 | + ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
8655 | s/:*\$(srcdir):*/:/; | ||
8656 | s/:*\${srcdir}:*/:/; | ||
8657 | s/:*@srcdir@:*/:/; | ||
8658 | -s/^\([^=]*=[ ]*\):*/\1/; | ||
8659 | +s/^\([^=]*=[ ]*\):*/\1/; | ||
8660 | s/:*$//; | ||
8661 | -s/^[^=]*=[ ]*$//; | ||
8662 | +s/^[^=]*=[ ]*$//; | ||
8663 | }' | ||
8664 | fi | ||
8665 | |||
8666 | @@ -10887,7 +12192,7 @@ | ||
8667 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | ||
8668 | # 1. Remove the extension, and $U if already installed. | ||
8669 | ac_i=`echo "$ac_i" | | ||
8670 | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | ||
8671 | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | ||
8672 | # 2. Add them. | ||
8673 | ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" | ||
8674 | ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' | ||
8675 | @@ -10931,9 +12236,10 @@ | ||
8676 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
8677 | set -o posix | ||
8678 | fi | ||
8679 | +DUALCASE=1; export DUALCASE # for MKS sh | ||
8680 | |||
8681 | # Support unset when possible. | ||
8682 | -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
8683 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
8684 | as_unset=unset | ||
8685 | else | ||
8686 | as_unset=false | ||
8687 | @@ -10952,7 +12258,7 @@ | ||
8688 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
8689 | LC_TELEPHONE LC_TIME | ||
8690 | do | ||
8691 | - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
8692 | + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
8693 | eval $as_var=C; export $as_var | ||
8694 | else | ||
8695 | $as_unset $as_var | ||
8696 | @@ -11131,16 +12437,17 @@ | ||
8697 | if mkdir -p . 2>/dev/null; then | ||
8698 | as_mkdir_p=: | ||
8699 | else | ||
8700 | + test -d ./-p && rmdir ./-p | ||
8701 | as_mkdir_p=false | ||
8702 | fi | ||
8703 | |||
8704 | as_executable_p="test -f" | ||
8705 | |||
8706 | # Sed expression to map a string onto a valid CPP name. | ||
8707 | -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
8708 | +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
8709 | |||
8710 | # Sed expression to map a string onto a valid variable name. | ||
8711 | -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | ||
8712 | +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
8713 | |||
8714 | |||
8715 | # IFS | ||
8716 | @@ -11167,7 +12474,7 @@ | ||
8717 | cat >&5 <<_CSEOF | ||
8718 | |||
8719 | This file was extended by patch $as_me 2.5.9, which was | ||
8720 | -generated by GNU Autoconf 2.57. Invocation command line was | ||
8721 | +generated by GNU Autoconf 2.59. Invocation command line was | ||
8722 | |||
8723 | CONFIG_FILES = $CONFIG_FILES | ||
8724 | CONFIG_HEADERS = $CONFIG_HEADERS | ||
8725 | @@ -11211,9 +12518,9 @@ | ||
8726 | -d, --debug don't remove temporary files | ||
8727 | --recheck update $as_me by reconfiguring in the same conditions | ||
8728 | --file=FILE[:TEMPLATE] | ||
8729 | - instantiate the configuration file FILE | ||
8730 | + instantiate the configuration file FILE | ||
8731 | --header=FILE[:TEMPLATE] | ||
8732 | - instantiate the configuration header FILE | ||
8733 | + instantiate the configuration header FILE | ||
8734 | |||
8735 | Configuration files: | ||
8736 | $config_files | ||
8737 | @@ -11227,11 +12534,10 @@ | ||
8738 | cat >>$CONFIG_STATUS <<_ACEOF | ||
8739 | ac_cs_version="\\ | ||
8740 | patch config.status 2.5.9 | ||
8741 | -configured by $0, generated by GNU Autoconf 2.57, | ||
8742 | +configured by $0, generated by GNU Autoconf 2.59, | ||
8743 | with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" | ||
8744 | |||
8745 | -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 | ||
8746 | -Free Software Foundation, Inc. | ||
8747 | +Copyright (C) 2003 Free Software Foundation, Inc. | ||
8748 | This config.status script is free software; the Free Software Foundation | ||
8749 | gives unlimited permission to copy, distribute and modify it." | ||
8750 | srcdir=$srcdir | ||
8751 | @@ -11463,9 +12769,9 @@ | ||
8752 | (echo ':t | ||
8753 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed | ||
8754 | if test -z "$ac_sed_cmds"; then | ||
8755 | - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8756 | + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8757 | else | ||
8758 | - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8759 | + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8760 | fi | ||
8761 | ac_sed_frag=`expr $ac_sed_frag + 1` | ||
8762 | ac_beg=$ac_end | ||
8763 | @@ -11483,21 +12789,21 @@ | ||
8764 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
8765 | case $ac_file in | ||
8766 | - | *:- | *:-:* ) # input from stdin | ||
8767 | - cat >$tmp/stdin | ||
8768 | - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8769 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8770 | + cat >$tmp/stdin | ||
8771 | + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8772 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8773 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8774 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8775 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8776 | * ) ac_file_in=$ac_file.in ;; | ||
8777 | esac | ||
8778 | |||
8779 | # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. | ||
8780 | ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
8781 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
8782 | - X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
8783 | - X"$ac_file" : 'X\(//\)$' \| \ | ||
8784 | - X"$ac_file" : 'X\(/\)' \| \ | ||
8785 | - . : '\(.\)' 2>/dev/null || | ||
8786 | + X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
8787 | + X"$ac_file" : 'X\(//\)$' \| \ | ||
8788 | + X"$ac_file" : 'X\(/\)' \| \ | ||
8789 | + . : '\(.\)' 2>/dev/null || | ||
8790 | echo X"$ac_file" | | ||
8791 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
8792 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
8793 | @@ -11513,10 +12819,10 @@ | ||
8794 | as_dirs="$as_dir $as_dirs" | ||
8795 | as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
8796 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
8797 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
8798 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
8799 | - X"$as_dir" : 'X\(/\)' \| \ | ||
8800 | - . : '\(.\)' 2>/dev/null || | ||
8801 | + X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
8802 | + X"$as_dir" : 'X\(//\)$' \| \ | ||
8803 | + X"$as_dir" : 'X\(/\)' \| \ | ||
8804 | + . : '\(.\)' 2>/dev/null || | ||
8805 | echo X"$as_dir" | | ||
8806 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
8807 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
8808 | @@ -11554,12 +12860,45 @@ | ||
8809 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
8810 | ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
8811 | esac | ||
8812 | -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be | ||
8813 | -# absolute. | ||
8814 | -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` | ||
8815 | -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` | ||
8816 | -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` | ||
8817 | -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` | ||
8818 | + | ||
8819 | +# Do not use `cd foo && pwd` to compute absolute paths, because | ||
8820 | +# the directories may not exist. | ||
8821 | +case `pwd` in | ||
8822 | +.) ac_abs_builddir="$ac_dir";; | ||
8823 | +*) | ||
8824 | + case "$ac_dir" in | ||
8825 | + .) ac_abs_builddir=`pwd`;; | ||
8826 | + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
8827 | + *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
8828 | + esac;; | ||
8829 | +esac | ||
8830 | +case $ac_abs_builddir in | ||
8831 | +.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
8832 | +*) | ||
8833 | + case ${ac_top_builddir}. in | ||
8834 | + .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
8835 | + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
8836 | + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
8837 | + esac;; | ||
8838 | +esac | ||
8839 | +case $ac_abs_builddir in | ||
8840 | +.) ac_abs_srcdir=$ac_srcdir;; | ||
8841 | +*) | ||
8842 | + case $ac_srcdir in | ||
8843 | + .) ac_abs_srcdir=$ac_abs_builddir;; | ||
8844 | + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
8845 | + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
8846 | + esac;; | ||
8847 | +esac | ||
8848 | +case $ac_abs_builddir in | ||
8849 | +.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
8850 | +*) | ||
8851 | + case $ac_top_srcdir in | ||
8852 | + .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
8853 | + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
8854 | + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
8855 | + esac;; | ||
8856 | +esac | ||
8857 | |||
8858 | |||
8859 | case $INSTALL in | ||
8860 | @@ -11567,11 +12906,6 @@ | ||
8861 | *) ac_INSTALL=$ac_top_builddir$INSTALL ;; | ||
8862 | esac | ||
8863 | |||
8864 | - if test x"$ac_file" != x-; then | ||
8865 | - { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
8866 | -echo "$as_me: creating $ac_file" >&6;} | ||
8867 | - rm -f "$ac_file" | ||
8868 | - fi | ||
8869 | # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
8870 | # use $as_me), people would be surprised to read: | ||
8871 | # /* config.h. Generated by config.status. */ | ||
8872 | @@ -11581,7 +12915,7 @@ | ||
8873 | configure_input="$ac_file. " | ||
8874 | fi | ||
8875 | configure_input=$configure_input"Generated from `echo $ac_file_in | | ||
8876 | - sed 's,.*/,,'` by configure." | ||
8877 | + sed 's,.*/,,'` by configure." | ||
8878 | |||
8879 | # First look for the input files in the build tree, otherwise in the | ||
8880 | # src tree. | ||
8881 | @@ -11590,26 +12924,32 @@ | ||
8882 | case $f in | ||
8883 | -) echo $tmp/stdin ;; | ||
8884 | [\\/$]*) | ||
8885 | - # Absolute (can't be DOS-style, as IFS=:) | ||
8886 | - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8887 | + # Absolute (can't be DOS-style, as IFS=:) | ||
8888 | + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8889 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8890 | { (exit 1); exit 1; }; } | ||
8891 | - echo $f;; | ||
8892 | + echo "$f";; | ||
8893 | *) # Relative | ||
8894 | - if test -f "$f"; then | ||
8895 | - # Build tree | ||
8896 | - echo $f | ||
8897 | - elif test -f "$srcdir/$f"; then | ||
8898 | - # Source tree | ||
8899 | - echo $srcdir/$f | ||
8900 | - else | ||
8901 | - # /dev/null tree | ||
8902 | - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8903 | + if test -f "$f"; then | ||
8904 | + # Build tree | ||
8905 | + echo "$f" | ||
8906 | + elif test -f "$srcdir/$f"; then | ||
8907 | + # Source tree | ||
8908 | + echo "$srcdir/$f" | ||
8909 | + else | ||
8910 | + # /dev/null tree | ||
8911 | + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8912 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8913 | { (exit 1); exit 1; }; } | ||
8914 | - fi;; | ||
8915 | + fi;; | ||
8916 | esac | ||
8917 | done` || { (exit 1); exit 1; } | ||
8918 | + | ||
8919 | + if test x"$ac_file" != x-; then | ||
8920 | + { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
8921 | +echo "$as_me: creating $ac_file" >&6;} | ||
8922 | + rm -f "$ac_file" | ||
8923 | + fi | ||
8924 | _ACEOF | ||
8925 | cat >>$CONFIG_STATUS <<_ACEOF | ||
8926 | sed "$ac_vpsub | ||
8927 | @@ -11649,12 +12989,12 @@ | ||
8928 | # NAME is the cpp macro being defined and VALUE is the value it is being given. | ||
8929 | # | ||
8930 | # ac_d sets the value in "#define NAME VALUE" lines. | ||
8931 | -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | ||
8932 | -ac_dB='[ ].*$,\1#\2' | ||
8933 | +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | ||
8934 | +ac_dB='[ ].*$,\1#\2' | ||
8935 | ac_dC=' ' | ||
8936 | ac_dD=',;t' | ||
8937 | # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". | ||
8938 | -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | ||
8939 | +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | ||
8940 | ac_uB='$,\1#\2define\3' | ||
8941 | ac_uC=' ' | ||
8942 | ac_uD=',;t' | ||
8943 | @@ -11663,11 +13003,11 @@ | ||
8944 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
8945 | case $ac_file in | ||
8946 | - | *:- | *:-:* ) # input from stdin | ||
8947 | - cat >$tmp/stdin | ||
8948 | - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8949 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8950 | + cat >$tmp/stdin | ||
8951 | + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8952 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8953 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8954 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8955 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8956 | * ) ac_file_in=$ac_file.in ;; | ||
8957 | esac | ||
8958 | |||
8959 | @@ -11681,28 +13021,29 @@ | ||
8960 | case $f in | ||
8961 | -) echo $tmp/stdin ;; | ||
8962 | [\\/$]*) | ||
8963 | - # Absolute (can't be DOS-style, as IFS=:) | ||
8964 | - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8965 | + # Absolute (can't be DOS-style, as IFS=:) | ||
8966 | + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8967 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8968 | { (exit 1); exit 1; }; } | ||
8969 | - echo $f;; | ||
8970 | + # Do quote $f, to prevent DOS paths from being IFS'd. | ||
8971 | + echo "$f";; | ||
8972 | *) # Relative | ||
8973 | - if test -f "$f"; then | ||
8974 | - # Build tree | ||
8975 | - echo $f | ||
8976 | - elif test -f "$srcdir/$f"; then | ||
8977 | - # Source tree | ||
8978 | - echo $srcdir/$f | ||
8979 | - else | ||
8980 | - # /dev/null tree | ||
8981 | - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8982 | + if test -f "$f"; then | ||
8983 | + # Build tree | ||
8984 | + echo "$f" | ||
8985 | + elif test -f "$srcdir/$f"; then | ||
8986 | + # Source tree | ||
8987 | + echo "$srcdir/$f" | ||
8988 | + else | ||
8989 | + # /dev/null tree | ||
8990 | + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8991 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8992 | { (exit 1); exit 1; }; } | ||
8993 | - fi;; | ||
8994 | + fi;; | ||
8995 | esac | ||
8996 | done` || { (exit 1); exit 1; } | ||
8997 | # Remove the trailing spaces. | ||
8998 | - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | ||
8999 | + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | ||
9000 | |||
9001 | _ACEOF | ||
9002 | |||
9003 | @@ -11725,9 +13066,9 @@ | ||
9004 | s,[\\$`],\\&,g | ||
9005 | t clear | ||
9006 | : clear | ||
9007 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | ||
9008 | +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | ||
9009 | t end | ||
9010 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp | ||
9011 | +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp | ||
9012 | : end | ||
9013 | _ACEOF | ||
9014 | # If some macros were called several times there might be several times | ||
9015 | @@ -11741,13 +13082,13 @@ | ||
9016 | # example, in the case of _POSIX_SOURCE, which is predefined and required | ||
9017 | # on some systems where configure will not decide to define it. | ||
9018 | cat >>conftest.undefs <<\_ACEOF | ||
9019 | -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, | ||
9020 | +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, | ||
9021 | _ACEOF | ||
9022 | |||
9023 | # Break up conftest.defines because some shells have a limit on the size | ||
9024 | # of here documents, and old seds have small limits too (100 cmds). | ||
9025 | echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS | ||
9026 | -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | ||
9027 | +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | ||
9028 | echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS | ||
9029 | echo ' :' >>$CONFIG_STATUS | ||
9030 | rm -f conftest.tail | ||
9031 | @@ -11756,7 +13097,7 @@ | ||
9032 | # Write a limited-size here document to $tmp/defines.sed. | ||
9033 | echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS | ||
9034 | # Speed up: don't consider the non `#define' lines. | ||
9035 | - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | ||
9036 | + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | ||
9037 | # Work around the forget-to-reset-the-flag bug. | ||
9038 | echo 't clr' >>$CONFIG_STATUS | ||
9039 | echo ': clr' >>$CONFIG_STATUS | ||
9040 | @@ -11783,7 +13124,7 @@ | ||
9041 | # Write a limited-size here document to $tmp/undefs.sed. | ||
9042 | echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS | ||
9043 | # Speed up: don't consider the non `#undef' | ||
9044 | - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | ||
9045 | + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | ||
9046 | # Work around the forget-to-reset-the-flag bug. | ||
9047 | echo 't clr' >>$CONFIG_STATUS | ||
9048 | echo ': clr' >>$CONFIG_STATUS | ||
9049 | @@ -11817,10 +13158,10 @@ | ||
9050 | else | ||
9051 | ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
9052 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
9053 | - X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
9054 | - X"$ac_file" : 'X\(//\)$' \| \ | ||
9055 | - X"$ac_file" : 'X\(/\)' \| \ | ||
9056 | - . : '\(.\)' 2>/dev/null || | ||
9057 | + X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
9058 | + X"$ac_file" : 'X\(//\)$' \| \ | ||
9059 | + X"$ac_file" : 'X\(/\)' \| \ | ||
9060 | + . : '\(.\)' 2>/dev/null || | ||
9061 | echo X"$ac_file" | | ||
9062 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
9063 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
9064 | @@ -11836,10 +13177,10 @@ | ||
9065 | as_dirs="$as_dir $as_dirs" | ||
9066 | as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
9067 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
9068 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
9069 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
9070 | - X"$as_dir" : 'X\(/\)' \| \ | ||
9071 | - . : '\(.\)' 2>/dev/null || | ||
9072 | + X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
9073 | + X"$as_dir" : 'X\(//\)$' \| \ | ||
9074 | + X"$as_dir" : 'X\(/\)' \| \ | ||
9075 | + . : '\(.\)' 2>/dev/null || | ||
9076 | echo X"$as_dir" | | ||
9077 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
9078 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
9079 | --- patch-2.5.9.orig/configure.ac | ||
9080 | +++ patch-2.5.9/configure.ac | ||
9081 | @@ -64,6 +64,9 @@ | ||
9082 | gl_PREREQ_XMALLOC | ||
9083 | gl_QUOTE | ||
9084 | gl_QUOTEARG | ||
9085 | +gl_HASH | ||
9086 | + | ||
9087 | +ag_CHECK_NANOSECOND_STAT | ||
9088 | |||
9089 | dnl This should be in gnulib, but isn't for some reason. | ||
9090 | AC_DEFUN([jm_PREREQ_ADDEXT], | ||
9091 | --- patch-2.5.9.orig/pch.c | ||
9092 | +++ patch-2.5.9/pch.c | ||
9093 | @@ -1,6 +1,6 @@ | ||
9094 | /* reading patches */ | ||
9095 | |||
9096 | -/* $Id: pch.c,v 1.44 2003/05/20 14:03:17 eggert Exp $ */ | ||
9097 | +/* $Id: pch.c,v 1.45 2003/07/02 22:19:21 eggert Exp $ */ | ||
9098 | |||
9099 | /* Copyright (C) 1986, 1987, 1988 Larry Wall | ||
9100 | |||
9101 | @@ -366,10 +366,16 @@ | ||
9102 | if (!stars_last_line && strnEQ(s, "*** ", 4)) | ||
9103 | name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]); | ||
9104 | else if (strnEQ(s, "+++ ", 4)) | ||
9105 | + { | ||
9106 | /* Swap with NEW below. */ | ||
9107 | name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]); | ||
9108 | + p_strip_trailing_cr = strip_trailing_cr; | ||
9109 | + } | ||
9110 | else if (strnEQ(s, "Index:", 6)) | ||
9111 | + { | ||
9112 | name[INDEX] = fetchname (s+6, strippath, (time_t *) 0); | ||
9113 | + p_strip_trailing_cr = strip_trailing_cr; | ||
9114 | + } | ||
9115 | else if (strnEQ(s, "Prereq:", 7)) { | ||
9116 | for (t = s + 7; ISSPACE ((unsigned char) *t); t++) | ||
9117 | continue; | ||
9118 | @@ -409,6 +415,7 @@ | ||
9119 | p_timestamp[NEW] = timestamp; | ||
9120 | p_rfc934_nesting = (t - s) >> 1; | ||
9121 | } | ||
9122 | + p_strip_trailing_cr = strip_trailing_cr; | ||
9123 | } | ||
9124 | } | ||
9125 | if ((diff_type == NO_DIFF || diff_type == ED_DIFF) && | ||
9126 | --- patch-2.5.9.orig/util.c | ||
9127 | +++ patch-2.5.9/util.c | ||
9128 | @@ -45,9 +45,17 @@ | ||
9129 | # define raise(sig) kill (getpid (), sig) | ||
9130 | #endif | ||
9131 | |||
9132 | +#if defined(HAVE_STAT_TIMEVAL) | ||
9133 | +#include <time.h> | ||
9134 | +#endif | ||
9135 | + | ||
9136 | #include <stdarg.h> | ||
9137 | +#include <hash.h> | ||
9138 | |||
9139 | static void makedirs (char *); | ||
9140 | +static bool fid_search (const char *, const struct stat *, bool); | ||
9141 | +# define fid_exists(name, pst) fid_search (name, pst, false) | ||
9142 | +# define insert_fid(name) fid_search (name, NULL, true) | ||
9143 | |||
9144 | /* Move a file FROM (where *FROM_NEEDS_REMOVAL is nonzero if FROM | ||
9145 | needs removal when cleaning up at the end of execution) | ||
9146 | @@ -64,7 +72,7 @@ | ||
9147 | struct stat to_st; | ||
9148 | int to_errno = ! backup ? -1 : stat (to, &to_st) == 0 ? 0 : errno; | ||
9149 | |||
9150 | - if (backup) | ||
9151 | + if (backup && (to_errno || ! fid_exists (to, &to_st))) | ||
9152 | { | ||
9153 | int try_makedirs_errno = 0; | ||
9154 | char *bakname; | ||
9155 | @@ -165,6 +173,7 @@ | ||
9156 | if (! to_dir_known_to_exist) | ||
9157 | makedirs (to); | ||
9158 | copy_file (from, to, 0, mode); | ||
9159 | + insert_fid (to); | ||
9160 | return; | ||
9161 | } | ||
9162 | |||
9163 | @@ -173,6 +182,7 @@ | ||
9164 | } | ||
9165 | |||
9166 | rename_succeeded: | ||
9167 | + insert_fid (to); | ||
9168 | /* Do not clear *FROM_NEEDS_REMOVAL if it's possible that the | ||
9169 | rename returned zero because FROM and TO are hard links to | ||
9170 | the same file. */ | ||
9171 | @@ -1011,3 +1021,105 @@ | ||
9172 | if (file_seek (stream, offset, ptrname) != 0) | ||
9173 | pfatal ("fseek"); | ||
9174 | } | ||
9175 | + | ||
9176 | +typedef struct | ||
9177 | +{ | ||
9178 | + dev_t fid_dev; | ||
9179 | + ino_t fid_ino; | ||
9180 | + time_t fid_mtime; | ||
9181 | + unsigned long fid_mtimensec; | ||
9182 | +} file_id; | ||
9183 | + | ||
9184 | +unsigned | ||
9185 | +file_id_hasher (file_id *entry, unsigned table_size) | ||
9186 | +{ | ||
9187 | + return ((unsigned long) entry->fid_ino + | ||
9188 | + (unsigned long) entry->fid_dev + | ||
9189 | + (unsigned long) entry->fid_mtime + | ||
9190 | + (unsigned long) entry->fid_mtimensec) % table_size; | ||
9191 | +} | ||
9192 | + | ||
9193 | +bool | ||
9194 | +file_id_comparator (file_id *entry1, file_id *entry2) | ||
9195 | +{ | ||
9196 | + return (entry1->fid_dev == entry2->fid_dev && | ||
9197 | + entry1->fid_ino == entry2->fid_ino && | ||
9198 | + entry1->fid_mtime == entry2->fid_mtime && | ||
9199 | + entry1->fid_mtimensec == entry2->fid_mtimensec); | ||
9200 | +} | ||
9201 | + | ||
9202 | +void | ||
9203 | +file_id_freer (file_id *entry) | ||
9204 | +{ | ||
9205 | + free (entry); | ||
9206 | +} | ||
9207 | + | ||
9208 | +Hash_table *file_id_hash; | ||
9209 | + | ||
9210 | +/* Check if the file identified by FILENAME and PST was already seen. If the | ||
9211 | + file was already seen, returns TRUE. If the file has not yet been seen | ||
9212 | + and INSERT is TRUE, it is inserted. PST or FILENAME may be NULL (but not | ||
9213 | + both of them). */ | ||
9214 | + | ||
9215 | +static bool | ||
9216 | +fid_search (const char *filename, const struct stat *pst, bool insert) | ||
9217 | +{ | ||
9218 | + struct stat st; | ||
9219 | + | ||
9220 | + if (!file_id_hash) | ||
9221 | + { | ||
9222 | + file_id_hash = hash_initialize (0, NULL, (Hash_hasher) file_id_hasher, | ||
9223 | + (Hash_comparator) file_id_comparator, | ||
9224 | + (Hash_data_freer) file_id_freer); | ||
9225 | + if (!file_id_hash) | ||
9226 | + pfatal ("hash_initialize"); | ||
9227 | + } | ||
9228 | + | ||
9229 | + if (!pst) | ||
9230 | + { | ||
9231 | + if (stat (filename, &st) != 0) | ||
9232 | + pfatal ("%s", quotearg (filename)); | ||
9233 | + pst = &st; | ||
9234 | + } | ||
9235 | + | ||
9236 | + if (insert) | ||
9237 | + { | ||
9238 | + file_id *pfid = xmalloc (sizeof (file_id)), *old_pfid; | ||
9239 | + pfid->fid_dev = pst->st_dev; | ||
9240 | + pfid->fid_ino = pst->st_ino; | ||
9241 | + pfid->fid_mtime = pst->st_mtime; | ||
9242 | +#if defined(HAVE_STAT_NSEC) | ||
9243 | + pfid->fid_mtimensec = pst->st_mtimensec; | ||
9244 | +#elif defined(HAVE_STAT_TIMEVAL) | ||
9245 | + pfid->fid_mtimensec = pst->st_mtim.tv_nsec; | ||
9246 | +#else | ||
9247 | + pfid->fid_mtimensec = 0; | ||
9248 | +#endif | ||
9249 | + old_pfid = hash_insert (file_id_hash, pfid); | ||
9250 | + if (!old_pfid) | ||
9251 | + pfatal ("hash_insert"); | ||
9252 | + else if (old_pfid != pfid) | ||
9253 | + { | ||
9254 | + free (pfid); | ||
9255 | + return true; | ||
9256 | + } | ||
9257 | + else | ||
9258 | + return false; | ||
9259 | + } | ||
9260 | + else | ||
9261 | + { | ||
9262 | + file_id fid; | ||
9263 | + fid.fid_dev = pst->st_dev; | ||
9264 | + fid.fid_ino = pst->st_ino; | ||
9265 | + fid.fid_mtime = pst->st_mtime; | ||
9266 | +#if defined(HAVE_STAT_NSEC) | ||
9267 | + fid.fid_mtimensec = pst->st_mtimensec; | ||
9268 | +#elif defined(HAVE_STAT_TIMEVAL) | ||
9269 | + fid.fid_mtimensec = pst->st_mtim.tv_nsec; | ||
9270 | +#else | ||
9271 | + fid.fid_mtimensec = 0; | ||
9272 | +#endif | ||
9273 | + return hash_lookup (file_id_hash, &fid) != 0; | ||
9274 | + } | ||
9275 | +} | ||
9276 | + | ||
9277 | --- patch-2.5.9.orig/hash.c | ||
9278 | +++ patch-2.5.9/hash.c | ||
9279 | @@ -0,0 +1,1051 @@ | ||
9280 | +/* hash - hashing table processing. | ||
9281 | + | ||
9282 | + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software | ||
9283 | + Foundation, Inc. | ||
9284 | + | ||
9285 | + Written by Jim Meyering, 1992. | ||
9286 | + | ||
9287 | + This program is free software; you can redistribute it and/or modify | ||
9288 | + it under the terms of the GNU General Public License as published by | ||
9289 | + the Free Software Foundation; either version 2, or (at your option) | ||
9290 | + any later version. | ||
9291 | + | ||
9292 | + This program is distributed in the hope that it will be useful, | ||
9293 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9294 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
9295 | + GNU General Public License for more details. | ||
9296 | + | ||
9297 | + You should have received a copy of the GNU General Public License | ||
9298 | + along with this program; if not, write to the Free Software Foundation, | ||
9299 | + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||
9300 | + | ||
9301 | +/* A generic hash table package. */ | ||
9302 | + | ||
9303 | +/* Define USE_OBSTACK to 1 if you want the allocator to use obstacks instead | ||
9304 | + of malloc. If you change USE_OBSTACK, you have to recompile! */ | ||
9305 | + | ||
9306 | +#if HAVE_CONFIG_H | ||
9307 | +# include <config.h> | ||
9308 | +#endif | ||
9309 | +#if HAVE_STDLIB_H | ||
9310 | +# include <stdlib.h> | ||
9311 | +#endif | ||
9312 | + | ||
9313 | +#include <limits.h> | ||
9314 | +#include <stdbool.h> | ||
9315 | +#include <stdio.h> | ||
9316 | + | ||
9317 | +#ifndef HAVE_DECL_FREE | ||
9318 | +"this configure-time declaration test was not run" | ||
9319 | +#endif | ||
9320 | +#if !HAVE_DECL_FREE | ||
9321 | +void free (); | ||
9322 | +#endif | ||
9323 | + | ||
9324 | +#ifndef HAVE_DECL_MALLOC | ||
9325 | +"this configure-time declaration test was not run" | ||
9326 | +#endif | ||
9327 | +#if !HAVE_DECL_MALLOC | ||
9328 | +char *malloc (); | ||
9329 | +#endif | ||
9330 | + | ||
9331 | +#if USE_OBSTACK | ||
9332 | +# include "obstack.h" | ||
9333 | +# ifndef obstack_chunk_alloc | ||
9334 | +# define obstack_chunk_alloc malloc | ||
9335 | +# endif | ||
9336 | +# ifndef obstack_chunk_free | ||
9337 | +# define obstack_chunk_free free | ||
9338 | +# endif | ||
9339 | +#endif | ||
9340 | + | ||
9341 | +#include "hash.h" | ||
9342 | + | ||
9343 | +struct hash_table | ||
9344 | + { | ||
9345 | + /* The array of buckets starts at BUCKET and extends to BUCKET_LIMIT-1, | ||
9346 | + for a possibility of N_BUCKETS. Among those, N_BUCKETS_USED buckets | ||
9347 | + are not empty, there are N_ENTRIES active entries in the table. */ | ||
9348 | + struct hash_entry *bucket; | ||
9349 | + struct hash_entry *bucket_limit; | ||
9350 | + unsigned n_buckets; | ||
9351 | + unsigned n_buckets_used; | ||
9352 | + unsigned n_entries; | ||
9353 | + | ||
9354 | + /* Tuning arguments, kept in a physicaly separate structure. */ | ||
9355 | + const Hash_tuning *tuning; | ||
9356 | + | ||
9357 | + /* Three functions are given to `hash_initialize', see the documentation | ||
9358 | + block for this function. In a word, HASHER randomizes a user entry | ||
9359 | + into a number up from 0 up to some maximum minus 1; COMPARATOR returns | ||
9360 | + true if two user entries compare equally; and DATA_FREER is the cleanup | ||
9361 | + function for a user entry. */ | ||
9362 | + Hash_hasher hasher; | ||
9363 | + Hash_comparator comparator; | ||
9364 | + Hash_data_freer data_freer; | ||
9365 | + | ||
9366 | + /* A linked list of freed struct hash_entry structs. */ | ||
9367 | + struct hash_entry *free_entry_list; | ||
9368 | + | ||
9369 | +#if USE_OBSTACK | ||
9370 | + /* Whenever obstacks are used, it is possible to allocate all overflowed | ||
9371 | + entries into a single stack, so they all can be freed in a single | ||
9372 | + operation. It is not clear if the speedup is worth the trouble. */ | ||
9373 | + struct obstack entry_stack; | ||
9374 | +#endif | ||
9375 | + }; | ||
9376 | + | ||
9377 | +/* A hash table contains many internal entries, each holding a pointer to | ||
9378 | + some user provided data (also called a user entry). An entry indistinctly | ||
9379 | + refers to both the internal entry and its associated user entry. A user | ||
9380 | + entry contents may be hashed by a randomization function (the hashing | ||
9381 | + function, or just `hasher' for short) into a number (or `slot') between 0 | ||
9382 | + and the current table size. At each slot position in the hash table, | ||
9383 | + starts a linked chain of entries for which the user data all hash to this | ||
9384 | + slot. A bucket is the collection of all entries hashing to the same slot. | ||
9385 | + | ||
9386 | + A good `hasher' function will distribute entries rather evenly in buckets. | ||
9387 | + In the ideal case, the length of each bucket is roughly the number of | ||
9388 | + entries divided by the table size. Finding the slot for a data is usually | ||
9389 | + done in constant time by the `hasher', and the later finding of a precise | ||
9390 | + entry is linear in time with the size of the bucket. Consequently, a | ||
9391 | + larger hash table size (that is, a larger number of buckets) is prone to | ||
9392 | + yielding shorter chains, *given* the `hasher' function behaves properly. | ||
9393 | + | ||
9394 | + Long buckets slow down the lookup algorithm. One might use big hash table | ||
9395 | + sizes in hope to reduce the average length of buckets, but this might | ||
9396 | + become inordinate, as unused slots in the hash table take some space. The | ||
9397 | + best bet is to make sure you are using a good `hasher' function (beware | ||
9398 | + that those are not that easy to write! :-), and to use a table size | ||
9399 | + larger than the actual number of entries. */ | ||
9400 | + | ||
9401 | +/* If an insertion makes the ratio of nonempty buckets to table size larger | ||
9402 | + than the growth threshold (a number between 0.0 and 1.0), then increase | ||
9403 | + the table size by multiplying by the growth factor (a number greater than | ||
9404 | + 1.0). The growth threshold defaults to 0.8, and the growth factor | ||
9405 | + defaults to 1.414, meaning that the table will have doubled its size | ||
9406 | + every second time 80% of the buckets get used. */ | ||
9407 | +#define DEFAULT_GROWTH_THRESHOLD 0.8 | ||
9408 | +#define DEFAULT_GROWTH_FACTOR 1.414 | ||
9409 | + | ||
9410 | +/* If a deletion empties a bucket and causes the ratio of used buckets to | ||
9411 | + table size to become smaller than the shrink threshold (a number between | ||
9412 | + 0.0 and 1.0), then shrink the table by multiplying by the shrink factor (a | ||
9413 | + number greater than the shrink threshold but smaller than 1.0). The shrink | ||
9414 | + threshold and factor default to 0.0 and 1.0, meaning that the table never | ||
9415 | + shrinks. */ | ||
9416 | +#define DEFAULT_SHRINK_THRESHOLD 0.0 | ||
9417 | +#define DEFAULT_SHRINK_FACTOR 1.0 | ||
9418 | + | ||
9419 | +/* Use this to initialize or reset a TUNING structure to | ||
9420 | + some sensible values. */ | ||
9421 | +static const Hash_tuning default_tuning = | ||
9422 | + { | ||
9423 | + DEFAULT_SHRINK_THRESHOLD, | ||
9424 | + DEFAULT_SHRINK_FACTOR, | ||
9425 | + DEFAULT_GROWTH_THRESHOLD, | ||
9426 | + DEFAULT_GROWTH_FACTOR, | ||
9427 | + false | ||
9428 | + }; | ||
9429 | + | ||
9430 | +/* Information and lookup. */ | ||
9431 | + | ||
9432 | +/* The following few functions provide information about the overall hash | ||
9433 | + table organization: the number of entries, number of buckets and maximum | ||
9434 | + length of buckets. */ | ||
9435 | + | ||
9436 | +/* Return the number of buckets in the hash table. The table size, the total | ||
9437 | + number of buckets (used plus unused), or the maximum number of slots, are | ||
9438 | + the same quantity. */ | ||
9439 | + | ||
9440 | +unsigned | ||
9441 | +hash_get_n_buckets (const Hash_table *table) | ||
9442 | +{ | ||
9443 | + return table->n_buckets; | ||
9444 | +} | ||
9445 | + | ||
9446 | +/* Return the number of slots in use (non-empty buckets). */ | ||
9447 | + | ||
9448 | +unsigned | ||
9449 | +hash_get_n_buckets_used (const Hash_table *table) | ||
9450 | +{ | ||
9451 | + return table->n_buckets_used; | ||
9452 | +} | ||
9453 | + | ||
9454 | +/* Return the number of active entries. */ | ||
9455 | + | ||
9456 | +unsigned | ||
9457 | +hash_get_n_entries (const Hash_table *table) | ||
9458 | +{ | ||
9459 | + return table->n_entries; | ||
9460 | +} | ||
9461 | + | ||
9462 | +/* Return the length of the longest chain (bucket). */ | ||
9463 | + | ||
9464 | +unsigned | ||
9465 | +hash_get_max_bucket_length (const Hash_table *table) | ||
9466 | +{ | ||
9467 | + struct hash_entry *bucket; | ||
9468 | + unsigned max_bucket_length = 0; | ||
9469 | + | ||
9470 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9471 | + { | ||
9472 | + if (bucket->data) | ||
9473 | + { | ||
9474 | + struct hash_entry *cursor = bucket; | ||
9475 | + unsigned bucket_length = 1; | ||
9476 | + | ||
9477 | + while (cursor = cursor->next, cursor) | ||
9478 | + bucket_length++; | ||
9479 | + | ||
9480 | + if (bucket_length > max_bucket_length) | ||
9481 | + max_bucket_length = bucket_length; | ||
9482 | + } | ||
9483 | + } | ||
9484 | + | ||
9485 | + return max_bucket_length; | ||
9486 | +} | ||
9487 | + | ||
9488 | +/* Do a mild validation of a hash table, by traversing it and checking two | ||
9489 | + statistics. */ | ||
9490 | + | ||
9491 | +bool | ||
9492 | +hash_table_ok (const Hash_table *table) | ||
9493 | +{ | ||
9494 | + struct hash_entry *bucket; | ||
9495 | + unsigned n_buckets_used = 0; | ||
9496 | + unsigned n_entries = 0; | ||
9497 | + | ||
9498 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9499 | + { | ||
9500 | + if (bucket->data) | ||
9501 | + { | ||
9502 | + struct hash_entry *cursor = bucket; | ||
9503 | + | ||
9504 | + /* Count bucket head. */ | ||
9505 | + n_buckets_used++; | ||
9506 | + n_entries++; | ||
9507 | + | ||
9508 | + /* Count bucket overflow. */ | ||
9509 | + while (cursor = cursor->next, cursor) | ||
9510 | + n_entries++; | ||
9511 | + } | ||
9512 | + } | ||
9513 | + | ||
9514 | + if (n_buckets_used == table->n_buckets_used && n_entries == table->n_entries) | ||
9515 | + return true; | ||
9516 | + | ||
9517 | + return false; | ||
9518 | +} | ||
9519 | + | ||
9520 | +void | ||
9521 | +hash_print_statistics (const Hash_table *table, FILE *stream) | ||
9522 | +{ | ||
9523 | + unsigned n_entries = hash_get_n_entries (table); | ||
9524 | + unsigned n_buckets = hash_get_n_buckets (table); | ||
9525 | + unsigned n_buckets_used = hash_get_n_buckets_used (table); | ||
9526 | + unsigned max_bucket_length = hash_get_max_bucket_length (table); | ||
9527 | + | ||
9528 | + fprintf (stream, "# entries: %u\n", n_entries); | ||
9529 | + fprintf (stream, "# buckets: %u\n", n_buckets); | ||
9530 | + fprintf (stream, "# buckets used: %u (%.2f%%)\n", n_buckets_used, | ||
9531 | + (100.0 * n_buckets_used) / n_buckets); | ||
9532 | + fprintf (stream, "max bucket length: %u\n", max_bucket_length); | ||
9533 | +} | ||
9534 | + | ||
9535 | +/* If ENTRY matches an entry already in the hash table, return the | ||
9536 | + entry from the table. Otherwise, return NULL. */ | ||
9537 | + | ||
9538 | +void * | ||
9539 | +hash_lookup (const Hash_table *table, const void *entry) | ||
9540 | +{ | ||
9541 | + struct hash_entry *bucket | ||
9542 | + = table->bucket + table->hasher (entry, table->n_buckets); | ||
9543 | + struct hash_entry *cursor; | ||
9544 | + | ||
9545 | + if (! (bucket < table->bucket_limit)) | ||
9546 | + abort (); | ||
9547 | + | ||
9548 | + if (bucket->data == NULL) | ||
9549 | + return NULL; | ||
9550 | + | ||
9551 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9552 | + if (table->comparator (entry, cursor->data)) | ||
9553 | + return cursor->data; | ||
9554 | + | ||
9555 | + return NULL; | ||
9556 | +} | ||
9557 | + | ||
9558 | +/* Walking. */ | ||
9559 | + | ||
9560 | +/* The functions in this page traverse the hash table and process the | ||
9561 | + contained entries. For the traversal to work properly, the hash table | ||
9562 | + should not be resized nor modified while any particular entry is being | ||
9563 | + processed. In particular, entries should not be added or removed. */ | ||
9564 | + | ||
9565 | +/* Return the first data in the table, or NULL if the table is empty. */ | ||
9566 | + | ||
9567 | +void * | ||
9568 | +hash_get_first (const Hash_table *table) | ||
9569 | +{ | ||
9570 | + struct hash_entry *bucket; | ||
9571 | + | ||
9572 | + if (table->n_entries == 0) | ||
9573 | + return NULL; | ||
9574 | + | ||
9575 | + for (bucket = table->bucket; ; bucket++) | ||
9576 | + if (! (bucket < table->bucket_limit)) | ||
9577 | + abort (); | ||
9578 | + else if (bucket->data) | ||
9579 | + return bucket->data; | ||
9580 | +} | ||
9581 | + | ||
9582 | +/* Return the user data for the entry following ENTRY, where ENTRY has been | ||
9583 | + returned by a previous call to either `hash_get_first' or `hash_get_next'. | ||
9584 | + Return NULL if there are no more entries. */ | ||
9585 | + | ||
9586 | +void * | ||
9587 | +hash_get_next (const Hash_table *table, const void *entry) | ||
9588 | +{ | ||
9589 | + struct hash_entry *bucket | ||
9590 | + = table->bucket + table->hasher (entry, table->n_buckets); | ||
9591 | + struct hash_entry *cursor; | ||
9592 | + | ||
9593 | + if (! (bucket < table->bucket_limit)) | ||
9594 | + abort (); | ||
9595 | + | ||
9596 | + /* Find next entry in the same bucket. */ | ||
9597 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9598 | + if (cursor->data == entry && cursor->next) | ||
9599 | + return cursor->next->data; | ||
9600 | + | ||
9601 | + /* Find first entry in any subsequent bucket. */ | ||
9602 | + while (++bucket < table->bucket_limit) | ||
9603 | + if (bucket->data) | ||
9604 | + return bucket->data; | ||
9605 | + | ||
9606 | + /* None found. */ | ||
9607 | + return NULL; | ||
9608 | +} | ||
9609 | + | ||
9610 | +/* Fill BUFFER with pointers to active user entries in the hash table, then | ||
9611 | + return the number of pointers copied. Do not copy more than BUFFER_SIZE | ||
9612 | + pointers. */ | ||
9613 | + | ||
9614 | +unsigned | ||
9615 | +hash_get_entries (const Hash_table *table, void **buffer, | ||
9616 | + unsigned buffer_size) | ||
9617 | +{ | ||
9618 | + unsigned counter = 0; | ||
9619 | + struct hash_entry *bucket; | ||
9620 | + struct hash_entry *cursor; | ||
9621 | + | ||
9622 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9623 | + { | ||
9624 | + if (bucket->data) | ||
9625 | + { | ||
9626 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9627 | + { | ||
9628 | + if (counter >= buffer_size) | ||
9629 | + return counter; | ||
9630 | + buffer[counter++] = cursor->data; | ||
9631 | + } | ||
9632 | + } | ||
9633 | + } | ||
9634 | + | ||
9635 | + return counter; | ||
9636 | +} | ||
9637 | + | ||
9638 | +/* Call a PROCESSOR function for each entry of a hash table, and return the | ||
9639 | + number of entries for which the processor function returned success. A | ||
9640 | + pointer to some PROCESSOR_DATA which will be made available to each call to | ||
9641 | + the processor function. The PROCESSOR accepts two arguments: the first is | ||
9642 | + the user entry being walked into, the second is the value of PROCESSOR_DATA | ||
9643 | + as received. The walking continue for as long as the PROCESSOR function | ||
9644 | + returns nonzero. When it returns zero, the walking is interrupted. */ | ||
9645 | + | ||
9646 | +unsigned | ||
9647 | +hash_do_for_each (const Hash_table *table, Hash_processor processor, | ||
9648 | + void *processor_data) | ||
9649 | +{ | ||
9650 | + unsigned counter = 0; | ||
9651 | + struct hash_entry *bucket; | ||
9652 | + struct hash_entry *cursor; | ||
9653 | + | ||
9654 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9655 | + { | ||
9656 | + if (bucket->data) | ||
9657 | + { | ||
9658 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9659 | + { | ||
9660 | + if (!(*processor) (cursor->data, processor_data)) | ||
9661 | + return counter; | ||
9662 | + counter++; | ||
9663 | + } | ||
9664 | + } | ||
9665 | + } | ||
9666 | + | ||
9667 | + return counter; | ||
9668 | +} | ||
9669 | + | ||
9670 | +/* Allocation and clean-up. */ | ||
9671 | + | ||
9672 | +/* Return a hash index for a NUL-terminated STRING between 0 and N_BUCKETS-1. | ||
9673 | + This is a convenience routine for constructing other hashing functions. */ | ||
9674 | + | ||
9675 | +#if USE_DIFF_HASH | ||
9676 | + | ||
9677 | +/* About hashings, Paul Eggert writes to me (FP), on 1994-01-01: "Please see | ||
9678 | + B. J. McKenzie, R. Harries & T. Bell, Selecting a hashing algorithm, | ||
9679 | + Software--practice & experience 20, 2 (Feb 1990), 209-224. Good hash | ||
9680 | + algorithms tend to be domain-specific, so what's good for [diffutils'] io.c | ||
9681 | + may not be good for your application." */ | ||
9682 | + | ||
9683 | +unsigned | ||
9684 | +hash_string (const char *string, unsigned n_buckets) | ||
9685 | +{ | ||
9686 | +# define ROTATE_LEFT(Value, Shift) \ | ||
9687 | + ((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift))) | ||
9688 | +# define HASH_ONE_CHAR(Value, Byte) \ | ||
9689 | + ((Byte) + ROTATE_LEFT (Value, 7)) | ||
9690 | + | ||
9691 | + unsigned value = 0; | ||
9692 | + | ||
9693 | + for (; *string; string++) | ||
9694 | + value = HASH_ONE_CHAR (value, *(const unsigned char *) string); | ||
9695 | + return value % n_buckets; | ||
9696 | + | ||
9697 | +# undef ROTATE_LEFT | ||
9698 | +# undef HASH_ONE_CHAR | ||
9699 | +} | ||
9700 | + | ||
9701 | +#else /* not USE_DIFF_HASH */ | ||
9702 | + | ||
9703 | +/* This one comes from `recode', and performs a bit better than the above as | ||
9704 | + per a few experiments. It is inspired from a hashing routine found in the | ||
9705 | + very old Cyber `snoop', itself written in typical Greg Mansfield style. | ||
9706 | + (By the way, what happened to this excellent man? Is he still alive?) */ | ||
9707 | + | ||
9708 | +unsigned | ||
9709 | +hash_string (const char *string, unsigned n_buckets) | ||
9710 | +{ | ||
9711 | + unsigned value = 0; | ||
9712 | + | ||
9713 | + while (*string) | ||
9714 | + value = ((value * 31 + (int) *(const unsigned char *) string++) | ||
9715 | + % n_buckets); | ||
9716 | + return value; | ||
9717 | +} | ||
9718 | + | ||
9719 | +#endif /* not USE_DIFF_HASH */ | ||
9720 | + | ||
9721 | +/* Return true if CANDIDATE is a prime number. CANDIDATE should be an odd | ||
9722 | + number at least equal to 11. */ | ||
9723 | + | ||
9724 | +static bool | ||
9725 | +is_prime (unsigned long candidate) | ||
9726 | +{ | ||
9727 | + unsigned long divisor = 3; | ||
9728 | + unsigned long square = divisor * divisor; | ||
9729 | + | ||
9730 | + while (square < candidate && (candidate % divisor)) | ||
9731 | + { | ||
9732 | + divisor++; | ||
9733 | + square += 4 * divisor; | ||
9734 | + divisor++; | ||
9735 | + } | ||
9736 | + | ||
9737 | + return (candidate % divisor ? true : false); | ||
9738 | +} | ||
9739 | + | ||
9740 | +/* Round a given CANDIDATE number up to the nearest prime, and return that | ||
9741 | + prime. Primes lower than 10 are merely skipped. */ | ||
9742 | + | ||
9743 | +static unsigned long | ||
9744 | +next_prime (unsigned long candidate) | ||
9745 | +{ | ||
9746 | + /* Skip small primes. */ | ||
9747 | + if (candidate < 10) | ||
9748 | + candidate = 10; | ||
9749 | + | ||
9750 | + /* Make it definitely odd. */ | ||
9751 | + candidate |= 1; | ||
9752 | + | ||
9753 | + while (!is_prime (candidate)) | ||
9754 | + candidate += 2; | ||
9755 | + | ||
9756 | + return candidate; | ||
9757 | +} | ||
9758 | + | ||
9759 | +void | ||
9760 | +hash_reset_tuning (Hash_tuning *tuning) | ||
9761 | +{ | ||
9762 | + *tuning = default_tuning; | ||
9763 | +} | ||
9764 | + | ||
9765 | +/* For the given hash TABLE, check the user supplied tuning structure for | ||
9766 | + reasonable values, and return true if there is no gross error with it. | ||
9767 | + Otherwise, definitively reset the TUNING field to some acceptable default | ||
9768 | + in the hash table (that is, the user loses the right of further modifying | ||
9769 | + tuning arguments), and return false. */ | ||
9770 | + | ||
9771 | +static bool | ||
9772 | +check_tuning (Hash_table *table) | ||
9773 | +{ | ||
9774 | + const Hash_tuning *tuning = table->tuning; | ||
9775 | + | ||
9776 | + if (tuning->growth_threshold > 0.0 | ||
9777 | + && tuning->growth_threshold < 1.0 | ||
9778 | + && tuning->growth_factor > 1.0 | ||
9779 | + && tuning->shrink_threshold >= 0.0 | ||
9780 | + && tuning->shrink_threshold < 1.0 | ||
9781 | + && tuning->shrink_factor > tuning->shrink_threshold | ||
9782 | + && tuning->shrink_factor <= 1.0 | ||
9783 | + && tuning->shrink_threshold < tuning->growth_threshold) | ||
9784 | + return true; | ||
9785 | + | ||
9786 | + table->tuning = &default_tuning; | ||
9787 | + return false; | ||
9788 | +} | ||
9789 | + | ||
9790 | +/* Allocate and return a new hash table, or NULL upon failure. The initial | ||
9791 | + number of buckets is automatically selected so as to _guarantee_ that you | ||
9792 | + may insert at least CANDIDATE different user entries before any growth of | ||
9793 | + the hash table size occurs. So, if have a reasonably tight a-priori upper | ||
9794 | + bound on the number of entries you intend to insert in the hash table, you | ||
9795 | + may save some table memory and insertion time, by specifying it here. If | ||
9796 | + the IS_N_BUCKETS field of the TUNING structure is true, the CANDIDATE | ||
9797 | + argument has its meaning changed to the wanted number of buckets. | ||
9798 | + | ||
9799 | + TUNING points to a structure of user-supplied values, in case some fine | ||
9800 | + tuning is wanted over the default behavior of the hasher. If TUNING is | ||
9801 | + NULL, the default tuning parameters are used instead. | ||
9802 | + | ||
9803 | + The user-supplied HASHER function should be provided. It accepts two | ||
9804 | + arguments ENTRY and TABLE_SIZE. It computes, by hashing ENTRY contents, a | ||
9805 | + slot number for that entry which should be in the range 0..TABLE_SIZE-1. | ||
9806 | + This slot number is then returned. | ||
9807 | + | ||
9808 | + The user-supplied COMPARATOR function should be provided. It accepts two | ||
9809 | + arguments pointing to user data, it then returns true for a pair of entries | ||
9810 | + that compare equal, or false otherwise. This function is internally called | ||
9811 | + on entries which are already known to hash to the same bucket index. | ||
9812 | + | ||
9813 | + The user-supplied DATA_FREER function, when not NULL, may be later called | ||
9814 | + with the user data as an argument, just before the entry containing the | ||
9815 | + data gets freed. This happens from within `hash_free' or `hash_clear'. | ||
9816 | + You should specify this function only if you want these functions to free | ||
9817 | + all of your `data' data. This is typically the case when your data is | ||
9818 | + simply an auxiliary struct that you have malloc'd to aggregate several | ||
9819 | + values. */ | ||
9820 | + | ||
9821 | +Hash_table * | ||
9822 | +hash_initialize (unsigned candidate, const Hash_tuning *tuning, | ||
9823 | + Hash_hasher hasher, Hash_comparator comparator, | ||
9824 | + Hash_data_freer data_freer) | ||
9825 | +{ | ||
9826 | + Hash_table *table; | ||
9827 | + struct hash_entry *bucket; | ||
9828 | + | ||
9829 | + if (hasher == NULL || comparator == NULL) | ||
9830 | + return NULL; | ||
9831 | + | ||
9832 | + table = (Hash_table *) malloc (sizeof (Hash_table)); | ||
9833 | + if (table == NULL) | ||
9834 | + return NULL; | ||
9835 | + | ||
9836 | + if (!tuning) | ||
9837 | + tuning = &default_tuning; | ||
9838 | + table->tuning = tuning; | ||
9839 | + if (!check_tuning (table)) | ||
9840 | + { | ||
9841 | + /* Fail if the tuning options are invalid. This is the only occasion | ||
9842 | + when the user gets some feedback about it. Once the table is created, | ||
9843 | + if the user provides invalid tuning options, we silently revert to | ||
9844 | + using the defaults, and ignore further request to change the tuning | ||
9845 | + options. */ | ||
9846 | + free (table); | ||
9847 | + return NULL; | ||
9848 | + } | ||
9849 | + | ||
9850 | + table->n_buckets | ||
9851 | + = next_prime (tuning->is_n_buckets ? candidate | ||
9852 | + : (unsigned) (candidate / tuning->growth_threshold)); | ||
9853 | + | ||
9854 | + table->bucket = (struct hash_entry *) | ||
9855 | + malloc (table->n_buckets * sizeof (struct hash_entry)); | ||
9856 | + if (table->bucket == NULL) | ||
9857 | + { | ||
9858 | + free (table); | ||
9859 | + return NULL; | ||
9860 | + } | ||
9861 | + table->bucket_limit = table->bucket + table->n_buckets; | ||
9862 | + | ||
9863 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9864 | + { | ||
9865 | + bucket->data = NULL; | ||
9866 | + bucket->next = NULL; | ||
9867 | + } | ||
9868 | + table->n_buckets_used = 0; | ||
9869 | + table->n_entries = 0; | ||
9870 | + | ||
9871 | + table->hasher = hasher; | ||
9872 | + table->comparator = comparator; | ||
9873 | + table->data_freer = data_freer; | ||
9874 | + | ||
9875 | + table->free_entry_list = NULL; | ||
9876 | +#if USE_OBSTACK | ||
9877 | + obstack_init (&table->entry_stack); | ||
9878 | +#endif | ||
9879 | + return table; | ||
9880 | +} | ||
9881 | + | ||
9882 | +/* Make all buckets empty, placing any chained entries on the free list. | ||
9883 | + Apply the user-specified function data_freer (if any) to the datas of any | ||
9884 | + affected entries. */ | ||
9885 | + | ||
9886 | +void | ||
9887 | +hash_clear (Hash_table *table) | ||
9888 | +{ | ||
9889 | + struct hash_entry *bucket; | ||
9890 | + | ||
9891 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9892 | + { | ||
9893 | + if (bucket->data) | ||
9894 | + { | ||
9895 | + struct hash_entry *cursor; | ||
9896 | + struct hash_entry *next; | ||
9897 | + | ||
9898 | + /* Free the bucket overflow. */ | ||
9899 | + for (cursor = bucket->next; cursor; cursor = next) | ||
9900 | + { | ||
9901 | + if (table->data_freer) | ||
9902 | + (*table->data_freer) (cursor->data); | ||
9903 | + cursor->data = NULL; | ||
9904 | + | ||
9905 | + next = cursor->next; | ||
9906 | + /* Relinking is done one entry at a time, as it is to be expected | ||
9907 | + that overflows are either rare or short. */ | ||
9908 | + cursor->next = table->free_entry_list; | ||
9909 | + table->free_entry_list = cursor; | ||
9910 | + } | ||
9911 | + | ||
9912 | + /* Free the bucket head. */ | ||
9913 | + if (table->data_freer) | ||
9914 | + (*table->data_freer) (bucket->data); | ||
9915 | + bucket->data = NULL; | ||
9916 | + bucket->next = NULL; | ||
9917 | + } | ||
9918 | + } | ||
9919 | + | ||
9920 | + table->n_buckets_used = 0; | ||
9921 | + table->n_entries = 0; | ||
9922 | +} | ||
9923 | + | ||
9924 | +/* Reclaim all storage associated with a hash table. If a data_freer | ||
9925 | + function has been supplied by the user when the hash table was created, | ||
9926 | + this function applies it to the data of each entry before freeing that | ||
9927 | + entry. */ | ||
9928 | + | ||
9929 | +void | ||
9930 | +hash_free (Hash_table *table) | ||
9931 | +{ | ||
9932 | + struct hash_entry *bucket; | ||
9933 | + struct hash_entry *cursor; | ||
9934 | + struct hash_entry *next; | ||
9935 | + | ||
9936 | + /* Call the user data_freer function. */ | ||
9937 | + if (table->data_freer && table->n_entries) | ||
9938 | + { | ||
9939 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9940 | + { | ||
9941 | + if (bucket->data) | ||
9942 | + { | ||
9943 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9944 | + { | ||
9945 | + (*table->data_freer) (cursor->data); | ||
9946 | + } | ||
9947 | + } | ||
9948 | + } | ||
9949 | + } | ||
9950 | + | ||
9951 | +#if USE_OBSTACK | ||
9952 | + | ||
9953 | + obstack_free (&table->entry_stack, NULL); | ||
9954 | + | ||
9955 | +#else | ||
9956 | + | ||
9957 | + /* Free all bucket overflowed entries. */ | ||
9958 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9959 | + { | ||
9960 | + for (cursor = bucket->next; cursor; cursor = next) | ||
9961 | + { | ||
9962 | + next = cursor->next; | ||
9963 | + free (cursor); | ||
9964 | + } | ||
9965 | + } | ||
9966 | + | ||
9967 | + /* Also reclaim the internal list of previously freed entries. */ | ||
9968 | + for (cursor = table->free_entry_list; cursor; cursor = next) | ||
9969 | + { | ||
9970 | + next = cursor->next; | ||
9971 | + free (cursor); | ||
9972 | + } | ||
9973 | + | ||
9974 | +#endif | ||
9975 | + | ||
9976 | + /* Free the remainder of the hash table structure. */ | ||
9977 | + free (table->bucket); | ||
9978 | + free (table); | ||
9979 | +} | ||
9980 | + | ||
9981 | +/* Insertion and deletion. */ | ||
9982 | + | ||
9983 | +/* Get a new hash entry for a bucket overflow, possibly by reclying a | ||
9984 | + previously freed one. If this is not possible, allocate a new one. */ | ||
9985 | + | ||
9986 | +static struct hash_entry * | ||
9987 | +allocate_entry (Hash_table *table) | ||
9988 | +{ | ||
9989 | + struct hash_entry *new; | ||
9990 | + | ||
9991 | + if (table->free_entry_list) | ||
9992 | + { | ||
9993 | + new = table->free_entry_list; | ||
9994 | + table->free_entry_list = new->next; | ||
9995 | + } | ||
9996 | + else | ||
9997 | + { | ||
9998 | +#if USE_OBSTACK | ||
9999 | + new = (struct hash_entry *) | ||
10000 | + obstack_alloc (&table->entry_stack, sizeof (struct hash_entry)); | ||
10001 | +#else | ||
10002 | + new = (struct hash_entry *) malloc (sizeof (struct hash_entry)); | ||
10003 | +#endif | ||
10004 | + } | ||
10005 | + | ||
10006 | + return new; | ||
10007 | +} | ||
10008 | + | ||
10009 | +/* Free a hash entry which was part of some bucket overflow, | ||
10010 | + saving it for later recycling. */ | ||
10011 | + | ||
10012 | +static void | ||
10013 | +free_entry (Hash_table *table, struct hash_entry *entry) | ||
10014 | +{ | ||
10015 | + entry->data = NULL; | ||
10016 | + entry->next = table->free_entry_list; | ||
10017 | + table->free_entry_list = entry; | ||
10018 | +} | ||
10019 | + | ||
10020 | +/* This private function is used to help with insertion and deletion. When | ||
10021 | + ENTRY matches an entry in the table, return a pointer to the corresponding | ||
10022 | + user data and set *BUCKET_HEAD to the head of the selected bucket. | ||
10023 | + Otherwise, return NULL. When DELETE is true and ENTRY matches an entry in | ||
10024 | + the table, unlink the matching entry. */ | ||
10025 | + | ||
10026 | +static void * | ||
10027 | +hash_find_entry (Hash_table *table, const void *entry, | ||
10028 | + struct hash_entry **bucket_head, bool delete) | ||
10029 | +{ | ||
10030 | + struct hash_entry *bucket | ||
10031 | + = table->bucket + table->hasher (entry, table->n_buckets); | ||
10032 | + struct hash_entry *cursor; | ||
10033 | + | ||
10034 | + if (! (bucket < table->bucket_limit)) | ||
10035 | + abort (); | ||
10036 | + | ||
10037 | + *bucket_head = bucket; | ||
10038 | + | ||
10039 | + /* Test for empty bucket. */ | ||
10040 | + if (bucket->data == NULL) | ||
10041 | + return NULL; | ||
10042 | + | ||
10043 | + /* See if the entry is the first in the bucket. */ | ||
10044 | + if ((*table->comparator) (entry, bucket->data)) | ||
10045 | + { | ||
10046 | + void *data = bucket->data; | ||
10047 | + | ||
10048 | + if (delete) | ||
10049 | + { | ||
10050 | + if (bucket->next) | ||
10051 | + { | ||
10052 | + struct hash_entry *next = bucket->next; | ||
10053 | + | ||
10054 | + /* Bump the first overflow entry into the bucket head, then save | ||
10055 | + the previous first overflow entry for later recycling. */ | ||
10056 | + *bucket = *next; | ||
10057 | + free_entry (table, next); | ||
10058 | + } | ||
10059 | + else | ||
10060 | + { | ||
10061 | + bucket->data = NULL; | ||
10062 | + } | ||
10063 | + } | ||
10064 | + | ||
10065 | + return data; | ||
10066 | + } | ||
10067 | + | ||
10068 | + /* Scan the bucket overflow. */ | ||
10069 | + for (cursor = bucket; cursor->next; cursor = cursor->next) | ||
10070 | + { | ||
10071 | + if ((*table->comparator) (entry, cursor->next->data)) | ||
10072 | + { | ||
10073 | + void *data = cursor->next->data; | ||
10074 | + | ||
10075 | + if (delete) | ||
10076 | + { | ||
10077 | + struct hash_entry *next = cursor->next; | ||
10078 | + | ||
10079 | + /* Unlink the entry to delete, then save the freed entry for later | ||
10080 | + recycling. */ | ||
10081 | + cursor->next = next->next; | ||
10082 | + free_entry (table, next); | ||
10083 | + } | ||
10084 | + | ||
10085 | + return data; | ||
10086 | + } | ||
10087 | + } | ||
10088 | + | ||
10089 | + /* No entry found. */ | ||
10090 | + return NULL; | ||
10091 | +} | ||
10092 | + | ||
10093 | +/* For an already existing hash table, change the number of buckets through | ||
10094 | + specifying CANDIDATE. The contents of the hash table are preserved. The | ||
10095 | + new number of buckets is automatically selected so as to _guarantee_ that | ||
10096 | + the table may receive at least CANDIDATE different user entries, including | ||
10097 | + those already in the table, before any other growth of the hash table size | ||
10098 | + occurs. If TUNING->IS_N_BUCKETS is true, then CANDIDATE specifies the | ||
10099 | + exact number of buckets desired. */ | ||
10100 | + | ||
10101 | +bool | ||
10102 | +hash_rehash (Hash_table *table, unsigned candidate) | ||
10103 | +{ | ||
10104 | + Hash_table *new_table; | ||
10105 | + struct hash_entry *bucket; | ||
10106 | + struct hash_entry *cursor; | ||
10107 | + struct hash_entry *next; | ||
10108 | + | ||
10109 | + new_table = hash_initialize (candidate, table->tuning, table->hasher, | ||
10110 | + table->comparator, table->data_freer); | ||
10111 | + if (new_table == NULL) | ||
10112 | + return false; | ||
10113 | + | ||
10114 | + /* Merely reuse the extra old space into the new table. */ | ||
10115 | +#if USE_OBSTACK | ||
10116 | + obstack_free (&new_table->entry_stack, NULL); | ||
10117 | + new_table->entry_stack = table->entry_stack; | ||
10118 | +#endif | ||
10119 | + new_table->free_entry_list = table->free_entry_list; | ||
10120 | + | ||
10121 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
10122 | + if (bucket->data) | ||
10123 | + for (cursor = bucket; cursor; cursor = next) | ||
10124 | + { | ||
10125 | + void *data = cursor->data; | ||
10126 | + struct hash_entry *new_bucket | ||
10127 | + = (new_table->bucket | ||
10128 | + + new_table->hasher (data, new_table->n_buckets)); | ||
10129 | + | ||
10130 | + if (! (new_bucket < new_table->bucket_limit)) | ||
10131 | + abort (); | ||
10132 | + | ||
10133 | + next = cursor->next; | ||
10134 | + | ||
10135 | + if (new_bucket->data) | ||
10136 | + { | ||
10137 | + if (cursor == bucket) | ||
10138 | + { | ||
10139 | + /* Allocate or recycle an entry, when moving from a bucket | ||
10140 | + header into a bucket overflow. */ | ||
10141 | + struct hash_entry *new_entry = allocate_entry (new_table); | ||
10142 | + | ||
10143 | + if (new_entry == NULL) | ||
10144 | + return false; | ||
10145 | + | ||
10146 | + new_entry->data = data; | ||
10147 | + new_entry->next = new_bucket->next; | ||
10148 | + new_bucket->next = new_entry; | ||
10149 | + } | ||
10150 | + else | ||
10151 | + { | ||
10152 | + /* Merely relink an existing entry, when moving from a | ||
10153 | + bucket overflow into a bucket overflow. */ | ||
10154 | + cursor->next = new_bucket->next; | ||
10155 | + new_bucket->next = cursor; | ||
10156 | + } | ||
10157 | + } | ||
10158 | + else | ||
10159 | + { | ||
10160 | + /* Free an existing entry, when moving from a bucket | ||
10161 | + overflow into a bucket header. Also take care of the | ||
10162 | + simple case of moving from a bucket header into a bucket | ||
10163 | + header. */ | ||
10164 | + new_bucket->data = data; | ||
10165 | + new_table->n_buckets_used++; | ||
10166 | + if (cursor != bucket) | ||
10167 | + free_entry (new_table, cursor); | ||
10168 | + } | ||
10169 | + } | ||
10170 | + | ||
10171 | + free (table->bucket); | ||
10172 | + table->bucket = new_table->bucket; | ||
10173 | + table->bucket_limit = new_table->bucket_limit; | ||
10174 | + table->n_buckets = new_table->n_buckets; | ||
10175 | + table->n_buckets_used = new_table->n_buckets_used; | ||
10176 | + table->free_entry_list = new_table->free_entry_list; | ||
10177 | + /* table->n_entries already holds its value. */ | ||
10178 | +#if USE_OBSTACK | ||
10179 | + table->entry_stack = new_table->entry_stack; | ||
10180 | +#endif | ||
10181 | + free (new_table); | ||
10182 | + | ||
10183 | + return true; | ||
10184 | +} | ||
10185 | + | ||
10186 | +/* If ENTRY matches an entry already in the hash table, return the pointer | ||
10187 | + to the entry from the table. Otherwise, insert ENTRY and return ENTRY. | ||
10188 | + Return NULL if the storage required for insertion cannot be allocated. */ | ||
10189 | + | ||
10190 | +void * | ||
10191 | +hash_insert (Hash_table *table, const void *entry) | ||
10192 | +{ | ||
10193 | + void *data; | ||
10194 | + struct hash_entry *bucket; | ||
10195 | + | ||
10196 | + /* The caller cannot insert a NULL entry. */ | ||
10197 | + if (! entry) | ||
10198 | + abort (); | ||
10199 | + | ||
10200 | + /* If there's a matching entry already in the table, return that. */ | ||
10201 | + if ((data = hash_find_entry (table, entry, &bucket, false)) != NULL) | ||
10202 | + return data; | ||
10203 | + | ||
10204 | + /* ENTRY is not matched, it should be inserted. */ | ||
10205 | + | ||
10206 | + if (bucket->data) | ||
10207 | + { | ||
10208 | + struct hash_entry *new_entry = allocate_entry (table); | ||
10209 | + | ||
10210 | + if (new_entry == NULL) | ||
10211 | + return NULL; | ||
10212 | + | ||
10213 | + /* Add ENTRY in the overflow of the bucket. */ | ||
10214 | + | ||
10215 | + new_entry->data = (void *) entry; | ||
10216 | + new_entry->next = bucket->next; | ||
10217 | + bucket->next = new_entry; | ||
10218 | + table->n_entries++; | ||
10219 | + return (void *) entry; | ||
10220 | + } | ||
10221 | + | ||
10222 | + /* Add ENTRY right in the bucket head. */ | ||
10223 | + | ||
10224 | + bucket->data = (void *) entry; | ||
10225 | + table->n_entries++; | ||
10226 | + table->n_buckets_used++; | ||
10227 | + | ||
10228 | + /* If the growth threshold of the buckets in use has been reached, increase | ||
10229 | + the table size and rehash. There's no point in checking the number of | ||
10230 | + entries: if the hashing function is ill-conditioned, rehashing is not | ||
10231 | + likely to improve it. */ | ||
10232 | + | ||
10233 | + if (table->n_buckets_used | ||
10234 | + > table->tuning->growth_threshold * table->n_buckets) | ||
10235 | + { | ||
10236 | + /* Check more fully, before starting real work. If tuning arguments | ||
10237 | + became invalid, the second check will rely on proper defaults. */ | ||
10238 | + check_tuning (table); | ||
10239 | + if (table->n_buckets_used | ||
10240 | + > table->tuning->growth_threshold * table->n_buckets) | ||
10241 | + { | ||
10242 | + const Hash_tuning *tuning = table->tuning; | ||
10243 | + unsigned candidate | ||
10244 | + = (unsigned) (tuning->is_n_buckets | ||
10245 | + ? (table->n_buckets * tuning->growth_factor) | ||
10246 | + : (table->n_buckets * tuning->growth_factor | ||
10247 | + * tuning->growth_threshold)); | ||
10248 | + | ||
10249 | + /* If the rehash fails, arrange to return NULL. */ | ||
10250 | + if (!hash_rehash (table, candidate)) | ||
10251 | + entry = NULL; | ||
10252 | + } | ||
10253 | + } | ||
10254 | + | ||
10255 | + return (void *) entry; | ||
10256 | +} | ||
10257 | + | ||
10258 | +/* If ENTRY is already in the table, remove it and return the just-deleted | ||
10259 | + data (the user may want to deallocate its storage). If ENTRY is not in the | ||
10260 | + table, don't modify the table and return NULL. */ | ||
10261 | + | ||
10262 | +void * | ||
10263 | +hash_delete (Hash_table *table, const void *entry) | ||
10264 | +{ | ||
10265 | + void *data; | ||
10266 | + struct hash_entry *bucket; | ||
10267 | + | ||
10268 | + data = hash_find_entry (table, entry, &bucket, true); | ||
10269 | + if (!data) | ||
10270 | + return NULL; | ||
10271 | + | ||
10272 | + table->n_entries--; | ||
10273 | + if (!bucket->data) | ||
10274 | + { | ||
10275 | + table->n_buckets_used--; | ||
10276 | + | ||
10277 | + /* If the shrink threshold of the buckets in use has been reached, | ||
10278 | + rehash into a smaller table. */ | ||
10279 | + | ||
10280 | + if (table->n_buckets_used | ||
10281 | + < table->tuning->shrink_threshold * table->n_buckets) | ||
10282 | + { | ||
10283 | + /* Check more fully, before starting real work. If tuning arguments | ||
10284 | + became invalid, the second check will rely on proper defaults. */ | ||
10285 | + check_tuning (table); | ||
10286 | + if (table->n_buckets_used | ||
10287 | + < table->tuning->shrink_threshold * table->n_buckets) | ||
10288 | + { | ||
10289 | + const Hash_tuning *tuning = table->tuning; | ||
10290 | + unsigned candidate | ||
10291 | + = (unsigned) (tuning->is_n_buckets | ||
10292 | + ? table->n_buckets * tuning->shrink_factor | ||
10293 | + : (table->n_buckets * tuning->shrink_factor | ||
10294 | + * tuning->growth_threshold)); | ||
10295 | + | ||
10296 | + hash_rehash (table, candidate); | ||
10297 | + } | ||
10298 | + } | ||
10299 | + } | ||
10300 | + | ||
10301 | + return data; | ||
10302 | +} | ||
10303 | + | ||
10304 | +/* Testing. */ | ||
10305 | + | ||
10306 | +#if TESTING | ||
10307 | + | ||
10308 | +void | ||
10309 | +hash_print (const Hash_table *table) | ||
10310 | +{ | ||
10311 | + struct hash_entry *bucket; | ||
10312 | + | ||
10313 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
10314 | + { | ||
10315 | + struct hash_entry *cursor; | ||
10316 | + | ||
10317 | + if (bucket) | ||
10318 | + printf ("%d:\n", bucket - table->bucket); | ||
10319 | + | ||
10320 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
10321 | + { | ||
10322 | + char *s = (char *) cursor->data; | ||
10323 | + /* FIXME */ | ||
10324 | + if (s) | ||
10325 | + printf (" %s\n", s); | ||
10326 | + } | ||
10327 | + } | ||
10328 | +} | ||
10329 | + | ||
10330 | +#endif /* TESTING */ | ||
10331 | --- patch-2.5.9.orig/hash.h | ||
10332 | +++ patch-2.5.9/hash.h | ||
10333 | @@ -0,0 +1,93 @@ | ||
10334 | +/* hash - hashing table processing. | ||
10335 | + Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. | ||
10336 | + Written by Jim Meyering <meyering@ascend.com>, 1998. | ||
10337 | + | ||
10338 | + This program is free software; you can redistribute it and/or modify | ||
10339 | + it under the terms of the GNU General Public License as published by | ||
10340 | + the Free Software Foundation; either version 2, or (at your option) | ||
10341 | + any later version. | ||
10342 | + | ||
10343 | + This program is distributed in the hope that it will be useful, | ||
10344 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10345 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
10346 | + GNU General Public License for more details. | ||
10347 | + | ||
10348 | + You should have received a copy of the GNU General Public License | ||
10349 | + along with this program; if not, write to the Free Software Foundation, | ||
10350 | + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||
10351 | + | ||
10352 | +/* A generic hash table package. */ | ||
10353 | + | ||
10354 | +/* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use | ||
10355 | + obstacks instead of malloc, and recompile `hash.c' with same setting. */ | ||
10356 | + | ||
10357 | +#ifndef HASH_H_ | ||
10358 | +# define HASH_H_ | ||
10359 | + | ||
10360 | +# ifndef PARAMS | ||
10361 | +# if PROTOTYPES || __STDC__ | ||
10362 | +# define PARAMS(Args) Args | ||
10363 | +# else | ||
10364 | +# define PARAMS(Args) () | ||
10365 | +# endif | ||
10366 | +# endif | ||
10367 | + | ||
10368 | +typedef unsigned (*Hash_hasher) PARAMS ((const void *, unsigned)); | ||
10369 | +typedef bool (*Hash_comparator) PARAMS ((const void *, const void *)); | ||
10370 | +typedef void (*Hash_data_freer) PARAMS ((void *)); | ||
10371 | +typedef bool (*Hash_processor) PARAMS ((void *, void *)); | ||
10372 | + | ||
10373 | +struct hash_entry | ||
10374 | + { | ||
10375 | + void *data; | ||
10376 | + struct hash_entry *next; | ||
10377 | + }; | ||
10378 | + | ||
10379 | +struct hash_tuning | ||
10380 | + { | ||
10381 | + /* This structure is mainly used for `hash_initialize', see the block | ||
10382 | + documentation of `hash_reset_tuning' for more complete comments. */ | ||
10383 | + | ||
10384 | + float shrink_threshold; /* ratio of used buckets to trigger a shrink */ | ||
10385 | + float shrink_factor; /* ratio of new smaller size to original size */ | ||
10386 | + float growth_threshold; /* ratio of used buckets to trigger a growth */ | ||
10387 | + float growth_factor; /* ratio of new bigger size to original size */ | ||
10388 | + bool is_n_buckets; /* if CANDIDATE really means table size */ | ||
10389 | + }; | ||
10390 | + | ||
10391 | +typedef struct hash_tuning Hash_tuning; | ||
10392 | + | ||
10393 | +struct hash_table; | ||
10394 | + | ||
10395 | +typedef struct hash_table Hash_table; | ||
10396 | + | ||
10397 | +/* Information and lookup. */ | ||
10398 | +unsigned hash_get_n_buckets PARAMS ((const Hash_table *)); | ||
10399 | +unsigned hash_get_n_buckets_used PARAMS ((const Hash_table *)); | ||
10400 | +unsigned hash_get_n_entries PARAMS ((const Hash_table *)); | ||
10401 | +unsigned hash_get_max_bucket_length PARAMS ((const Hash_table *)); | ||
10402 | +bool hash_table_ok PARAMS ((const Hash_table *)); | ||
10403 | +void hash_print_statistics PARAMS ((const Hash_table *, FILE *)); | ||
10404 | +void *hash_lookup PARAMS ((const Hash_table *, const void *)); | ||
10405 | + | ||
10406 | +/* Walking. */ | ||
10407 | +void *hash_get_first PARAMS ((const Hash_table *)); | ||
10408 | +void *hash_get_next PARAMS ((const Hash_table *, const void *)); | ||
10409 | +unsigned hash_get_entries PARAMS ((const Hash_table *, void **, unsigned)); | ||
10410 | +unsigned hash_do_for_each PARAMS ((const Hash_table *, Hash_processor, void *)); | ||
10411 | + | ||
10412 | +/* Allocation and clean-up. */ | ||
10413 | +unsigned hash_string PARAMS ((const char *, unsigned)); | ||
10414 | +void hash_reset_tuning PARAMS ((Hash_tuning *)); | ||
10415 | +Hash_table *hash_initialize PARAMS ((unsigned, const Hash_tuning *, | ||
10416 | + Hash_hasher, Hash_comparator, | ||
10417 | + Hash_data_freer)); | ||
10418 | +void hash_clear PARAMS ((Hash_table *)); | ||
10419 | +void hash_free PARAMS ((Hash_table *)); | ||
10420 | + | ||
10421 | +/* Insertion and deletion. */ | ||
10422 | +bool hash_rehash PARAMS ((Hash_table *, unsigned)); | ||
10423 | +void *hash_insert PARAMS ((Hash_table *, const void *)); | ||
10424 | +void *hash_delete PARAMS ((Hash_table *, const void *)); | ||
10425 | + | ||
10426 | +#endif | ||
diff --git a/recipes-devtools/patch/patch/global-reject-file.diff b/recipes-devtools/patch/patch/global-reject-file.diff new file mode 100644 index 0000000..bb7ca79 --- /dev/null +++ b/recipes-devtools/patch/patch/global-reject-file.diff | |||
@@ -0,0 +1,203 @@ | |||
1 | Upstream-Status: Inappropriate [debian patch] | ||
2 | |||
3 | Index: patch-2.5.9/patch.man | ||
4 | =================================================================== | ||
5 | --- patch-2.5.9.orig/patch.man | ||
6 | +++ patch-2.5.9/patch.man | ||
7 | @@ -520,6 +520,15 @@ file. | ||
8 | \fB\*=reject\-unified\fP | ||
9 | Produce unified reject files. The default is to produce context type reject files. | ||
10 | .TP | ||
11 | +.BI \*=global\-reject\-file= rejectfile | ||
12 | +Put all rejects into | ||
13 | +.I rejectfile | ||
14 | +instead of creating separate reject files for all files that have rejects. The | ||
15 | +.I rejectfile | ||
16 | +will contain headers that identify which file each reject refers to. Note that | ||
17 | +the global reject file is created even if \-\-dry\-run is specified (while | ||
18 | +non-global reject files will only be created without \-\-dry\-run). | ||
19 | +.TP | ||
20 | \fB\-R\fP or \fB\*=reverse\fP | ||
21 | Assume that this patch was created with the old and new files swapped. | ||
22 | (Yes, I'm afraid that does happen occasionally, human nature being what it | ||
23 | Index: patch-2.5.9/patch.c | ||
24 | =================================================================== | ||
25 | --- patch-2.5.9.orig/patch.c | ||
26 | +++ patch-2.5.9/patch.c | ||
27 | @@ -67,6 +67,7 @@ static bool similar (char const *, size_ | ||
28 | static bool spew_output (struct outstate *); | ||
29 | static char const *make_temp (char); | ||
30 | static int numeric_string (char const *, bool, char const *); | ||
31 | +static void reject_header (const char *filename); | ||
32 | static void abort_hunk (void); | ||
33 | static void cleanup (void); | ||
34 | static void get_some_switches (void); | ||
35 | @@ -98,6 +99,7 @@ static int Argc; | ||
36 | static char * const *Argv; | ||
37 | |||
38 | static FILE *rejfp; /* reject file pointer */ | ||
39 | +static char *global_reject; | ||
40 | |||
41 | static char const *patchname; | ||
42 | static char *rejname; | ||
43 | @@ -172,6 +174,10 @@ main (int argc, char **argv) | ||
44 | /* Make sure we clean up in case of disaster. */ | ||
45 | set_signals (false); | ||
46 | |||
47 | + /* initialize global reject file */ | ||
48 | + if (global_reject) | ||
49 | + init_reject (); | ||
50 | + | ||
51 | for ( | ||
52 | open_patch_file (patchname); | ||
53 | there_is_another_patch(); | ||
54 | @@ -208,8 +214,9 @@ main (int argc, char **argv) | ||
55 | init_output (TMPOUTNAME, exclusive, &outstate); | ||
56 | } | ||
57 | |||
58 | - /* initialize reject file */ | ||
59 | - init_reject (); | ||
60 | + /* initialize per-patch reject file */ | ||
61 | + if (!global_reject) | ||
62 | + init_reject (); | ||
63 | |||
64 | /* find out where all the lines are */ | ||
65 | if (!skip_rest_of_patch) | ||
66 | @@ -278,6 +285,8 @@ main (int argc, char **argv) | ||
67 | |||
68 | newwhere = pch_newfirst() + last_offset; | ||
69 | if (skip_rest_of_patch) { | ||
70 | + if (!failed) | ||
71 | + reject_header(outname); | ||
72 | abort_hunk(); | ||
73 | failed++; | ||
74 | if (verbosity == VERBOSE) | ||
75 | @@ -292,6 +301,8 @@ main (int argc, char **argv) | ||
76 | say ("Patch attempted to create file %s, which already exists.\n", | ||
77 | quotearg (inname)); | ||
78 | |||
79 | + if (!failed) | ||
80 | + reject_header(outname); | ||
81 | abort_hunk(); | ||
82 | failed++; | ||
83 | if (verbosity != SILENT) | ||
84 | @@ -299,6 +310,8 @@ main (int argc, char **argv) | ||
85 | format_linenum (numbuf, newwhere)); | ||
86 | } | ||
87 | else if (! apply_hunk (&outstate, where)) { | ||
88 | + if (!failed) | ||
89 | + reject_header(outname); | ||
90 | abort_hunk (); | ||
91 | failed++; | ||
92 | if (verbosity != SILENT) | ||
93 | @@ -332,7 +345,8 @@ main (int argc, char **argv) | ||
94 | fclose (outstate.ofp); | ||
95 | outstate.ofp = 0; | ||
96 | } | ||
97 | - fclose (rejfp); | ||
98 | + if (!global_reject) | ||
99 | + fclose (rejfp); | ||
100 | continue; | ||
101 | } | ||
102 | |||
103 | @@ -412,13 +426,13 @@ main (int argc, char **argv) | ||
104 | } | ||
105 | } | ||
106 | if (diff_type != ED_DIFF) { | ||
107 | - if (fclose (rejfp) != 0) | ||
108 | + if (!global_reject && fclose (rejfp) != 0) | ||
109 | write_fatal (); | ||
110 | if (failed) { | ||
111 | somefailed = true; | ||
112 | say ("%d out of %d hunk%s %s", failed, hunk, "s" + (hunk == 1), | ||
113 | skip_rest_of_patch ? "ignored" : "FAILED"); | ||
114 | - if (outname) { | ||
115 | + if (!global_reject && outname) { | ||
116 | char *rej = rejname; | ||
117 | if (!rejname) { | ||
118 | rej = xmalloc (strlen (outname) + 5); | ||
119 | @@ -445,6 +459,20 @@ main (int argc, char **argv) | ||
120 | } | ||
121 | set_signals (true); | ||
122 | } | ||
123 | + if (global_reject) | ||
124 | + { | ||
125 | + if (fclose (rejfp) != 0) | ||
126 | + write_fatal (); | ||
127 | + if (somefailed) | ||
128 | + { | ||
129 | + say (" -- saving rejects to file %s\n", quotearg (global_reject)); | ||
130 | + /*if (! dry_run) | ||
131 | + {*/ | ||
132 | + move_file (TMPREJNAME, &TMPREJNAME_needs_removal, | ||
133 | + global_reject, 0644, false); | ||
134 | + /*}*/ | ||
135 | + } | ||
136 | + } | ||
137 | if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0)) | ||
138 | write_fatal (); | ||
139 | cleanup (); | ||
140 | @@ -523,6 +551,7 @@ static struct option const longopts[] = | ||
141 | {"posix", no_argument, NULL, CHAR_MAX + 7}, | ||
142 | {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, | ||
143 | {"unified-reject-files", no_argument, NULL, CHAR_MAX + 9}, | ||
144 | + {"global-reject-file", required_argument, NULL, CHAR_MAX + 10}, | ||
145 | {NULL, no_argument, NULL, 0} | ||
146 | }; | ||
147 | |||
148 | @@ -582,6 +611,7 @@ static char const *const option_help[] = | ||
149 | " --dry-run Do not actually change any files; just print what would happen.", | ||
150 | " --posix Conform to the POSIX standard.", | ||
151 | " --unified-reject-files Create unified reject files.", | ||
152 | +" --global-reject-file=file Put all rejects into one file.", | ||
153 | "", | ||
154 | " -d DIR --directory=DIR Change the working directory to DIR first.", | ||
155 | #if HAVE_SETMODE_DOS | ||
156 | @@ -784,6 +814,9 @@ get_some_switches (void) | ||
157 | case CHAR_MAX + 9: | ||
158 | unified_reject_files = true; | ||
159 | break; | ||
160 | + case CHAR_MAX + 10: | ||
161 | + global_reject = savestr (optarg); | ||
162 | + break; | ||
163 | default: | ||
164 | usage (stderr, 2); | ||
165 | } | ||
166 | @@ -933,6 +966,37 @@ locate_hunk (LINENUM fuzz) | ||
167 | } | ||
168 | |||
169 | static char * | ||
170 | +format_timestamp (char timebuf[37], bool which) | ||
171 | +{ | ||
172 | + time_t ts = pch_timestamp(which); | ||
173 | + if (ts != -1) | ||
174 | + { | ||
175 | + struct tm *tm = localtime(&ts); | ||
176 | + strftime(timebuf, 37, "\t%Y-%m-%d %H:%M:%S.000000000 %z", tm); | ||
177 | + } | ||
178 | + else | ||
179 | + timebuf[0] = 0; | ||
180 | + return timebuf; | ||
181 | +} | ||
182 | + | ||
183 | +/* Write a header in a reject file that combines multiple hunks. */ | ||
184 | +static void | ||
185 | +reject_header (const char *outname) | ||
186 | +{ | ||
187 | + char timebuf0[37], timebuf1[37]; | ||
188 | + if (!global_reject) | ||
189 | + return; | ||
190 | + if (diff_type == UNI_DIFF) | ||
191 | + fprintf(rejfp, "--- %s.orig%s\n+++ %s%s\n", | ||
192 | + outname, format_timestamp(timebuf0, reverse), | ||
193 | + outname, format_timestamp(timebuf1, !reverse)); | ||
194 | + else | ||
195 | + fprintf(rejfp, "*** %s.orig%s\n--- %s%s\n", | ||
196 | + outname, format_timestamp(timebuf0, reverse), | ||
197 | + outname, format_timestamp(timebuf1, !reverse)); | ||
198 | +} | ||
199 | + | ||
200 | +static char * | ||
201 | format_linerange (char rangebuf[LINENUM_LENGTH_BOUND*2 + 2], | ||
202 | LINENUM first, LINENUM lines) | ||
203 | { | ||
diff --git a/recipes-devtools/patch/patch/install.patch b/recipes-devtools/patch/patch/install.patch new file mode 100644 index 0000000..0354ec8 --- /dev/null +++ b/recipes-devtools/patch/patch/install.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: patch-2.5.4/Makefile.in | ||
4 | =================================================================== | ||
5 | --- patch-2.5.4.orig/Makefile.in 2005-03-09 07:23:54.779311824 -0500 | ||
6 | +++ patch-2.5.4/Makefile.in 2005-03-09 07:26:09.616813408 -0500 | ||
7 | @@ -43,10 +43,11 @@ | ||
8 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
9 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
10 | |||
11 | +DESTDIR = | ||
12 | prefix = @prefix@ | ||
13 | exec_prefix = @exec_prefix@ | ||
14 | |||
15 | -bindir = $(exec_prefix)/bin | ||
16 | +bindir = @bindir@ | ||
17 | |||
18 | # Where to put the manual pages. | ||
19 | mandir = @mandir@ | ||
20 | @@ -112,18 +113,18 @@ | ||
21 | $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) | ||
22 | |||
23 | install:: all installdirs | ||
24 | - $(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT) | ||
25 | - -$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext) | ||
26 | + $(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)$(bindir)/$(patch_name)$(EXEEXT) | ||
27 | + -$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)$(man1dir)/$(patch_name)$(man1ext) | ||
28 | |||
29 | installdirs:: | ||
30 | - $(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(man1dir) | ||
31 | + $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) | ||
32 | |||
33 | install-strip:: | ||
34 | $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install | ||
35 | |||
36 | uninstall:: | ||
37 | - rm -f $(bindir)/$(patch_name)$(EXEEXT) | ||
38 | - rm -f $(man1dir)/$(patch_name)$(man1ext) | ||
39 | + rm -f $(DESTDIR)$(bindir)/$(patch_name)$(EXEEXT) | ||
40 | + rm -f $(DESTDIR)$(man1dir)/$(patch_name)$(man1ext) | ||
41 | |||
42 | Makefile: Makefile.in $(CONFIG_STATUS) | ||
43 | $(SHELL) $(CONFIG_STATUS) | ||
diff --git a/recipes-devtools/patch/patch/unified-reject-files.diff b/recipes-devtools/patch/patch/unified-reject-files.diff new file mode 100644 index 0000000..4b59212 --- /dev/null +++ b/recipes-devtools/patch/patch/unified-reject-files.diff | |||
@@ -0,0 +1,307 @@ | |||
1 | Upstream-Status: Inappropriate [debian patch] | ||
2 | |||
3 | Generate unified diff style reject files. Also include the C function names | ||
4 | in reject files whenever possible. | ||
5 | |||
6 | $ cat > f.orig | ||
7 | < a() { | ||
8 | < 2 | ||
9 | < 3 | ||
10 | < | ||
11 | < 5 | ||
12 | < 6 | ||
13 | < } | ||
14 | |||
15 | $ sed -e 's/5/5a/' f.orig > f | ||
16 | $ diff -U2 -p f.orig f > f.diff | ||
17 | $ sed -e 's/5/5a/' -e 's/6/6x/' f.orig > f | ||
18 | $ ./patch -F0 -s --no-backup-if-mismatch f --reject-unified < f.diff | ||
19 | > 1 out of 1 hunk FAILED -- saving rejects to file f.rej | ||
20 | |||
21 | $ cat f.rej | ||
22 | > @@ -3,5 +3,5 @@ a() { | ||
23 | > 3 | ||
24 | > | ||
25 | > -5 | ||
26 | > +5a | ||
27 | > 6 | ||
28 | > } | ||
29 | |||
30 | $ ./patch -F0 -s --no-backup-if-mismatch f < f.diff | ||
31 | > 1 out of 1 hunk FAILED -- saving rejects to file f.rej | ||
32 | |||
33 | $ cat f.rej | ||
34 | > *************** a() { | ||
35 | > *** 3,7 **** | ||
36 | > 3 | ||
37 | > | ||
38 | > - 5 | ||
39 | > 6 | ||
40 | > } | ||
41 | > --- 3,7 ---- | ||
42 | > 3 | ||
43 | > | ||
44 | > + 5a | ||
45 | > 6 | ||
46 | > } | ||
47 | |||
48 | $ diff -Nu -p /dev/null f.orig > f2.diff | ||
49 | $ ./patch -F0 -s --no-backup-if-mismatch f --reject-unified < f2.diff | ||
50 | > Patch attempted to create file f, which already exists. | ||
51 | > 1 out of 1 hunk FAILED -- saving rejects to file f.rej | ||
52 | |||
53 | $ cat f.rej | ||
54 | > @@ -0,0 +1,7 @@ | ||
55 | > +a() { | ||
56 | > +2 | ||
57 | > +3 | ||
58 | > + | ||
59 | > +5 | ||
60 | > +6 | ||
61 | > +} | ||
62 | |||
63 | $ rm -f f f.orig f.rej f.diff f2.diff | ||
64 | |||
65 | Index: patch-2.5.9/pch.c | ||
66 | =================================================================== | ||
67 | --- patch-2.5.9.orig/pch.c | ||
68 | +++ patch-2.5.9/pch.c | ||
69 | @@ -68,6 +68,7 @@ static LINENUM p_sline; /* and the lin | ||
70 | static LINENUM p_hunk_beg; /* line number of current hunk */ | ||
71 | static LINENUM p_efake = -1; /* end of faked up lines--don't free */ | ||
72 | static LINENUM p_bfake = -1; /* beg of faked up lines */ | ||
73 | +static char *p_c_function; /* the C function a hunk is in */ | ||
74 | |||
75 | enum nametype { OLD, NEW, INDEX, NONE }; | ||
76 | |||
77 | @@ -888,6 +889,19 @@ another_hunk (enum diff difftype, bool r | ||
78 | next_intuit_at(line_beginning,p_input_line); | ||
79 | return chars_read == (size_t) -1 ? -1 : 0; | ||
80 | } | ||
81 | + s = buf; | ||
82 | + while (*s == '*') | ||
83 | + s++; | ||
84 | + if (*s == ' ') | ||
85 | + { | ||
86 | + p_c_function = s; | ||
87 | + while (*s != '\n') | ||
88 | + s++; | ||
89 | + *s = '\0'; | ||
90 | + p_c_function = savestr (p_c_function); | ||
91 | + } | ||
92 | + else | ||
93 | + p_c_function = NULL; | ||
94 | p_hunk_beg = p_input_line + 1; | ||
95 | while (p_end < p_max) { | ||
96 | chars_read = get_line (); | ||
97 | @@ -1277,8 +1291,18 @@ another_hunk (enum diff difftype, bool r | ||
98 | else | ||
99 | p_repl_lines = 1; | ||
100 | if (*s == ' ') s++; | ||
101 | - if (*s != '@') | ||
102 | + if (*s++ != '@') | ||
103 | malformed (); | ||
104 | + if (*s++ == '@' && *s == ' ' && *s != '\0') | ||
105 | + { | ||
106 | + p_c_function = s; | ||
107 | + while (*s != '\n') | ||
108 | + s++; | ||
109 | + *s = '\0'; | ||
110 | + p_c_function = savestr (p_c_function); | ||
111 | + } | ||
112 | + else | ||
113 | + p_c_function = NULL; | ||
114 | if (!p_ptrn_lines) | ||
115 | p_first++; /* do append rather than insert */ | ||
116 | if (!p_repl_lines) | ||
117 | @@ -1884,6 +1908,12 @@ pch_hunk_beg (void) | ||
118 | return p_hunk_beg; | ||
119 | } | ||
120 | |||
121 | +char const * | ||
122 | +pch_c_function (void) | ||
123 | +{ | ||
124 | + return p_c_function; | ||
125 | +} | ||
126 | + | ||
127 | /* Is the newline-terminated line a valid `ed' command for patch | ||
128 | input? If so, return the command character; if not, return 0. | ||
129 | This accepts accepts just a subset of the valid commands, but it's | ||
130 | Index: patch-2.5.9/pch.h | ||
131 | =================================================================== | ||
132 | --- patch-2.5.9.orig/pch.h | ||
133 | +++ patch-2.5.9/pch.h | ||
134 | @@ -25,6 +25,7 @@ | ||
135 | LINENUM pch_end (void); | ||
136 | LINENUM pch_first (void); | ||
137 | LINENUM pch_hunk_beg (void); | ||
138 | +char const *pch_c_function (void); | ||
139 | LINENUM pch_newfirst (void); | ||
140 | LINENUM pch_prefix_context (void); | ||
141 | LINENUM pch_ptrn_lines (void); | ||
142 | Index: patch-2.5.9/patch.man | ||
143 | =================================================================== | ||
144 | --- patch-2.5.9.orig/patch.man | ||
145 | +++ patch-2.5.9/patch.man | ||
146 | @@ -517,6 +517,9 @@ instead of the default | ||
147 | .B \&.rej | ||
148 | file. | ||
149 | .TP | ||
150 | +\fB\*=reject\-unified\fP | ||
151 | +Produce unified reject files. The default is to produce context type reject files. | ||
152 | +.TP | ||
153 | \fB\-R\fP or \fB\*=reverse\fP | ||
154 | Assume that this patch was created with the old and new files swapped. | ||
155 | (Yes, I'm afraid that does happen occasionally, human nature being what it | ||
156 | Index: patch-2.5.9/common.h | ||
157 | =================================================================== | ||
158 | --- patch-2.5.9.orig/common.h | ||
159 | +++ patch-2.5.9/common.h | ||
160 | @@ -146,6 +146,7 @@ XTERN int invc; | ||
161 | XTERN struct stat instat; | ||
162 | XTERN bool dry_run; | ||
163 | XTERN bool posixly_correct; | ||
164 | +XTERN bool unified_reject_files; | ||
165 | |||
166 | XTERN char const *origprae; | ||
167 | XTERN char const *origbase; | ||
168 | Index: patch-2.5.9/patch.c | ||
169 | =================================================================== | ||
170 | --- patch-2.5.9.orig/patch.c | ||
171 | +++ patch-2.5.9/patch.c | ||
172 | @@ -522,6 +522,7 @@ static struct option const longopts[] = | ||
173 | {"no-backup-if-mismatch", no_argument, NULL, CHAR_MAX + 6}, | ||
174 | {"posix", no_argument, NULL, CHAR_MAX + 7}, | ||
175 | {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, | ||
176 | + {"unified-reject-files", no_argument, NULL, CHAR_MAX + 9}, | ||
177 | {NULL, no_argument, NULL, 0} | ||
178 | }; | ||
179 | |||
180 | @@ -580,6 +581,7 @@ static char const *const option_help[] = | ||
181 | " --verbose Output extra information about the work being done.", | ||
182 | " --dry-run Do not actually change any files; just print what would happen.", | ||
183 | " --posix Conform to the POSIX standard.", | ||
184 | +" --unified-reject-files Create unified reject files.", | ||
185 | "", | ||
186 | " -d DIR --directory=DIR Change the working directory to DIR first.", | ||
187 | #if HAVE_SETMODE_DOS | ||
188 | @@ -779,6 +781,9 @@ get_some_switches (void) | ||
189 | (enum quoting_style) i); | ||
190 | } | ||
191 | break; | ||
192 | + case CHAR_MAX + 9: | ||
193 | + unified_reject_files = true; | ||
194 | + break; | ||
195 | default: | ||
196 | usage (stderr, 2); | ||
197 | } | ||
198 | @@ -927,6 +932,24 @@ locate_hunk (LINENUM fuzz) | ||
199 | return 0; | ||
200 | } | ||
201 | |||
202 | +static char * | ||
203 | +format_linerange (char rangebuf[LINENUM_LENGTH_BOUND*2 + 2], | ||
204 | + LINENUM first, LINENUM lines) | ||
205 | +{ | ||
206 | + if (lines == 1) | ||
207 | + rangebuf = format_linenum (rangebuf, first); | ||
208 | + else | ||
209 | + { | ||
210 | + char *rb; | ||
211 | + rangebuf = format_linenum (rangebuf + LINENUM_LENGTH_BOUND + 1, lines); | ||
212 | + rb = rangebuf-1; | ||
213 | + rangebuf = format_linenum (rangebuf - LINENUM_LENGTH_BOUND - 1, | ||
214 | + (lines > 0) ? first : 0); | ||
215 | + *rb = ','; | ||
216 | + } | ||
217 | + return rangebuf; | ||
218 | +} | ||
219 | + | ||
220 | /* We did not find the pattern, dump out the hunk so they can handle it. */ | ||
221 | |||
222 | static void | ||
223 | @@ -943,8 +966,83 @@ abort_hunk (void) | ||
224 | (int) NEW_CONTEXT_DIFF <= (int) diff_type ? " ****" : ""; | ||
225 | char const *minuses = | ||
226 | (int) NEW_CONTEXT_DIFF <= (int) diff_type ? " ----" : " -----"; | ||
227 | + char const *function = pch_c_function(); | ||
228 | + if (function == NULL) | ||
229 | + function = ""; | ||
230 | + | ||
231 | + if (unified_reject_files) | ||
232 | + { | ||
233 | + /* produce unified reject files */ | ||
234 | + char rangebuf0[LINENUM_LENGTH_BOUND*2 + 2]; | ||
235 | + char rangebuf1[LINENUM_LENGTH_BOUND*2 + 2]; | ||
236 | + LINENUM j; | ||
237 | + | ||
238 | + /* Find the beginning of the remove and insert section. */ | ||
239 | + for (j = 0; j <= pat_end; j++) | ||
240 | + if (pch_char (j) == '=') | ||
241 | + break; | ||
242 | + for (i = j+1; i <= pat_end; i++) | ||
243 | + if (pch_char (i) == '^') | ||
244 | + break; | ||
245 | + if (pch_char (0) != '*' || j > pat_end || i > pat_end+1) | ||
246 | + fatal ("internal error in abort_hunk"); | ||
247 | + i = 1; j++; | ||
248 | + | ||
249 | + /* @@ -from,lines +to,lines @@ */ | ||
250 | + fprintf (rejfp, "@@ -%s +%s @@%s\n", | ||
251 | + format_linerange (rangebuf0, oldfirst, pch_ptrn_lines()), | ||
252 | + format_linerange (rangebuf1, newfirst, pch_repl_lines()), | ||
253 | + function); | ||
254 | + | ||
255 | + while ( (i <= pat_end && pch_char (i) != '=') | ||
256 | + || (j <= pat_end && pch_char (j) != '^')) | ||
257 | + { | ||
258 | + if (i <= pat_end | ||
259 | + && (pch_char (i) == '-' || pch_char (i) == '!')) | ||
260 | + { | ||
261 | + fputc('-', rejfp); | ||
262 | + pch_write_line (i++, rejfp); | ||
263 | + } | ||
264 | + else if (j <= pat_end | ||
265 | + && (pch_char (j) == '+' || pch_char (j) == '!')) | ||
266 | + { | ||
267 | + fputc('+', rejfp); | ||
268 | + pch_write_line (j++, rejfp); | ||
269 | + } | ||
270 | + else if ((i <= pat_end | ||
271 | + && (pch_char (i) == ' ' || pch_char (i) == '\n')) && | ||
272 | + (j > pat_end | ||
273 | + || (pch_char (j) == ' ' || pch_char (j) == '\n'))) | ||
274 | + { | ||
275 | + /* Unless j is already past the end, lines i and j | ||
276 | + must be equal here. */ | ||
277 | + | ||
278 | + if (pch_char (i) == ' ') | ||
279 | + fputc(' ', rejfp); | ||
280 | + pch_write_line (i++, rejfp); | ||
281 | + if (j <= pat_end) | ||
282 | + j++; | ||
283 | + } | ||
284 | + else if ((j <= pat_end && | ||
285 | + (pch_char (j) == ' ' || pch_char (j) == '\n')) && | ||
286 | + (pch_char (i) == '=')) | ||
287 | + { | ||
288 | + if (pch_char (j) == ' ') | ||
289 | + fputc(' ', rejfp); | ||
290 | + pch_write_line (j++, rejfp); | ||
291 | + } | ||
292 | + else | ||
293 | + fatal ("internal error in abort_hunk"); | ||
294 | + } | ||
295 | + | ||
296 | + if (ferror (rejfp)) | ||
297 | + write_fatal (); | ||
298 | + return; | ||
299 | + } | ||
300 | |||
301 | - fprintf(rejfp, "***************\n"); | ||
302 | + /* produce context type reject files */ | ||
303 | + | ||
304 | + fprintf(rejfp, "***************%s\n", function); | ||
305 | for (i=0; i<=pat_end; i++) { | ||
306 | char numbuf0[LINENUM_LENGTH_BOUND + 1]; | ||
307 | char numbuf1[LINENUM_LENGTH_BOUND + 1]; | ||
diff --git a/recipes-devtools/patch/patch_2.5.9.bb b/recipes-devtools/patch/patch_2.5.9.bb new file mode 100644 index 0000000..c29b240 --- /dev/null +++ b/recipes-devtools/patch/patch_2.5.9.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require patch.inc | ||
2 | LICENSE = "GPLv2" | ||
3 | |||
4 | SRC_URI += " file://debian.patch \ | ||
5 | file://install.patch \ | ||
6 | file://unified-reject-files.diff \ | ||
7 | file://global-reject-file.diff " | ||
8 | PR = "r3" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
11 | SRC_URI[md5sum] = "dacfb618082f8d3a2194601193cf8716" | ||
12 | SRC_URI[sha256sum] = "ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a" | ||