diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/patch/patch-2.5.9/debian.patch | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/patch/patch-2.5.9/debian.patch')
-rw-r--r-- | meta/recipes-devtools/patch/patch-2.5.9/debian.patch | 10424 |
1 files changed, 10424 insertions, 0 deletions
diff --git a/meta/recipes-devtools/patch/patch-2.5.9/debian.patch b/meta/recipes-devtools/patch/patch-2.5.9/debian.patch new file mode 100644 index 0000000000..460185827e --- /dev/null +++ b/meta/recipes-devtools/patch/patch-2.5.9/debian.patch | |||
@@ -0,0 +1,10424 @@ | |||
1 | --- patch-2.5.9.orig/m4/hash.m4 | ||
2 | +++ patch-2.5.9/m4/hash.m4 | ||
3 | @@ -0,0 +1,15 @@ | ||
4 | +# hash.m4 serial 1 | ||
5 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
6 | +dnl This file is free software, distributed under the terms of the GNU | ||
7 | +dnl General Public License. As a special exception to the GNU General | ||
8 | +dnl Public License, this file may be distributed as part of a program | ||
9 | +dnl that contains a configuration script generated by Autoconf, under | ||
10 | +dnl the same distribution terms as the rest of that program. | ||
11 | + | ||
12 | +AC_DEFUN([gl_HASH], | ||
13 | +[ | ||
14 | + dnl Prerequisites of lib/hash.c. | ||
15 | + AC_CHECK_HEADERS_ONCE(stdlib.h) | ||
16 | + AC_HEADER_STDBOOL | ||
17 | + AC_CHECK_DECLS_ONCE(free malloc) | ||
18 | +]) | ||
19 | --- patch-2.5.9.orig/m4/nanosecond_stat.m4 | ||
20 | +++ patch-2.5.9/m4/nanosecond_stat.m4 | ||
21 | @@ -0,0 +1,35 @@ | ||
22 | +AC_DEFUN([ag_CHECK_NANOSECOND_STAT], | ||
23 | + [AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
24 | + [ac_cv_stat_nsec], | ||
25 | + [AC_TRY_COMPILE( | ||
26 | + [ | ||
27 | + #include <sys/types.h> | ||
28 | + #include <sys/stat.h> | ||
29 | + #include <unistd.h> | ||
30 | + struct stat st; | ||
31 | + ], | ||
32 | + [ return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; ], | ||
33 | + [ac_cv_stat_nsec=yes], | ||
34 | + [ac_cv_stat_nsec=no]) | ||
35 | + ]) | ||
36 | + if test $ac_cv_stat_nsec = yes; then | ||
37 | + AC_DEFINE(HAVE_STAT_NSEC, 1, [Define to 1 if struct stat has nanosecond timestamps.]) | ||
38 | + fi | ||
39 | + | ||
40 | + AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
41 | + [ac_cv_stat_timeval], | ||
42 | + [AC_TRY_COMPILE( | ||
43 | + [ | ||
44 | + #include <time.h> | ||
45 | + #include <sys/types.h> | ||
46 | + #include <sys/stat.h> | ||
47 | + #include <unistd.h> | ||
48 | + struct stat st; | ||
49 | + ], | ||
50 | + [ return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; ], | ||
51 | + [ac_cv_stat_timeval=yes], | ||
52 | + [ac_cv_stat_timeval=no]) | ||
53 | + ]) | ||
54 | + if test $ac_cv_stat_timeval = yes; then | ||
55 | + AC_DEFINE(HAVE_STAT_TIMEVAL, 1, [Define to 1 if struct stat comtains struct timeval's.]) | ||
56 | + fi]) | ||
57 | --- patch-2.5.9.orig/Makefile.in | ||
58 | +++ patch-2.5.9/Makefile.in | ||
59 | @@ -62,7 +62,7 @@ | ||
60 | SHELL = /bin/sh | ||
61 | |||
62 | LIBSRCS = error.c malloc.c memchr.c mkdir.c \ | ||
63 | - realloc.c rmdir.c strcasecmp.c strncasecmp.c | ||
64 | + realloc.c rmdir.c strcasecmp.c strncasecmp.c hash.c | ||
65 | SRCS = $(LIBSRCS) \ | ||
66 | addext.c argmatch.c backupfile.c \ | ||
67 | basename.c dirname.c \ | ||
68 | @@ -78,12 +78,12 @@ | ||
69 | maketime.$(OBJEXT) partime.$(OBJEXT) \ | ||
70 | patch.$(OBJEXT) pch.$(OBJEXT) \ | ||
71 | quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \ | ||
72 | - util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) | ||
73 | + util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) hash.$(OBJEXT) | ||
74 | HDRS = argmatch.h backupfile.h common.h dirname.h \ | ||
75 | error.h getopt.h gettext.h \ | ||
76 | inp.h maketime.h partime.h pch.h \ | ||
77 | quote.h quotearg.h quotesys.h \ | ||
78 | - unlocked-io.h util.h version.h xalloc.h | ||
79 | + unlocked-io.h util.h version.h xalloc.h hash.h | ||
80 | MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \ | ||
81 | aclocal.m4 \ | ||
82 | config.hin configure configure.ac \ | ||
83 | --- patch-2.5.9.orig/aclocal.m4 | ||
84 | +++ patch-2.5.9/aclocal.m4 | ||
85 | @@ -1,3 +1,1058 @@ | ||
86 | +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 | ||
87 | + | ||
88 | +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. | ||
89 | +dnl This file is free software; the Free Software Foundation | ||
90 | +dnl gives unlimited permission to copy and/or distribute it, | ||
91 | +dnl with or without modifications, as long as this notice is preserved. | ||
92 | + | ||
93 | +dnl This program is distributed in the hope that it will be useful, | ||
94 | +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
95 | +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
96 | +dnl PARTICULAR PURPOSE. | ||
97 | + | ||
98 | +# lib-prefix.m4 serial 3 (gettext-0.13) | ||
99 | +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
100 | +dnl This file is free software, distributed under the terms of the GNU | ||
101 | +dnl General Public License. As a special exception to the GNU General | ||
102 | +dnl Public License, this file may be distributed as part of a program | ||
103 | +dnl that contains a configuration script generated by Autoconf, under | ||
104 | +dnl the same distribution terms as the rest of that program. | ||
105 | + | ||
106 | +dnl From Bruno Haible. | ||
107 | + | ||
108 | +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and | ||
109 | +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't | ||
110 | +dnl require excessive bracketing. | ||
111 | +ifdef([AC_HELP_STRING], | ||
112 | +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], | ||
113 | +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) | ||
114 | + | ||
115 | +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed | ||
116 | +dnl to access previously installed libraries. The basic assumption is that | ||
117 | +dnl a user will want packages to use other packages he previously installed | ||
118 | +dnl with the same --prefix option. | ||
119 | +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate | ||
120 | +dnl libraries, but is otherwise very convenient. | ||
121 | +AC_DEFUN([AC_LIB_PREFIX], | ||
122 | +[ | ||
123 | + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) | ||
124 | + AC_REQUIRE([AC_PROG_CC]) | ||
125 | + AC_REQUIRE([AC_CANONICAL_HOST]) | ||
126 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
127 | + dnl By default, look in $includedir and $libdir. | ||
128 | + use_additional=yes | ||
129 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
130 | + eval additional_includedir=\"$includedir\" | ||
131 | + eval additional_libdir=\"$libdir\" | ||
132 | + ]) | ||
133 | + AC_LIB_ARG_WITH([lib-prefix], | ||
134 | +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib | ||
135 | + --without-lib-prefix don't search for libraries in includedir and libdir], | ||
136 | +[ | ||
137 | + if test "X$withval" = "Xno"; then | ||
138 | + use_additional=no | ||
139 | + else | ||
140 | + if test "X$withval" = "X"; then | ||
141 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
142 | + eval additional_includedir=\"$includedir\" | ||
143 | + eval additional_libdir=\"$libdir\" | ||
144 | + ]) | ||
145 | + else | ||
146 | + additional_includedir="$withval/include" | ||
147 | + additional_libdir="$withval/lib" | ||
148 | + fi | ||
149 | + fi | ||
150 | +]) | ||
151 | + if test $use_additional = yes; then | ||
152 | + dnl Potentially add $additional_includedir to $CPPFLAGS. | ||
153 | + dnl But don't add it | ||
154 | + dnl 1. if it's the standard /usr/include, | ||
155 | + dnl 2. if it's already present in $CPPFLAGS, | ||
156 | + dnl 3. if it's /usr/local/include and we are using GCC on Linux, | ||
157 | + dnl 4. if it doesn't exist as a directory. | ||
158 | + if test "X$additional_includedir" != "X/usr/include"; then | ||
159 | + haveit= | ||
160 | + for x in $CPPFLAGS; do | ||
161 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
162 | + if test "X$x" = "X-I$additional_includedir"; then | ||
163 | + haveit=yes | ||
164 | + break | ||
165 | + fi | ||
166 | + done | ||
167 | + if test -z "$haveit"; then | ||
168 | + if test "X$additional_includedir" = "X/usr/local/include"; then | ||
169 | + if test -n "$GCC"; then | ||
170 | + case $host_os in | ||
171 | + linux*) haveit=yes;; | ||
172 | + esac | ||
173 | + fi | ||
174 | + fi | ||
175 | + if test -z "$haveit"; then | ||
176 | + if test -d "$additional_includedir"; then | ||
177 | + dnl Really add $additional_includedir to $CPPFLAGS. | ||
178 | + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" | ||
179 | + fi | ||
180 | + fi | ||
181 | + fi | ||
182 | + fi | ||
183 | + dnl Potentially add $additional_libdir to $LDFLAGS. | ||
184 | + dnl But don't add it | ||
185 | + dnl 1. if it's the standard /usr/lib, | ||
186 | + dnl 2. if it's already present in $LDFLAGS, | ||
187 | + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, | ||
188 | + dnl 4. if it doesn't exist as a directory. | ||
189 | + if test "X$additional_libdir" != "X/usr/lib"; then | ||
190 | + haveit= | ||
191 | + for x in $LDFLAGS; do | ||
192 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
193 | + if test "X$x" = "X-L$additional_libdir"; then | ||
194 | + haveit=yes | ||
195 | + break | ||
196 | + fi | ||
197 | + done | ||
198 | + if test -z "$haveit"; then | ||
199 | + if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
200 | + if test -n "$GCC"; then | ||
201 | + case $host_os in | ||
202 | + linux*) haveit=yes;; | ||
203 | + esac | ||
204 | + fi | ||
205 | + fi | ||
206 | + if test -z "$haveit"; then | ||
207 | + if test -d "$additional_libdir"; then | ||
208 | + dnl Really add $additional_libdir to $LDFLAGS. | ||
209 | + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" | ||
210 | + fi | ||
211 | + fi | ||
212 | + fi | ||
213 | + fi | ||
214 | + fi | ||
215 | +]) | ||
216 | + | ||
217 | +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, | ||
218 | +dnl acl_final_exec_prefix, containing the values to which $prefix and | ||
219 | +dnl $exec_prefix will expand at the end of the configure script. | ||
220 | +AC_DEFUN([AC_LIB_PREPARE_PREFIX], | ||
221 | +[ | ||
222 | + dnl Unfortunately, prefix and exec_prefix get only finally determined | ||
223 | + dnl at the end of configure. | ||
224 | + if test "X$prefix" = "XNONE"; then | ||
225 | + acl_final_prefix="$ac_default_prefix" | ||
226 | + else | ||
227 | + acl_final_prefix="$prefix" | ||
228 | + fi | ||
229 | + if test "X$exec_prefix" = "XNONE"; then | ||
230 | + acl_final_exec_prefix='${prefix}' | ||
231 | + else | ||
232 | + acl_final_exec_prefix="$exec_prefix" | ||
233 | + fi | ||
234 | + acl_save_prefix="$prefix" | ||
235 | + prefix="$acl_final_prefix" | ||
236 | + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" | ||
237 | + prefix="$acl_save_prefix" | ||
238 | +]) | ||
239 | + | ||
240 | +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the | ||
241 | +dnl variables prefix and exec_prefix bound to the values they will have | ||
242 | +dnl at the end of the configure script. | ||
243 | +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], | ||
244 | +[ | ||
245 | + acl_save_prefix="$prefix" | ||
246 | + prefix="$acl_final_prefix" | ||
247 | + acl_save_exec_prefix="$exec_prefix" | ||
248 | + exec_prefix="$acl_final_exec_prefix" | ||
249 | + $1 | ||
250 | + exec_prefix="$acl_save_exec_prefix" | ||
251 | + prefix="$acl_save_prefix" | ||
252 | +]) | ||
253 | + | ||
254 | +# lib-link.m4 serial 4 (gettext-0.12) | ||
255 | +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
256 | +dnl This file is free software, distributed under the terms of the GNU | ||
257 | +dnl General Public License. As a special exception to the GNU General | ||
258 | +dnl Public License, this file may be distributed as part of a program | ||
259 | +dnl that contains a configuration script generated by Autoconf, under | ||
260 | +dnl the same distribution terms as the rest of that program. | ||
261 | + | ||
262 | +dnl From Bruno Haible. | ||
263 | + | ||
264 | +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | ||
265 | +dnl the libraries corresponding to explicit and implicit dependencies. | ||
266 | +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | ||
267 | +dnl augments the CPPFLAGS variable. | ||
268 | +AC_DEFUN([AC_LIB_LINKFLAGS], | ||
269 | +[ | ||
270 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
271 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
272 | + define([Name],[translit([$1],[./-], [___])]) | ||
273 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
274 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
275 | + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ | ||
276 | + AC_LIB_LINKFLAGS_BODY([$1], [$2]) | ||
277 | + ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ||
278 | + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" | ||
279 | + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" | ||
280 | + ]) | ||
281 | + LIB[]NAME="$ac_cv_lib[]Name[]_libs" | ||
282 | + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" | ||
283 | + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" | ||
284 | + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
285 | + AC_SUBST([LIB]NAME) | ||
286 | + AC_SUBST([LTLIB]NAME) | ||
287 | + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the | ||
288 | + dnl results of this search when this library appears as a dependency. | ||
289 | + HAVE_LIB[]NAME=yes | ||
290 | + undefine([Name]) | ||
291 | + undefine([NAME]) | ||
292 | +]) | ||
293 | + | ||
294 | +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) | ||
295 | +dnl searches for libname and the libraries corresponding to explicit and | ||
296 | +dnl implicit dependencies, together with the specified include files and | ||
297 | +dnl the ability to compile and link the specified testcode. If found, it | ||
298 | +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and | ||
299 | +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and | ||
300 | +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs | ||
301 | +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. | ||
302 | +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | ||
303 | +[ | ||
304 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
305 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
306 | + define([Name],[translit([$1],[./-], [___])]) | ||
307 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
308 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
309 | + | ||
310 | + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME | ||
311 | + dnl accordingly. | ||
312 | + AC_LIB_LINKFLAGS_BODY([$1], [$2]) | ||
313 | + | ||
314 | + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, | ||
315 | + dnl because if the user has installed lib[]Name and not disabled its use | ||
316 | + dnl via --without-lib[]Name-prefix, he wants to use it. | ||
317 | + ac_save_CPPFLAGS="$CPPFLAGS" | ||
318 | + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
319 | + | ||
320 | + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ | ||
321 | + ac_save_LIBS="$LIBS" | ||
322 | + LIBS="$LIBS $LIB[]NAME" | ||
323 | + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) | ||
324 | + LIBS="$ac_save_LIBS" | ||
325 | + ]) | ||
326 | + if test "$ac_cv_lib[]Name" = yes; then | ||
327 | + HAVE_LIB[]NAME=yes | ||
328 | + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) | ||
329 | + AC_MSG_CHECKING([how to link with lib[]$1]) | ||
330 | + AC_MSG_RESULT([$LIB[]NAME]) | ||
331 | + else | ||
332 | + HAVE_LIB[]NAME=no | ||
333 | + dnl If $LIB[]NAME didn't lead to a usable library, we don't need | ||
334 | + dnl $INC[]NAME either. | ||
335 | + CPPFLAGS="$ac_save_CPPFLAGS" | ||
336 | + LIB[]NAME= | ||
337 | + LTLIB[]NAME= | ||
338 | + fi | ||
339 | + AC_SUBST([HAVE_LIB]NAME) | ||
340 | + AC_SUBST([LIB]NAME) | ||
341 | + AC_SUBST([LTLIB]NAME) | ||
342 | + undefine([Name]) | ||
343 | + undefine([NAME]) | ||
344 | +]) | ||
345 | + | ||
346 | +dnl Determine the platform dependent parameters needed to use rpath: | ||
347 | +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | ||
348 | +dnl hardcode_direct, hardcode_minus_L. | ||
349 | +AC_DEFUN([AC_LIB_RPATH], | ||
350 | +[ | ||
351 | + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS | ||
352 | + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld | ||
353 | + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host | ||
354 | + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir | ||
355 | + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ | ||
356 | + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ | ||
357 | + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh | ||
358 | + . ./conftest.sh | ||
359 | + rm -f ./conftest.sh | ||
360 | + acl_cv_rpath=done | ||
361 | + ]) | ||
362 | + wl="$acl_cv_wl" | ||
363 | + libext="$acl_cv_libext" | ||
364 | + shlibext="$acl_cv_shlibext" | ||
365 | + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
366 | + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
367 | + hardcode_direct="$acl_cv_hardcode_direct" | ||
368 | + hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
369 | + dnl Determine whether the user wants rpath handling at all. | ||
370 | + AC_ARG_ENABLE(rpath, | ||
371 | + [ --disable-rpath do not hardcode runtime library paths], | ||
372 | + :, enable_rpath=yes) | ||
373 | +]) | ||
374 | + | ||
375 | +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and | ||
376 | +dnl the libraries corresponding to explicit and implicit dependencies. | ||
377 | +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. | ||
378 | +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | ||
379 | +[ | ||
380 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
381 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
382 | + dnl By default, look in $includedir and $libdir. | ||
383 | + use_additional=yes | ||
384 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
385 | + eval additional_includedir=\"$includedir\" | ||
386 | + eval additional_libdir=\"$libdir\" | ||
387 | + ]) | ||
388 | + AC_LIB_ARG_WITH([lib$1-prefix], | ||
389 | +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
390 | + --without-lib$1-prefix don't search for lib$1 in includedir and libdir], | ||
391 | +[ | ||
392 | + if test "X$withval" = "Xno"; then | ||
393 | + use_additional=no | ||
394 | + else | ||
395 | + if test "X$withval" = "X"; then | ||
396 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
397 | + eval additional_includedir=\"$includedir\" | ||
398 | + eval additional_libdir=\"$libdir\" | ||
399 | + ]) | ||
400 | + else | ||
401 | + additional_includedir="$withval/include" | ||
402 | + additional_libdir="$withval/lib" | ||
403 | + fi | ||
404 | + fi | ||
405 | +]) | ||
406 | + dnl Search the library and its dependencies in $additional_libdir and | ||
407 | + dnl $LDFLAGS. Using breadth-first-seach. | ||
408 | + LIB[]NAME= | ||
409 | + LTLIB[]NAME= | ||
410 | + INC[]NAME= | ||
411 | + rpathdirs= | ||
412 | + ltrpathdirs= | ||
413 | + names_already_handled= | ||
414 | + names_next_round='$1 $2' | ||
415 | + while test -n "$names_next_round"; do | ||
416 | + names_this_round="$names_next_round" | ||
417 | + names_next_round= | ||
418 | + for name in $names_this_round; do | ||
419 | + already_handled= | ||
420 | + for n in $names_already_handled; do | ||
421 | + if test "$n" = "$name"; then | ||
422 | + already_handled=yes | ||
423 | + break | ||
424 | + fi | ||
425 | + done | ||
426 | + if test -z "$already_handled"; then | ||
427 | + names_already_handled="$names_already_handled $name" | ||
428 | + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS | ||
429 | + dnl or AC_LIB_HAVE_LINKFLAGS call. | ||
430 | + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` | ||
431 | + eval value=\"\$HAVE_LIB$uppername\" | ||
432 | + if test -n "$value"; then | ||
433 | + if test "$value" = yes; then | ||
434 | + eval value=\"\$LIB$uppername\" | ||
435 | + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" | ||
436 | + eval value=\"\$LTLIB$uppername\" | ||
437 | + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" | ||
438 | + else | ||
439 | + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined | ||
440 | + dnl that this library doesn't exist. So just drop it. | ||
441 | + : | ||
442 | + fi | ||
443 | + else | ||
444 | + dnl Search the library lib$name in $additional_libdir and $LDFLAGS | ||
445 | + dnl and the already constructed $LIBNAME/$LTLIBNAME. | ||
446 | + found_dir= | ||
447 | + found_la= | ||
448 | + found_so= | ||
449 | + found_a= | ||
450 | + if test $use_additional = yes; then | ||
451 | + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then | ||
452 | + found_dir="$additional_libdir" | ||
453 | + found_so="$additional_libdir/lib$name.$shlibext" | ||
454 | + if test -f "$additional_libdir/lib$name.la"; then | ||
455 | + found_la="$additional_libdir/lib$name.la" | ||
456 | + fi | ||
457 | + else | ||
458 | + if test -f "$additional_libdir/lib$name.$libext"; then | ||
459 | + found_dir="$additional_libdir" | ||
460 | + found_a="$additional_libdir/lib$name.$libext" | ||
461 | + if test -f "$additional_libdir/lib$name.la"; then | ||
462 | + found_la="$additional_libdir/lib$name.la" | ||
463 | + fi | ||
464 | + fi | ||
465 | + fi | ||
466 | + fi | ||
467 | + if test "X$found_dir" = "X"; then | ||
468 | + for x in $LDFLAGS $LTLIB[]NAME; do | ||
469 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
470 | + case "$x" in | ||
471 | + -L*) | ||
472 | + dir=`echo "X$x" | sed -e 's/^X-L//'` | ||
473 | + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then | ||
474 | + found_dir="$dir" | ||
475 | + found_so="$dir/lib$name.$shlibext" | ||
476 | + if test -f "$dir/lib$name.la"; then | ||
477 | + found_la="$dir/lib$name.la" | ||
478 | + fi | ||
479 | + else | ||
480 | + if test -f "$dir/lib$name.$libext"; then | ||
481 | + found_dir="$dir" | ||
482 | + found_a="$dir/lib$name.$libext" | ||
483 | + if test -f "$dir/lib$name.la"; then | ||
484 | + found_la="$dir/lib$name.la" | ||
485 | + fi | ||
486 | + fi | ||
487 | + fi | ||
488 | + ;; | ||
489 | + esac | ||
490 | + if test "X$found_dir" != "X"; then | ||
491 | + break | ||
492 | + fi | ||
493 | + done | ||
494 | + fi | ||
495 | + if test "X$found_dir" != "X"; then | ||
496 | + dnl Found the library. | ||
497 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" | ||
498 | + if test "X$found_so" != "X"; then | ||
499 | + dnl Linking with a shared library. We attempt to hardcode its | ||
500 | + dnl directory into the executable's runpath, unless it's the | ||
501 | + dnl standard /usr/lib. | ||
502 | + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then | ||
503 | + dnl No hardcoding is needed. | ||
504 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
505 | + else | ||
506 | + dnl Use an explicit option to hardcode DIR into the resulting | ||
507 | + dnl binary. | ||
508 | + dnl Potentially add DIR to ltrpathdirs. | ||
509 | + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. | ||
510 | + haveit= | ||
511 | + for x in $ltrpathdirs; do | ||
512 | + if test "X$x" = "X$found_dir"; then | ||
513 | + haveit=yes | ||
514 | + break | ||
515 | + fi | ||
516 | + done | ||
517 | + if test -z "$haveit"; then | ||
518 | + ltrpathdirs="$ltrpathdirs $found_dir" | ||
519 | + fi | ||
520 | + dnl The hardcoding into $LIBNAME is system dependent. | ||
521 | + if test "$hardcode_direct" = yes; then | ||
522 | + dnl Using DIR/libNAME.so during linking hardcodes DIR into the | ||
523 | + dnl resulting binary. | ||
524 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
525 | + else | ||
526 | + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | ||
527 | + dnl Use an explicit option to hardcode DIR into the resulting | ||
528 | + dnl binary. | ||
529 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
530 | + dnl Potentially add DIR to rpathdirs. | ||
531 | + dnl The rpathdirs will be appended to $LIBNAME at the end. | ||
532 | + haveit= | ||
533 | + for x in $rpathdirs; do | ||
534 | + if test "X$x" = "X$found_dir"; then | ||
535 | + haveit=yes | ||
536 | + break | ||
537 | + fi | ||
538 | + done | ||
539 | + if test -z "$haveit"; then | ||
540 | + rpathdirs="$rpathdirs $found_dir" | ||
541 | + fi | ||
542 | + else | ||
543 | + dnl Rely on "-L$found_dir". | ||
544 | + dnl But don't add it if it's already contained in the LDFLAGS | ||
545 | + dnl or the already constructed $LIBNAME | ||
546 | + haveit= | ||
547 | + for x in $LDFLAGS $LIB[]NAME; do | ||
548 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
549 | + if test "X$x" = "X-L$found_dir"; then | ||
550 | + haveit=yes | ||
551 | + break | ||
552 | + fi | ||
553 | + done | ||
554 | + if test -z "$haveit"; then | ||
555 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" | ||
556 | + fi | ||
557 | + if test "$hardcode_minus_L" != no; then | ||
558 | + dnl FIXME: Not sure whether we should use | ||
559 | + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
560 | + dnl here. | ||
561 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
562 | + else | ||
563 | + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH | ||
564 | + dnl here, because this doesn't fit in flags passed to the | ||
565 | + dnl compiler. So give up. No hardcoding. This affects only | ||
566 | + dnl very old systems. | ||
567 | + dnl FIXME: Not sure whether we should use | ||
568 | + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
569 | + dnl here. | ||
570 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" | ||
571 | + fi | ||
572 | + fi | ||
573 | + fi | ||
574 | + fi | ||
575 | + else | ||
576 | + if test "X$found_a" != "X"; then | ||
577 | + dnl Linking with a static library. | ||
578 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" | ||
579 | + else | ||
580 | + dnl We shouldn't come here, but anyway it's good to have a | ||
581 | + dnl fallback. | ||
582 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" | ||
583 | + fi | ||
584 | + fi | ||
585 | + dnl Assume the include files are nearby. | ||
586 | + additional_includedir= | ||
587 | + case "$found_dir" in | ||
588 | + */lib | */lib/) | ||
589 | + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` | ||
590 | + additional_includedir="$basedir/include" | ||
591 | + ;; | ||
592 | + esac | ||
593 | + if test "X$additional_includedir" != "X"; then | ||
594 | + dnl Potentially add $additional_includedir to $INCNAME. | ||
595 | + dnl But don't add it | ||
596 | + dnl 1. if it's the standard /usr/include, | ||
597 | + dnl 2. if it's /usr/local/include and we are using GCC on Linux, | ||
598 | + dnl 3. if it's already present in $CPPFLAGS or the already | ||
599 | + dnl constructed $INCNAME, | ||
600 | + dnl 4. if it doesn't exist as a directory. | ||
601 | + if test "X$additional_includedir" != "X/usr/include"; then | ||
602 | + haveit= | ||
603 | + if test "X$additional_includedir" = "X/usr/local/include"; then | ||
604 | + if test -n "$GCC"; then | ||
605 | + case $host_os in | ||
606 | + linux*) haveit=yes;; | ||
607 | + esac | ||
608 | + fi | ||
609 | + fi | ||
610 | + if test -z "$haveit"; then | ||
611 | + for x in $CPPFLAGS $INC[]NAME; do | ||
612 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
613 | + if test "X$x" = "X-I$additional_includedir"; then | ||
614 | + haveit=yes | ||
615 | + break | ||
616 | + fi | ||
617 | + done | ||
618 | + if test -z "$haveit"; then | ||
619 | + if test -d "$additional_includedir"; then | ||
620 | + dnl Really add $additional_includedir to $INCNAME. | ||
621 | + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" | ||
622 | + fi | ||
623 | + fi | ||
624 | + fi | ||
625 | + fi | ||
626 | + fi | ||
627 | + dnl Look for dependencies. | ||
628 | + if test -n "$found_la"; then | ||
629 | + dnl Read the .la file. It defines the variables | ||
630 | + dnl dlname, library_names, old_library, dependency_libs, current, | ||
631 | + dnl age, revision, installed, dlopen, dlpreopen, libdir. | ||
632 | + save_libdir="$libdir" | ||
633 | + case "$found_la" in | ||
634 | + */* | *\\*) . "$found_la" ;; | ||
635 | + *) . "./$found_la" ;; | ||
636 | + esac | ||
637 | + libdir="$save_libdir" | ||
638 | + dnl We use only dependency_libs. | ||
639 | + for dep in $dependency_libs; do | ||
640 | + case "$dep" in | ||
641 | + -L*) | ||
642 | + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` | ||
643 | + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. | ||
644 | + dnl But don't add it | ||
645 | + dnl 1. if it's the standard /usr/lib, | ||
646 | + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, | ||
647 | + dnl 3. if it's already present in $LDFLAGS or the already | ||
648 | + dnl constructed $LIBNAME, | ||
649 | + dnl 4. if it doesn't exist as a directory. | ||
650 | + if test "X$additional_libdir" != "X/usr/lib"; then | ||
651 | + haveit= | ||
652 | + if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
653 | + if test -n "$GCC"; then | ||
654 | + case $host_os in | ||
655 | + linux*) haveit=yes;; | ||
656 | + esac | ||
657 | + fi | ||
658 | + fi | ||
659 | + if test -z "$haveit"; then | ||
660 | + haveit= | ||
661 | + for x in $LDFLAGS $LIB[]NAME; do | ||
662 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
663 | + if test "X$x" = "X-L$additional_libdir"; then | ||
664 | + haveit=yes | ||
665 | + break | ||
666 | + fi | ||
667 | + done | ||
668 | + if test -z "$haveit"; then | ||
669 | + if test -d "$additional_libdir"; then | ||
670 | + dnl Really add $additional_libdir to $LIBNAME. | ||
671 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" | ||
672 | + fi | ||
673 | + fi | ||
674 | + haveit= | ||
675 | + for x in $LDFLAGS $LTLIB[]NAME; do | ||
676 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
677 | + if test "X$x" = "X-L$additional_libdir"; then | ||
678 | + haveit=yes | ||
679 | + break | ||
680 | + fi | ||
681 | + done | ||
682 | + if test -z "$haveit"; then | ||
683 | + if test -d "$additional_libdir"; then | ||
684 | + dnl Really add $additional_libdir to $LTLIBNAME. | ||
685 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" | ||
686 | + fi | ||
687 | + fi | ||
688 | + fi | ||
689 | + fi | ||
690 | + ;; | ||
691 | + -R*) | ||
692 | + dir=`echo "X$dep" | sed -e 's/^X-R//'` | ||
693 | + if test "$enable_rpath" != no; then | ||
694 | + dnl Potentially add DIR to rpathdirs. | ||
695 | + dnl The rpathdirs will be appended to $LIBNAME at the end. | ||
696 | + haveit= | ||
697 | + for x in $rpathdirs; do | ||
698 | + if test "X$x" = "X$dir"; then | ||
699 | + haveit=yes | ||
700 | + break | ||
701 | + fi | ||
702 | + done | ||
703 | + if test -z "$haveit"; then | ||
704 | + rpathdirs="$rpathdirs $dir" | ||
705 | + fi | ||
706 | + dnl Potentially add DIR to ltrpathdirs. | ||
707 | + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. | ||
708 | + haveit= | ||
709 | + for x in $ltrpathdirs; do | ||
710 | + if test "X$x" = "X$dir"; then | ||
711 | + haveit=yes | ||
712 | + break | ||
713 | + fi | ||
714 | + done | ||
715 | + if test -z "$haveit"; then | ||
716 | + ltrpathdirs="$ltrpathdirs $dir" | ||
717 | + fi | ||
718 | + fi | ||
719 | + ;; | ||
720 | + -l*) | ||
721 | + dnl Handle this in the next round. | ||
722 | + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` | ||
723 | + ;; | ||
724 | + *.la) | ||
725 | + dnl Handle this in the next round. Throw away the .la's | ||
726 | + dnl directory; it is already contained in a preceding -L | ||
727 | + dnl option. | ||
728 | + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` | ||
729 | + ;; | ||
730 | + *) | ||
731 | + dnl Most likely an immediate library name. | ||
732 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" | ||
733 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" | ||
734 | + ;; | ||
735 | + esac | ||
736 | + done | ||
737 | + fi | ||
738 | + else | ||
739 | + dnl Didn't find the library; assume it is in the system directories | ||
740 | + dnl known to the linker and runtime loader. (All the system | ||
741 | + dnl directories known to the linker should also be known to the | ||
742 | + dnl runtime loader, otherwise the system is severely misconfigured.) | ||
743 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" | ||
744 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" | ||
745 | + fi | ||
746 | + fi | ||
747 | + fi | ||
748 | + done | ||
749 | + done | ||
750 | + if test "X$rpathdirs" != "X"; then | ||
751 | + if test -n "$hardcode_libdir_separator"; then | ||
752 | + dnl Weird platform: only the last -rpath option counts, the user must | ||
753 | + dnl pass all path elements in one option. We can arrange that for a | ||
754 | + dnl single library, but not when more than one $LIBNAMEs are used. | ||
755 | + alldirs= | ||
756 | + for found_dir in $rpathdirs; do | ||
757 | + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" | ||
758 | + done | ||
759 | + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. | ||
760 | + acl_save_libdir="$libdir" | ||
761 | + libdir="$alldirs" | ||
762 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
763 | + libdir="$acl_save_libdir" | ||
764 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
765 | + else | ||
766 | + dnl The -rpath options are cumulative. | ||
767 | + for found_dir in $rpathdirs; do | ||
768 | + acl_save_libdir="$libdir" | ||
769 | + libdir="$found_dir" | ||
770 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
771 | + libdir="$acl_save_libdir" | ||
772 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
773 | + done | ||
774 | + fi | ||
775 | + fi | ||
776 | + if test "X$ltrpathdirs" != "X"; then | ||
777 | + dnl When using libtool, the option that works for both libraries and | ||
778 | + dnl executables is -R. The -R options are cumulative. | ||
779 | + for found_dir in $ltrpathdirs; do | ||
780 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" | ||
781 | + done | ||
782 | + fi | ||
783 | +]) | ||
784 | + | ||
785 | +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, | ||
786 | +dnl unless already present in VAR. | ||
787 | +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes | ||
788 | +dnl contains two or three consecutive elements that belong together. | ||
789 | +AC_DEFUN([AC_LIB_APPENDTOVAR], | ||
790 | +[ | ||
791 | + for element in [$2]; do | ||
792 | + haveit= | ||
793 | + for x in $[$1]; do | ||
794 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
795 | + if test "X$x" = "X$element"; then | ||
796 | + haveit=yes | ||
797 | + break | ||
798 | + fi | ||
799 | + done | ||
800 | + if test -z "$haveit"; then | ||
801 | + [$1]="${[$1]}${[$1]:+ }$element" | ||
802 | + fi | ||
803 | + done | ||
804 | +]) | ||
805 | + | ||
806 | +# lib-ld.m4 serial 3 (gettext-0.13) | ||
807 | +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. | ||
808 | +dnl This file is free software, distributed under the terms of the GNU | ||
809 | +dnl General Public License. As a special exception to the GNU General | ||
810 | +dnl Public License, this file may be distributed as part of a program | ||
811 | +dnl that contains a configuration script generated by Autoconf, under | ||
812 | +dnl the same distribution terms as the rest of that program. | ||
813 | + | ||
814 | +dnl Subroutines of libtool.m4, | ||
815 | +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision | ||
816 | +dnl with libtool.m4. | ||
817 | + | ||
818 | +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. | ||
819 | +AC_DEFUN([AC_LIB_PROG_LD_GNU], | ||
820 | +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, | ||
821 | +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. | ||
822 | +case `$LD -v 2>&1 </dev/null` in | ||
823 | +*GNU* | *'with BFD'*) | ||
824 | + acl_cv_prog_gnu_ld=yes ;; | ||
825 | +*) | ||
826 | + acl_cv_prog_gnu_ld=no ;; | ||
827 | +esac]) | ||
828 | +with_gnu_ld=$acl_cv_prog_gnu_ld | ||
829 | +]) | ||
830 | + | ||
831 | +dnl From libtool-1.4. Sets the variable LD. | ||
832 | +AC_DEFUN([AC_LIB_PROG_LD], | ||
833 | +[AC_ARG_WITH(gnu-ld, | ||
834 | +[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], | ||
835 | +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) | ||
836 | +AC_REQUIRE([AC_PROG_CC])dnl | ||
837 | +AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
838 | +# Prepare PATH_SEPARATOR. | ||
839 | +# The user is always right. | ||
840 | +if test "${PATH_SEPARATOR+set}" != set; then | ||
841 | + echo "#! /bin/sh" >conf$$.sh | ||
842 | + echo "exit 0" >>conf$$.sh | ||
843 | + chmod +x conf$$.sh | ||
844 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
845 | + PATH_SEPARATOR=';' | ||
846 | + else | ||
847 | + PATH_SEPARATOR=: | ||
848 | + fi | ||
849 | + rm -f conf$$.sh | ||
850 | +fi | ||
851 | +ac_prog=ld | ||
852 | +if test "$GCC" = yes; then | ||
853 | + # Check if gcc -print-prog-name=ld gives a path. | ||
854 | + AC_MSG_CHECKING([for ld used by GCC]) | ||
855 | + case $host in | ||
856 | + *-*-mingw*) | ||
857 | + # gcc leaves a trailing carriage return which upsets mingw | ||
858 | + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; | ||
859 | + *) | ||
860 | + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; | ||
861 | + esac | ||
862 | + case $ac_prog in | ||
863 | + # Accept absolute paths. | ||
864 | + [[\\/]* | [A-Za-z]:[\\/]*)] | ||
865 | + [re_direlt='/[^/][^/]*/\.\./'] | ||
866 | + # Canonicalize the path of ld | ||
867 | + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` | ||
868 | + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do | ||
869 | + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` | ||
870 | + done | ||
871 | + test -z "$LD" && LD="$ac_prog" | ||
872 | + ;; | ||
873 | + "") | ||
874 | + # If it fails, then pretend we aren't using GCC. | ||
875 | + ac_prog=ld | ||
876 | + ;; | ||
877 | + *) | ||
878 | + # If it is relative, then search for the first ld in PATH. | ||
879 | + with_gnu_ld=unknown | ||
880 | + ;; | ||
881 | + esac | ||
882 | +elif test "$with_gnu_ld" = yes; then | ||
883 | + AC_MSG_CHECKING([for GNU ld]) | ||
884 | +else | ||
885 | + AC_MSG_CHECKING([for non-GNU ld]) | ||
886 | +fi | ||
887 | +AC_CACHE_VAL(acl_cv_path_LD, | ||
888 | +[if test -z "$LD"; then | ||
889 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" | ||
890 | + for ac_dir in $PATH; do | ||
891 | + test -z "$ac_dir" && ac_dir=. | ||
892 | + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then | ||
893 | + acl_cv_path_LD="$ac_dir/$ac_prog" | ||
894 | + # Check to see if the program is GNU ld. I'd rather use --version, | ||
895 | + # but apparently some GNU ld's only accept -v. | ||
896 | + # Break only if it was the GNU/non-GNU ld that we prefer. | ||
897 | + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in | ||
898 | + *GNU* | *'with BFD'*) | ||
899 | + test "$with_gnu_ld" != no && break ;; | ||
900 | + *) | ||
901 | + test "$with_gnu_ld" != yes && break ;; | ||
902 | + esac | ||
903 | + fi | ||
904 | + done | ||
905 | + IFS="$ac_save_ifs" | ||
906 | +else | ||
907 | + acl_cv_path_LD="$LD" # Let the user override the test with a path. | ||
908 | +fi]) | ||
909 | +LD="$acl_cv_path_LD" | ||
910 | +if test -n "$LD"; then | ||
911 | + AC_MSG_RESULT($LD) | ||
912 | +else | ||
913 | + AC_MSG_RESULT(no) | ||
914 | +fi | ||
915 | +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) | ||
916 | +AC_LIB_PROG_LD_GNU | ||
917 | +]) | ||
918 | + | ||
919 | +# isc-posix.m4 serial 2 (gettext-0.11.2) | ||
920 | +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. | ||
921 | +dnl This file is free software, distributed under the terms of the GNU | ||
922 | +dnl General Public License. As a special exception to the GNU General | ||
923 | +dnl Public License, this file may be distributed as part of a program | ||
924 | +dnl that contains a configuration script generated by Autoconf, under | ||
925 | +dnl the same distribution terms as the rest of that program. | ||
926 | + | ||
927 | +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. | ||
928 | + | ||
929 | +# This test replaces the one in autoconf. | ||
930 | +# Currently this macro should have the same name as the autoconf macro | ||
931 | +# because gettext's gettext.m4 (distributed in the automake package) | ||
932 | +# still uses it. Otherwise, the use in gettext.m4 makes autoheader | ||
933 | +# give these diagnostics: | ||
934 | +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX | ||
935 | +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX | ||
936 | + | ||
937 | +undefine([AC_ISC_POSIX]) | ||
938 | + | ||
939 | +AC_DEFUN([AC_ISC_POSIX], | ||
940 | + [ | ||
941 | + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. | ||
942 | + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) | ||
943 | + ] | ||
944 | +) | ||
945 | + | ||
946 | +# Check for stdbool.h that conforms to C99. | ||
947 | + | ||
948 | +# Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
949 | + | ||
950 | +# This program is free software; you can redistribute it and/or modify | ||
951 | +# it under the terms of the GNU General Public License as published by | ||
952 | +# the Free Software Foundation; either version 2, or (at your option) | ||
953 | +# any later version. | ||
954 | + | ||
955 | +# This program is distributed in the hope that it will be useful, | ||
956 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
957 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
958 | +# GNU General Public License for more details. | ||
959 | + | ||
960 | +# You should have received a copy of the GNU General Public License | ||
961 | +# along with this program; if not, write to the Free Software | ||
962 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
963 | +# 02111-1307, USA. | ||
964 | + | ||
965 | +# Prepare for substituting <stdbool.h> if it is not supported. | ||
966 | + | ||
967 | +AC_DEFUN([AM_STDBOOL_H], | ||
968 | +[ | ||
969 | + AC_REQUIRE([AC_HEADER_STDBOOL]) | ||
970 | + | ||
971 | + # Define two additional variables used in the Makefile substitution. | ||
972 | + | ||
973 | + if test "$ac_cv_header_stdbool_h" = yes; then | ||
974 | + STDBOOL_H='' | ||
975 | + else | ||
976 | + STDBOOL_H='stdbool.h' | ||
977 | + fi | ||
978 | + AC_SUBST([STDBOOL_H]) | ||
979 | + | ||
980 | + if test "$ac_cv_type__Bool" = yes; then | ||
981 | + HAVE__BOOL=1 | ||
982 | + else | ||
983 | + HAVE__BOOL=0 | ||
984 | + fi | ||
985 | + AC_SUBST([HAVE__BOOL]) | ||
986 | +]) | ||
987 | + | ||
988 | +# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf | ||
989 | +# have this macro built-in. | ||
990 | + | ||
991 | +AC_DEFUN([AC_HEADER_STDBOOL], | ||
992 | + [AC_CACHE_CHECK([for stdbool.h that conforms to C99], | ||
993 | + [ac_cv_header_stdbool_h], | ||
994 | + [AC_TRY_COMPILE( | ||
995 | + [ | ||
996 | + #include <stdbool.h> | ||
997 | + #ifndef bool | ||
998 | + "error: bool is not defined" | ||
999 | + #endif | ||
1000 | + #ifndef false | ||
1001 | + "error: false is not defined" | ||
1002 | + #endif | ||
1003 | + #if false | ||
1004 | + "error: false is not 0" | ||
1005 | + #endif | ||
1006 | + #ifndef true | ||
1007 | + "error: false is not defined" | ||
1008 | + #endif | ||
1009 | + #if true != 1 | ||
1010 | + "error: true is not 1" | ||
1011 | + #endif | ||
1012 | + #ifndef __bool_true_false_are_defined | ||
1013 | + "error: __bool_true_false_are_defined is not defined" | ||
1014 | + #endif | ||
1015 | + | ||
1016 | + struct s { _Bool s: 1; _Bool t; } s; | ||
1017 | + | ||
1018 | + char a[true == 1 ? 1 : -1]; | ||
1019 | + char b[false == 0 ? 1 : -1]; | ||
1020 | + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
1021 | + char d[(bool) -0.5 == true ? 1 : -1]; | ||
1022 | + bool e = &s; | ||
1023 | + char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
1024 | + char g[true]; | ||
1025 | + char h[sizeof (_Bool)]; | ||
1026 | + char i[sizeof s.t]; | ||
1027 | + ], | ||
1028 | + [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ], | ||
1029 | + [ac_cv_header_stdbool_h=yes], | ||
1030 | + [ac_cv_header_stdbool_h=no])]) | ||
1031 | + AC_CHECK_TYPES([_Bool]) | ||
1032 | + if test $ac_cv_header_stdbool_h = yes; then | ||
1033 | + AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) | ||
1034 | + fi]) | ||
1035 | + | ||
1036 | +#serial 5 | ||
1037 | + | ||
1038 | +dnl From Jim Meyering | ||
1039 | + | ||
1040 | +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- | ||
1041 | +dnl usually in <utime.h>. | ||
1042 | +dnl Some systems have utime.h but don't declare the struct anywhere. | ||
1043 | + | ||
1044 | +AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF], | ||
1045 | +[ | ||
1046 | + AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) | ||
1047 | + AC_REQUIRE([AC_HEADER_TIME]) | ||
1048 | + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, | ||
1049 | + [AC_TRY_COMPILE( | ||
1050 | + [ | ||
1051 | +#ifdef TIME_WITH_SYS_TIME | ||
1052 | +# include <sys/time.h> | ||
1053 | +# include <time.h> | ||
1054 | +#else | ||
1055 | +# ifdef HAVE_SYS_TIME_H | ||
1056 | +# include <sys/time.h> | ||
1057 | +# else | ||
1058 | +# include <time.h> | ||
1059 | +# endif | ||
1060 | +#endif | ||
1061 | +#ifdef HAVE_UTIME_H | ||
1062 | +# include <utime.h> | ||
1063 | +#endif | ||
1064 | + ], | ||
1065 | + [static struct utimbuf x; x.actime = x.modtime;], | ||
1066 | + fu_cv_sys_struct_utimbuf=yes, | ||
1067 | + fu_cv_sys_struct_utimbuf=no) | ||
1068 | + ]) | ||
1069 | + | ||
1070 | + if test $fu_cv_sys_struct_utimbuf = yes; then | ||
1071 | + AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, | ||
1072 | + [Define if struct utimbuf is declared -- usually in <utime.h>. | ||
1073 | + Some systems have utime.h but don't declare the struct anywhere. ]) | ||
1074 | + fi | ||
1075 | +]) | ||
1076 | + | ||
1077 | +# onceonly.m4 serial 3 | ||
1078 | +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. | ||
1079 | +dnl This file is free software, distributed under the terms of the GNU | ||
1080 | +dnl General Public License. As a special exception to the GNU General | ||
1081 | +dnl Public License, this file may be distributed as part of a program | ||
1082 | +dnl that contains a configuration script generated by Autoconf, under | ||
1083 | +dnl the same distribution terms as the rest of that program. | ||
1084 | + | ||
1085 | +dnl This file defines some "once only" variants of standard autoconf macros. | ||
1086 | +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS | ||
1087 | +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS | ||
1088 | +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS | ||
1089 | +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC | ||
1090 | +dnl The advantage is that the check for each of the headers/functions/decls | ||
1091 | +dnl will be put only once into the 'configure' file. It keeps the size of | ||
1092 | +dnl the 'configure' file down, and avoids redundant output when 'configure' | ||
1093 | +dnl is run. | ||
1094 | +dnl The drawback is that the checks cannot be conditionalized. If you write | ||
1095 | +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi | ||
1096 | +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to | ||
1097 | +dnl empty, and the check will be inserted before the body of the AC_DEFUNed | ||
1098 | +dnl function. | ||
1099 | + | ||
1100 | +dnl Autoconf version 2.57 or newer is recommended. | ||
1101 | +AC_PREREQ(2.54) | ||
1102 | + | ||
1103 | +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of | ||
1104 | +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). | ||
1105 | +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ | ||
1106 | + : | ||
1107 | + AC_FOREACH([gl_HEADER_NAME], [$1], [ | ||
1108 | + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]), | ||
1109 | + [-./], [___])), [ | ||
1110 | + AC_CHECK_HEADERS(gl_HEADER_NAME) | ||
1111 | + ]) | ||
1112 | + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, | ||
1113 | + [-./], [___]))) | ||
1114 | + ]) | ||
1115 | +]) | ||
1116 | + | ||
1117 | +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of | ||
1118 | +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). | ||
1119 | +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ | ||
1120 | + : | ||
1121 | + AC_FOREACH([gl_FUNC_NAME], [$1], [ | ||
1122 | + AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [ | ||
1123 | + AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME])) | ||
1124 | + ]) | ||
1125 | + AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME])) | ||
1126 | + ]) | ||
1127 | +]) | ||
1128 | + | ||
1129 | +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of | ||
1130 | +# AC_CHECK_DECLS(DECL1, DECL2, ...). | ||
1131 | +AC_DEFUN([AC_CHECK_DECLS_ONCE], [ | ||
1132 | + : | ||
1133 | + AC_FOREACH([gl_DECL_NAME], [$1], [ | ||
1134 | + AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [ | ||
1135 | + AC_CHECK_DECLS(m4_defn([gl_DECL_NAME])) | ||
1136 | + ]) | ||
1137 | + AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME])) | ||
1138 | + ]) | ||
1139 | +]) | ||
1140 | + | ||
1141 | # backupfile.m4 serial 1 | ||
1142 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1143 | dnl This file is free software, distributed under the terms of the GNU | ||
1144 | @@ -21,6 +1076,7 @@ | ||
1145 | AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h) | ||
1146 | AC_CHECK_FUNCS(pathconf) | ||
1147 | ]) | ||
1148 | + | ||
1149 | #serial 5 | ||
1150 | |||
1151 | dnl From Jim Meyering. | ||
1152 | @@ -63,31 +1119,7 @@ | ||
1153 | fi | ||
1154 | ] | ||
1155 | ) | ||
1156 | -# dirname.m4 serial 1 | ||
1157 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1158 | -dnl This file is free software, distributed under the terms of the GNU | ||
1159 | -dnl General Public License. As a special exception to the GNU General | ||
1160 | -dnl Public License, this file may be distributed as part of a program | ||
1161 | -dnl that contains a configuration script generated by Autoconf, under | ||
1162 | -dnl the same distribution terms as the rest of that program. | ||
1163 | |||
1164 | -AC_DEFUN([gl_DIRNAME], | ||
1165 | -[ | ||
1166 | - dnl Prerequisites of lib/dirname.h. | ||
1167 | - AC_REQUIRE([jm_AC_DOS]) | ||
1168 | - | ||
1169 | - dnl Prerequisites of lib/dirname.c. | ||
1170 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1171 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1172 | - | ||
1173 | - dnl Prerequisites of lib/basename.c. | ||
1174 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1175 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1176 | - | ||
1177 | - dnl Prerequisites of lib/stripslash.c. | ||
1178 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1179 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1180 | -]) | ||
1181 | #serial 5 | ||
1182 | |||
1183 | # Define some macros required for proper operation of code in lib/*.c | ||
1184 | @@ -141,6 +1173,33 @@ | ||
1185 | [Define if the backslash character may also serve as a file name | ||
1186 | component separator.]) | ||
1187 | ]) | ||
1188 | + | ||
1189 | +# dirname.m4 serial 1 | ||
1190 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1191 | +dnl This file is free software, distributed under the terms of the GNU | ||
1192 | +dnl General Public License. As a special exception to the GNU General | ||
1193 | +dnl Public License, this file may be distributed as part of a program | ||
1194 | +dnl that contains a configuration script generated by Autoconf, under | ||
1195 | +dnl the same distribution terms as the rest of that program. | ||
1196 | + | ||
1197 | +AC_DEFUN([gl_DIRNAME], | ||
1198 | +[ | ||
1199 | + dnl Prerequisites of lib/dirname.h. | ||
1200 | + AC_REQUIRE([jm_AC_DOS]) | ||
1201 | + | ||
1202 | + dnl Prerequisites of lib/dirname.c. | ||
1203 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1204 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1205 | + | ||
1206 | + dnl Prerequisites of lib/basename.c. | ||
1207 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1208 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1209 | + | ||
1210 | + dnl Prerequisites of lib/stripslash.c. | ||
1211 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1212 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1213 | +]) | ||
1214 | + | ||
1215 | #serial 7 | ||
1216 | |||
1217 | AC_DEFUN([gl_ERROR], | ||
1218 | @@ -159,7 +1218,67 @@ | ||
1219 | AC_CHECK_DECLS([strerror]) | ||
1220 | AC_FUNC_STRERROR_R | ||
1221 | ]) | ||
1222 | -# getopt.m4 serial 1 | ||
1223 | + | ||
1224 | +# memchr.m4 serial 1 | ||
1225 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1226 | +dnl This file is free software, distributed under the terms of the GNU | ||
1227 | +dnl General Public License. As a special exception to the GNU General | ||
1228 | +dnl Public License, this file may be distributed as part of a program | ||
1229 | +dnl that contains a configuration script generated by Autoconf, under | ||
1230 | +dnl the same distribution terms as the rest of that program. | ||
1231 | + | ||
1232 | +AC_DEFUN([gl_FUNC_MEMCHR], | ||
1233 | +[ | ||
1234 | + AC_REPLACE_FUNCS(memchr) | ||
1235 | + if test $ac_cv_func_memchr = no; then | ||
1236 | + jm_PREREQ_MEMCHR | ||
1237 | + fi | ||
1238 | +]) | ||
1239 | + | ||
1240 | +# Prerequisites of lib/memchr.c. | ||
1241 | +AC_DEFUN([jm_PREREQ_MEMCHR], [ | ||
1242 | + AC_CHECK_HEADERS_ONCE(limits.h stdlib.h) | ||
1243 | + AC_CHECK_HEADERS(bp-sym.h) | ||
1244 | +]) | ||
1245 | + | ||
1246 | +# rmdir.m4 serial 1 | ||
1247 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1248 | +dnl This file is free software, distributed under the terms of the GNU | ||
1249 | +dnl General Public License. As a special exception to the GNU General | ||
1250 | +dnl Public License, this file may be distributed as part of a program | ||
1251 | +dnl that contains a configuration script generated by Autoconf, under | ||
1252 | +dnl the same distribution terms as the rest of that program. | ||
1253 | + | ||
1254 | +AC_DEFUN([gl_FUNC_RMDIR], | ||
1255 | +[ | ||
1256 | + AC_REPLACE_FUNCS(rmdir) | ||
1257 | + if test $ac_cv_func_rmdir = no; then | ||
1258 | + gl_PREREQ_RMDIR | ||
1259 | + fi | ||
1260 | +]) | ||
1261 | + | ||
1262 | +# Prerequisites of lib/rmdir.c. | ||
1263 | +AC_DEFUN([gl_PREREQ_RMDIR], [ | ||
1264 | + AC_REQUIRE([AC_HEADER_STAT]) | ||
1265 | + : | ||
1266 | +]) | ||
1267 | + | ||
1268 | + | ||
1269 | +# getopt.m4 serial 1 | ||
1270 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1271 | +dnl This file is free software, distributed under the terms of the GNU | ||
1272 | +dnl General Public License. As a special exception to the GNU General | ||
1273 | +dnl Public License, this file may be distributed as part of a program | ||
1274 | +dnl that contains a configuration script generated by Autoconf, under | ||
1275 | +dnl the same distribution terms as the rest of that program. | ||
1276 | + | ||
1277 | +AC_DEFUN([gl_GETOPT], | ||
1278 | +[ | ||
1279 | + dnl Prerequisites of lib/getopt.c. | ||
1280 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1281 | +]) | ||
1282 | + | ||
1283 | +# xalloc.m4 serial 1 | ||
1284 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1285 | dnl This file is free software, distributed under the terms of the GNU | ||
1286 | dnl General Public License. As a special exception to the GNU General | ||
1287 | @@ -167,11 +1286,25 @@ | ||
1288 | dnl that contains a configuration script generated by Autoconf, under | ||
1289 | dnl the same distribution terms as the rest of that program. | ||
1290 | |||
1291 | -AC_DEFUN([gl_GETOPT], | ||
1292 | +AC_DEFUN([gl_XALLOC], | ||
1293 | [ | ||
1294 | - dnl Prerequisites of lib/getopt.c. | ||
1295 | + gl_PREREQ_XMALLOC | ||
1296 | + gl_PREREQ_XSTRDUP | ||
1297 | +]) | ||
1298 | + | ||
1299 | +# Prerequisites of lib/xmalloc.c. | ||
1300 | +AC_DEFUN([gl_PREREQ_XMALLOC], [ | ||
1301 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1302 | + AC_REQUIRE([jm_FUNC_MALLOC]) | ||
1303 | + AC_REQUIRE([jm_FUNC_REALLOC]) | ||
1304 | +]) | ||
1305 | + | ||
1306 | +# Prerequisites of lib/xstrdup.c. | ||
1307 | +AC_DEFUN([gl_PREREQ_XSTRDUP], [ | ||
1308 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1309 | AC_CHECK_HEADERS_ONCE(string.h) | ||
1310 | ]) | ||
1311 | + | ||
1312 | # malloc.m4 serial 7 | ||
1313 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1314 | dnl This file is free software, distributed under the terms of the GNU | ||
1315 | @@ -197,66 +1330,8 @@ | ||
1316 | AC_DEFUN([gl_PREREQ_MALLOC], [ | ||
1317 | : | ||
1318 | ]) | ||
1319 | -# mbrtowc.m4 serial 5 | ||
1320 | -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. | ||
1321 | -dnl This file is free software, distributed under the terms of the GNU | ||
1322 | -dnl General Public License. As a special exception to the GNU General | ||
1323 | -dnl Public License, this file may be distributed as part of a program | ||
1324 | -dnl that contains a configuration script generated by Autoconf, under | ||
1325 | -dnl the same distribution terms as the rest of that program. | ||
1326 | - | ||
1327 | -dnl From Paul Eggert | ||
1328 | - | ||
1329 | -dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with | ||
1330 | -dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere. | ||
1331 | - | ||
1332 | -AC_DEFUN([jm_FUNC_MBRTOWC], | ||
1333 | -[ | ||
1334 | - AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], | ||
1335 | - jm_cv_func_mbrtowc, | ||
1336 | - [AC_TRY_LINK( | ||
1337 | - [#include <wchar.h>], | ||
1338 | - [mbstate_t state; return ! (sizeof state && mbrtowc);], | ||
1339 | - jm_cv_func_mbrtowc=yes, | ||
1340 | - jm_cv_func_mbrtowc=no)]) | ||
1341 | - if test $jm_cv_func_mbrtowc = yes; then | ||
1342 | - AC_DEFINE(HAVE_MBRTOWC, 1, | ||
1343 | - [Define to 1 if mbrtowc and mbstate_t are properly declared.]) | ||
1344 | - fi | ||
1345 | -]) | ||
1346 | -# mbstate_t.m4 serial 9 | ||
1347 | -dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. | ||
1348 | -dnl This file is free software, distributed under the terms of the GNU | ||
1349 | -dnl General Public License. As a special exception to the GNU General | ||
1350 | -dnl Public License, this file may be distributed as part of a program | ||
1351 | -dnl that contains a configuration script generated by Autoconf, under | ||
1352 | -dnl the same distribution terms as the rest of that program. | ||
1353 | - | ||
1354 | -# From Paul Eggert. | ||
1355 | - | ||
1356 | -# BeOS 5 has <wchar.h> but does not define mbstate_t, | ||
1357 | -# so you can't declare an object of that type. | ||
1358 | -# Check for this incompatibility with Standard C. | ||
1359 | |||
1360 | -# AC_TYPE_MBSTATE_T | ||
1361 | -# ----------------- | ||
1362 | -AC_DEFUN([AC_TYPE_MBSTATE_T], | ||
1363 | - [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, | ||
1364 | - [AC_COMPILE_IFELSE( | ||
1365 | - [AC_LANG_PROGRAM( | ||
1366 | - [AC_INCLUDES_DEFAULT | ||
1367 | -# include <wchar.h>], | ||
1368 | - [mbstate_t x; return sizeof x;])], | ||
1369 | - [ac_cv_type_mbstate_t=yes], | ||
1370 | - [ac_cv_type_mbstate_t=no])]) | ||
1371 | - if test $ac_cv_type_mbstate_t = yes; then | ||
1372 | - AC_DEFINE([HAVE_MBSTATE_T], 1, | ||
1373 | - [Define to 1 if <wchar.h> declares mbstate_t.]) | ||
1374 | - else | ||
1375 | - AC_DEFINE([mbstate_t], int, | ||
1376 | - [Define to a type if <wchar.h> does not define.]) | ||
1377 | - fi]) | ||
1378 | -# memchr.m4 serial 1 | ||
1379 | +# realloc.m4 serial 7 | ||
1380 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1381 | dnl This file is free software, distributed under the terms of the GNU | ||
1382 | dnl General Public License. As a special exception to the GNU General | ||
1383 | @@ -264,116 +1339,24 @@ | ||
1384 | dnl that contains a configuration script generated by Autoconf, under | ||
1385 | dnl the same distribution terms as the rest of that program. | ||
1386 | |||
1387 | -AC_DEFUN([gl_FUNC_MEMCHR], | ||
1388 | +dnl From Jim Meyering. | ||
1389 | +dnl Determine whether realloc works when both arguments are 0. | ||
1390 | +dnl If it doesn't, arrange to use the replacement function. | ||
1391 | + | ||
1392 | +AC_DEFUN([jm_FUNC_REALLOC], | ||
1393 | [ | ||
1394 | - AC_REPLACE_FUNCS(memchr) | ||
1395 | - if test $ac_cv_func_memchr = no; then | ||
1396 | - jm_PREREQ_MEMCHR | ||
1397 | + AC_REQUIRE([AC_FUNC_REALLOC]) | ||
1398 | + dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works. | ||
1399 | + if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then | ||
1400 | + gl_PREREQ_REALLOC | ||
1401 | fi | ||
1402 | ]) | ||
1403 | |||
1404 | -# Prerequisites of lib/memchr.c. | ||
1405 | -AC_DEFUN([jm_PREREQ_MEMCHR], [ | ||
1406 | - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h) | ||
1407 | - AC_CHECK_HEADERS(bp-sym.h) | ||
1408 | -]) | ||
1409 | -#serial 1 | ||
1410 | - | ||
1411 | -dnl From Mumit Khan and Paul Eggert | ||
1412 | -dnl Determine whether mkdir accepts only one argument instead of the usual two. | ||
1413 | - | ||
1414 | -AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG], | ||
1415 | - [AC_CHECK_FUNCS(mkdir) | ||
1416 | - AC_CACHE_CHECK([whether mkdir takes only one argument], | ||
1417 | - patch_cv_mkdir_takes_one_arg, | ||
1418 | - [patch_cv_mkdir_takes_one_arg=no | ||
1419 | - if test $ac_cv_func_mkdir = yes; then | ||
1420 | - AC_TRY_COMPILE([ | ||
1421 | -#include <sys/types.h> | ||
1422 | -#include <sys/stat.h> | ||
1423 | - ], | ||
1424 | - [mkdir (".", 0);], | ||
1425 | - , | ||
1426 | - [AC_TRY_COMPILE([ | ||
1427 | -#include <sys/types.h> | ||
1428 | -#include <sys/stat.h> | ||
1429 | - ], | ||
1430 | - [mkdir (".");], | ||
1431 | - patch_cv_mkdir_takes_one_arg=yes | ||
1432 | - )] | ||
1433 | - ) | ||
1434 | - fi | ||
1435 | - ] | ||
1436 | - ) | ||
1437 | - if test $patch_cv_mkdir_takes_one_arg = yes; then | ||
1438 | - AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, | ||
1439 | - [Define if mkdir takes only one argument.]) | ||
1440 | - fi | ||
1441 | - ] | ||
1442 | -) | ||
1443 | -# onceonly.m4 serial 3 | ||
1444 | -dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. | ||
1445 | -dnl This file is free software, distributed under the terms of the GNU | ||
1446 | -dnl General Public License. As a special exception to the GNU General | ||
1447 | -dnl Public License, this file may be distributed as part of a program | ||
1448 | -dnl that contains a configuration script generated by Autoconf, under | ||
1449 | -dnl the same distribution terms as the rest of that program. | ||
1450 | - | ||
1451 | -dnl This file defines some "once only" variants of standard autoconf macros. | ||
1452 | -dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS | ||
1453 | -dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS | ||
1454 | -dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS | ||
1455 | -dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC | ||
1456 | -dnl The advantage is that the check for each of the headers/functions/decls | ||
1457 | -dnl will be put only once into the 'configure' file. It keeps the size of | ||
1458 | -dnl the 'configure' file down, and avoids redundant output when 'configure' | ||
1459 | -dnl is run. | ||
1460 | -dnl The drawback is that the checks cannot be conditionalized. If you write | ||
1461 | -dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi | ||
1462 | -dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to | ||
1463 | -dnl empty, and the check will be inserted before the body of the AC_DEFUNed | ||
1464 | -dnl function. | ||
1465 | - | ||
1466 | -dnl Autoconf version 2.57 or newer is recommended. | ||
1467 | -AC_PREREQ(2.54) | ||
1468 | - | ||
1469 | -# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of | ||
1470 | -# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). | ||
1471 | -AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ | ||
1472 | - : | ||
1473 | - AC_FOREACH([gl_HEADER_NAME], [$1], [ | ||
1474 | - AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]), | ||
1475 | - [-./], [___])), [ | ||
1476 | - AC_CHECK_HEADERS(gl_HEADER_NAME) | ||
1477 | - ]) | ||
1478 | - AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, | ||
1479 | - [-./], [___]))) | ||
1480 | - ]) | ||
1481 | -]) | ||
1482 | - | ||
1483 | -# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of | ||
1484 | -# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). | ||
1485 | -AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ | ||
1486 | +# Prerequisites of lib/realloc.c. | ||
1487 | +AC_DEFUN([gl_PREREQ_REALLOC], [ | ||
1488 | : | ||
1489 | - AC_FOREACH([gl_FUNC_NAME], [$1], [ | ||
1490 | - AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [ | ||
1491 | - AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME])) | ||
1492 | - ]) | ||
1493 | - AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME])) | ||
1494 | - ]) | ||
1495 | ]) | ||
1496 | |||
1497 | -# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of | ||
1498 | -# AC_CHECK_DECLS(DECL1, DECL2, ...). | ||
1499 | -AC_DEFUN([AC_CHECK_DECLS_ONCE], [ | ||
1500 | - : | ||
1501 | - AC_FOREACH([gl_DECL_NAME], [$1], [ | ||
1502 | - AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [ | ||
1503 | - AC_CHECK_DECLS(m4_defn([gl_DECL_NAME])) | ||
1504 | - ]) | ||
1505 | - AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME])) | ||
1506 | - ]) | ||
1507 | -]) | ||
1508 | # quote.m4 serial 1 | ||
1509 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1510 | dnl This file is free software, distributed under the terms of the GNU | ||
1511 | @@ -387,6 +1370,7 @@ | ||
1512 | dnl Prerequisites of lib/quote.c. | ||
1513 | AC_CHECK_HEADERS_ONCE(stddef.h) | ||
1514 | ]) | ||
1515 | + | ||
1516 | # quotearg.m4 serial 1 | ||
1517 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1518 | dnl This file is free software, distributed under the terms of the GNU | ||
1519 | @@ -403,32 +1387,69 @@ | ||
1520 | AC_TYPE_MBSTATE_T | ||
1521 | jm_FUNC_MBRTOWC | ||
1522 | ]) | ||
1523 | -# realloc.m4 serial 7 | ||
1524 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1525 | + | ||
1526 | +# mbstate_t.m4 serial 9 | ||
1527 | +dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. | ||
1528 | dnl This file is free software, distributed under the terms of the GNU | ||
1529 | dnl General Public License. As a special exception to the GNU General | ||
1530 | dnl Public License, this file may be distributed as part of a program | ||
1531 | dnl that contains a configuration script generated by Autoconf, under | ||
1532 | dnl the same distribution terms as the rest of that program. | ||
1533 | |||
1534 | -dnl From Jim Meyering. | ||
1535 | -dnl Determine whether realloc works when both arguments are 0. | ||
1536 | -dnl If it doesn't, arrange to use the replacement function. | ||
1537 | +# From Paul Eggert. | ||
1538 | |||
1539 | -AC_DEFUN([jm_FUNC_REALLOC], | ||
1540 | +# BeOS 5 has <wchar.h> but does not define mbstate_t, | ||
1541 | +# so you can't declare an object of that type. | ||
1542 | +# Check for this incompatibility with Standard C. | ||
1543 | + | ||
1544 | +# AC_TYPE_MBSTATE_T | ||
1545 | +# ----------------- | ||
1546 | +AC_DEFUN([AC_TYPE_MBSTATE_T], | ||
1547 | + [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, | ||
1548 | + [AC_COMPILE_IFELSE( | ||
1549 | + [AC_LANG_PROGRAM( | ||
1550 | + [AC_INCLUDES_DEFAULT | ||
1551 | +# include <wchar.h>], | ||
1552 | + [mbstate_t x; return sizeof x;])], | ||
1553 | + [ac_cv_type_mbstate_t=yes], | ||
1554 | + [ac_cv_type_mbstate_t=no])]) | ||
1555 | + if test $ac_cv_type_mbstate_t = yes; then | ||
1556 | + AC_DEFINE([HAVE_MBSTATE_T], 1, | ||
1557 | + [Define to 1 if <wchar.h> declares mbstate_t.]) | ||
1558 | + else | ||
1559 | + AC_DEFINE([mbstate_t], int, | ||
1560 | + [Define to a type if <wchar.h> does not define.]) | ||
1561 | + fi]) | ||
1562 | + | ||
1563 | +# mbrtowc.m4 serial 5 | ||
1564 | +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. | ||
1565 | +dnl This file is free software, distributed under the terms of the GNU | ||
1566 | +dnl General Public License. As a special exception to the GNU General | ||
1567 | +dnl Public License, this file may be distributed as part of a program | ||
1568 | +dnl that contains a configuration script generated by Autoconf, under | ||
1569 | +dnl the same distribution terms as the rest of that program. | ||
1570 | + | ||
1571 | +dnl From Paul Eggert | ||
1572 | + | ||
1573 | +dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with | ||
1574 | +dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere. | ||
1575 | + | ||
1576 | +AC_DEFUN([jm_FUNC_MBRTOWC], | ||
1577 | [ | ||
1578 | - AC_REQUIRE([AC_FUNC_REALLOC]) | ||
1579 | - dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works. | ||
1580 | - if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then | ||
1581 | - gl_PREREQ_REALLOC | ||
1582 | + AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], | ||
1583 | + jm_cv_func_mbrtowc, | ||
1584 | + [AC_TRY_LINK( | ||
1585 | + [#include <wchar.h>], | ||
1586 | + [mbstate_t state; return ! (sizeof state && mbrtowc);], | ||
1587 | + jm_cv_func_mbrtowc=yes, | ||
1588 | + jm_cv_func_mbrtowc=no)]) | ||
1589 | + if test $jm_cv_func_mbrtowc = yes; then | ||
1590 | + AC_DEFINE(HAVE_MBRTOWC, 1, | ||
1591 | + [Define to 1 if mbrtowc and mbstate_t are properly declared.]) | ||
1592 | fi | ||
1593 | ]) | ||
1594 | |||
1595 | -# Prerequisites of lib/realloc.c. | ||
1596 | -AC_DEFUN([gl_PREREQ_REALLOC], [ | ||
1597 | - : | ||
1598 | -]) | ||
1599 | -# rmdir.m4 serial 1 | ||
1600 | +# hash.m4 serial 1 | ||
1601 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1602 | dnl This file is free software, distributed under the terms of the GNU | ||
1603 | dnl General Public License. As a special exception to the GNU General | ||
1604 | @@ -436,18 +1457,71 @@ | ||
1605 | dnl that contains a configuration script generated by Autoconf, under | ||
1606 | dnl the same distribution terms as the rest of that program. | ||
1607 | |||
1608 | -AC_DEFUN([gl_FUNC_RMDIR], | ||
1609 | +AC_DEFUN([gl_HASH], | ||
1610 | [ | ||
1611 | - AC_REPLACE_FUNCS(rmdir) | ||
1612 | - if test $ac_cv_func_rmdir = no; then | ||
1613 | - gl_PREREQ_RMDIR | ||
1614 | - fi | ||
1615 | + dnl Prerequisites of lib/hash.c. | ||
1616 | + AC_CHECK_HEADERS_ONCE(stdlib.h) | ||
1617 | + AC_HEADER_STDBOOL | ||
1618 | + AC_CHECK_DECLS_ONCE(free malloc) | ||
1619 | ]) | ||
1620 | |||
1621 | -# Prerequisites of lib/rmdir.c. | ||
1622 | -AC_DEFUN([gl_PREREQ_RMDIR], [ | ||
1623 | - AC_REQUIRE([AC_HEADER_STAT]) | ||
1624 | - : | ||
1625 | +AC_DEFUN([ag_CHECK_NANOSECOND_STAT], | ||
1626 | + [AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
1627 | + [ac_cv_stat_nsec], | ||
1628 | + [AC_TRY_COMPILE( | ||
1629 | + [ | ||
1630 | + #include <sys/types.h> | ||
1631 | + #include <sys/stat.h> | ||
1632 | + #include <unistd.h> | ||
1633 | + struct stat st; | ||
1634 | + ], | ||
1635 | + [ return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; ], | ||
1636 | + [ac_cv_stat_nsec=yes], | ||
1637 | + [ac_cv_stat_nsec=no]) | ||
1638 | + ]) | ||
1639 | + if test $ac_cv_stat_nsec = yes; then | ||
1640 | + AC_DEFINE(HAVE_STAT_NSEC, 1, [Define to 1 if struct stat has nanosecond timestamps.]) | ||
1641 | + fi | ||
1642 | + | ||
1643 | + AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
1644 | + [ac_cv_stat_timeval], | ||
1645 | + [AC_TRY_COMPILE( | ||
1646 | + [ | ||
1647 | + #include <time.h> | ||
1648 | + #include <sys/types.h> | ||
1649 | + #include <sys/stat.h> | ||
1650 | + #include <unistd.h> | ||
1651 | + struct stat st; | ||
1652 | + ], | ||
1653 | + [ return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; ], | ||
1654 | + [ac_cv_stat_timeval=yes], | ||
1655 | + [ac_cv_stat_timeval=no]) | ||
1656 | + ]) | ||
1657 | + if test $ac_cv_stat_timeval = yes; then | ||
1658 | + AC_DEFINE(HAVE_STAT_TIMEVAL, 1, [Define to 1 if struct stat comtains struct timeval's.]) | ||
1659 | + fi]) | ||
1660 | + | ||
1661 | +#serial 7 -*- autoconf -*- | ||
1662 | + | ||
1663 | +dnl From Jim Meyering. | ||
1664 | +dnl | ||
1665 | +dnl See if the glibc *_unlocked I/O macros or functions are available. | ||
1666 | +dnl Use only those *_unlocked macros or functions that are declared | ||
1667 | +dnl (because some of them were declared in Solaris 2.5.1 but were removed | ||
1668 | +dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run | ||
1669 | +dnl on Solaris 2.6). | ||
1670 | + | ||
1671 | +AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], | ||
1672 | +[ | ||
1673 | + dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked() | ||
1674 | + dnl etc. | ||
1675 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
1676 | + | ||
1677 | + AC_CHECK_DECLS_ONCE( | ||
1678 | + [clearerr_unlocked feof_unlocked ferror_unlocked | ||
1679 | + fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked | ||
1680 | + fread_unlocked fwrite_unlocked getc_unlocked | ||
1681 | + getchar_unlocked putc_unlocked putchar_unlocked]) | ||
1682 | ]) | ||
1683 | |||
1684 | # Check for setmode, DOS style. | ||
1685 | @@ -488,180 +1562,39 @@ | ||
1686 | AC_DEFINE(HAVE_SETMODE_DOS, 1, | ||
1687 | [Define to 1 if you have the DOS-style `setmode' function.]) | ||
1688 | fi]) | ||
1689 | -# Check for stdbool.h that conforms to C99. | ||
1690 | - | ||
1691 | -# Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
1692 | - | ||
1693 | -# This program is free software; you can redistribute it and/or modify | ||
1694 | -# it under the terms of the GNU General Public License as published by | ||
1695 | -# the Free Software Foundation; either version 2, or (at your option) | ||
1696 | -# any later version. | ||
1697 | - | ||
1698 | -# This program is distributed in the hope that it will be useful, | ||
1699 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1700 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1701 | -# GNU General Public License for more details. | ||
1702 | - | ||
1703 | -# You should have received a copy of the GNU General Public License | ||
1704 | -# along with this program; if not, write to the Free Software | ||
1705 | -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
1706 | -# 02111-1307, USA. | ||
1707 | - | ||
1708 | -# Prepare for substituting <stdbool.h> if it is not supported. | ||
1709 | - | ||
1710 | -AC_DEFUN([AM_STDBOOL_H], | ||
1711 | -[ | ||
1712 | - AC_REQUIRE([AC_HEADER_STDBOOL]) | ||
1713 | - | ||
1714 | - # Define two additional variables used in the Makefile substitution. | ||
1715 | - | ||
1716 | - if test "$ac_cv_header_stdbool_h" = yes; then | ||
1717 | - STDBOOL_H='' | ||
1718 | - else | ||
1719 | - STDBOOL_H='stdbool.h' | ||
1720 | - fi | ||
1721 | - AC_SUBST([STDBOOL_H]) | ||
1722 | - | ||
1723 | - if test "$ac_cv_type__Bool" = yes; then | ||
1724 | - HAVE__BOOL=1 | ||
1725 | - else | ||
1726 | - HAVE__BOOL=0 | ||
1727 | - fi | ||
1728 | - AC_SUBST([HAVE__BOOL]) | ||
1729 | -]) | ||
1730 | - | ||
1731 | -# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf | ||
1732 | -# have this macro built-in. | ||
1733 | - | ||
1734 | -AC_DEFUN([AC_HEADER_STDBOOL], | ||
1735 | - [AC_CACHE_CHECK([for stdbool.h that conforms to C99], | ||
1736 | - [ac_cv_header_stdbool_h], | ||
1737 | - [AC_TRY_COMPILE( | ||
1738 | - [ | ||
1739 | - #include <stdbool.h> | ||
1740 | - #ifndef bool | ||
1741 | - "error: bool is not defined" | ||
1742 | - #endif | ||
1743 | - #ifndef false | ||
1744 | - "error: false is not defined" | ||
1745 | - #endif | ||
1746 | - #if false | ||
1747 | - "error: false is not 0" | ||
1748 | - #endif | ||
1749 | - #ifndef true | ||
1750 | - "error: false is not defined" | ||
1751 | - #endif | ||
1752 | - #if true != 1 | ||
1753 | - "error: true is not 1" | ||
1754 | - #endif | ||
1755 | - #ifndef __bool_true_false_are_defined | ||
1756 | - "error: __bool_true_false_are_defined is not defined" | ||
1757 | - #endif | ||
1758 | - | ||
1759 | - struct s { _Bool s: 1; _Bool t; } s; | ||
1760 | - | ||
1761 | - char a[true == 1 ? 1 : -1]; | ||
1762 | - char b[false == 0 ? 1 : -1]; | ||
1763 | - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
1764 | - char d[(bool) -0.5 == true ? 1 : -1]; | ||
1765 | - bool e = &s; | ||
1766 | - char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
1767 | - char g[true]; | ||
1768 | - char h[sizeof (_Bool)]; | ||
1769 | - char i[sizeof s.t]; | ||
1770 | - ], | ||
1771 | - [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ], | ||
1772 | - [ac_cv_header_stdbool_h=yes], | ||
1773 | - [ac_cv_header_stdbool_h=no])]) | ||
1774 | - AC_CHECK_TYPES([_Bool]) | ||
1775 | - if test $ac_cv_header_stdbool_h = yes; then | ||
1776 | - AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) | ||
1777 | - fi]) | ||
1778 | -#serial 7 -*- autoconf -*- | ||
1779 | - | ||
1780 | -dnl From Jim Meyering. | ||
1781 | -dnl | ||
1782 | -dnl See if the glibc *_unlocked I/O macros or functions are available. | ||
1783 | -dnl Use only those *_unlocked macros or functions that are declared | ||
1784 | -dnl (because some of them were declared in Solaris 2.5.1 but were removed | ||
1785 | -dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run | ||
1786 | -dnl on Solaris 2.6). | ||
1787 | - | ||
1788 | -AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], | ||
1789 | -[ | ||
1790 | - dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked() | ||
1791 | - dnl etc. | ||
1792 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
1793 | - | ||
1794 | - AC_CHECK_DECLS_ONCE( | ||
1795 | - [clearerr_unlocked feof_unlocked ferror_unlocked | ||
1796 | - fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked | ||
1797 | - fread_unlocked fwrite_unlocked getc_unlocked | ||
1798 | - getchar_unlocked putc_unlocked putchar_unlocked]) | ||
1799 | -]) | ||
1800 | -#serial 5 | ||
1801 | - | ||
1802 | -dnl From Jim Meyering | ||
1803 | - | ||
1804 | -dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- | ||
1805 | -dnl usually in <utime.h>. | ||
1806 | -dnl Some systems have utime.h but don't declare the struct anywhere. | ||
1807 | - | ||
1808 | -AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF], | ||
1809 | -[ | ||
1810 | - AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) | ||
1811 | - AC_REQUIRE([AC_HEADER_TIME]) | ||
1812 | - AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, | ||
1813 | - [AC_TRY_COMPILE( | ||
1814 | - [ | ||
1815 | -#ifdef TIME_WITH_SYS_TIME | ||
1816 | -# include <sys/time.h> | ||
1817 | -# include <time.h> | ||
1818 | -#else | ||
1819 | -# ifdef HAVE_SYS_TIME_H | ||
1820 | -# include <sys/time.h> | ||
1821 | -# else | ||
1822 | -# include <time.h> | ||
1823 | -# endif | ||
1824 | -#endif | ||
1825 | -#ifdef HAVE_UTIME_H | ||
1826 | -# include <utime.h> | ||
1827 | -#endif | ||
1828 | - ], | ||
1829 | - [static struct utimbuf x; x.actime = x.modtime;], | ||
1830 | - fu_cv_sys_struct_utimbuf=yes, | ||
1831 | - fu_cv_sys_struct_utimbuf=no) | ||
1832 | - ]) | ||
1833 | |||
1834 | - if test $fu_cv_sys_struct_utimbuf = yes; then | ||
1835 | - AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, | ||
1836 | - [Define if struct utimbuf is declared -- usually in <utime.h>. | ||
1837 | - Some systems have utime.h but don't declare the struct anywhere. ]) | ||
1838 | - fi | ||
1839 | -]) | ||
1840 | -# xalloc.m4 serial 1 | ||
1841 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1842 | -dnl This file is free software, distributed under the terms of the GNU | ||
1843 | -dnl General Public License. As a special exception to the GNU General | ||
1844 | -dnl Public License, this file may be distributed as part of a program | ||
1845 | -dnl that contains a configuration script generated by Autoconf, under | ||
1846 | -dnl the same distribution terms as the rest of that program. | ||
1847 | +#serial 1 | ||
1848 | |||
1849 | -AC_DEFUN([gl_XALLOC], | ||
1850 | -[ | ||
1851 | - gl_PREREQ_XMALLOC | ||
1852 | - gl_PREREQ_XSTRDUP | ||
1853 | -]) | ||
1854 | +dnl From Mumit Khan and Paul Eggert | ||
1855 | +dnl Determine whether mkdir accepts only one argument instead of the usual two. | ||
1856 | |||
1857 | -# Prerequisites of lib/xmalloc.c. | ||
1858 | -AC_DEFUN([gl_PREREQ_XMALLOC], [ | ||
1859 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1860 | - AC_REQUIRE([jm_FUNC_MALLOC]) | ||
1861 | - AC_REQUIRE([jm_FUNC_REALLOC]) | ||
1862 | -]) | ||
1863 | +AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG], | ||
1864 | + [AC_CHECK_FUNCS(mkdir) | ||
1865 | + AC_CACHE_CHECK([whether mkdir takes only one argument], | ||
1866 | + patch_cv_mkdir_takes_one_arg, | ||
1867 | + [patch_cv_mkdir_takes_one_arg=no | ||
1868 | + if test $ac_cv_func_mkdir = yes; then | ||
1869 | + AC_TRY_COMPILE([ | ||
1870 | +#include <sys/types.h> | ||
1871 | +#include <sys/stat.h> | ||
1872 | + ], | ||
1873 | + [mkdir (".", 0);], | ||
1874 | + , | ||
1875 | + [AC_TRY_COMPILE([ | ||
1876 | +#include <sys/types.h> | ||
1877 | +#include <sys/stat.h> | ||
1878 | + ], | ||
1879 | + [mkdir (".");], | ||
1880 | + patch_cv_mkdir_takes_one_arg=yes | ||
1881 | + )] | ||
1882 | + ) | ||
1883 | + fi | ||
1884 | + ] | ||
1885 | + ) | ||
1886 | + if test $patch_cv_mkdir_takes_one_arg = yes; then | ||
1887 | + AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, | ||
1888 | + [Define if mkdir takes only one argument.]) | ||
1889 | + fi | ||
1890 | + ] | ||
1891 | +) | ||
1892 | |||
1893 | -# Prerequisites of lib/xstrdup.c. | ||
1894 | -AC_DEFUN([gl_PREREQ_XSTRDUP], [ | ||
1895 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1896 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1897 | -]) | ||
1898 | --- patch-2.5.9.orig/configure | ||
1899 | +++ patch-2.5.9/configure | ||
1900 | @@ -1,11 +1,10 @@ | ||
1901 | #! /bin/sh | ||
1902 | # Guess values for system-dependent variables and create Makefiles. | ||
1903 | -# Generated by GNU Autoconf 2.57 for patch 2.5.9. | ||
1904 | +# Generated by GNU Autoconf 2.59 for patch 2.5.9. | ||
1905 | # | ||
1906 | # Report bugs to <bug-patch@gnu.org>. | ||
1907 | # | ||
1908 | -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
1909 | -# Free Software Foundation, Inc. | ||
1910 | +# Copyright (C) 2003 Free Software Foundation, Inc. | ||
1911 | # This configure script is free software; the Free Software Foundation | ||
1912 | # gives unlimited permission to copy, distribute and modify it. | ||
1913 | ## --------------------- ## | ||
1914 | @@ -22,9 +21,10 @@ | ||
1915 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
1916 | set -o posix | ||
1917 | fi | ||
1918 | +DUALCASE=1; export DUALCASE # for MKS sh | ||
1919 | |||
1920 | # Support unset when possible. | ||
1921 | -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
1922 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
1923 | as_unset=unset | ||
1924 | else | ||
1925 | as_unset=false | ||
1926 | @@ -43,7 +43,7 @@ | ||
1927 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
1928 | LC_TELEPHONE LC_TIME | ||
1929 | do | ||
1930 | - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
1931 | + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
1932 | eval $as_var=C; export $as_var | ||
1933 | else | ||
1934 | $as_unset $as_var | ||
1935 | @@ -220,16 +220,17 @@ | ||
1936 | if mkdir -p . 2>/dev/null; then | ||
1937 | as_mkdir_p=: | ||
1938 | else | ||
1939 | + test -d ./-p && rmdir ./-p | ||
1940 | as_mkdir_p=false | ||
1941 | fi | ||
1942 | |||
1943 | as_executable_p="test -f" | ||
1944 | |||
1945 | # Sed expression to map a string onto a valid CPP name. | ||
1946 | -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
1947 | +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
1948 | |||
1949 | # Sed expression to map a string onto a valid variable name. | ||
1950 | -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | ||
1951 | +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
1952 | |||
1953 | |||
1954 | # IFS | ||
1955 | @@ -669,7 +670,7 @@ | ||
1956 | |||
1957 | # Be sure to have absolute paths. | ||
1958 | for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | ||
1959 | - localstatedir libdir includedir oldincludedir infodir mandir | ||
1960 | + localstatedir libdir includedir oldincludedir infodir mandir | ||
1961 | do | ||
1962 | eval ac_val=$`echo $ac_var` | ||
1963 | case $ac_val in | ||
1964 | @@ -709,10 +710,10 @@ | ||
1965 | # Try the directory containing this script, then its parent. | ||
1966 | ac_confdir=`(dirname "$0") 2>/dev/null || | ||
1967 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
1968 | - X"$0" : 'X\(//\)[^/]' \| \ | ||
1969 | - X"$0" : 'X\(//\)$' \| \ | ||
1970 | - X"$0" : 'X\(/\)' \| \ | ||
1971 | - . : '\(.\)' 2>/dev/null || | ||
1972 | + X"$0" : 'X\(//\)[^/]' \| \ | ||
1973 | + X"$0" : 'X\(//\)$' \| \ | ||
1974 | + X"$0" : 'X\(/\)' \| \ | ||
1975 | + . : '\(.\)' 2>/dev/null || | ||
1976 | echo X"$0" | | ||
1977 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
1978 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
1979 | @@ -804,9 +805,9 @@ | ||
1980 | cat <<_ACEOF | ||
1981 | Installation directories: | ||
1982 | --prefix=PREFIX install architecture-independent files in PREFIX | ||
1983 | - [$ac_default_prefix] | ||
1984 | + [$ac_default_prefix] | ||
1985 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | ||
1986 | - [PREFIX] | ||
1987 | + [PREFIX] | ||
1988 | |||
1989 | By default, \`make install' will install all the files in | ||
1990 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | ||
1991 | @@ -896,12 +897,45 @@ | ||
1992 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
1993 | ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
1994 | esac | ||
1995 | -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be | ||
1996 | -# absolute. | ||
1997 | -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` | ||
1998 | -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` | ||
1999 | -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` | ||
2000 | -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` | ||
2001 | + | ||
2002 | +# Do not use `cd foo && pwd` to compute absolute paths, because | ||
2003 | +# the directories may not exist. | ||
2004 | +case `pwd` in | ||
2005 | +.) ac_abs_builddir="$ac_dir";; | ||
2006 | +*) | ||
2007 | + case "$ac_dir" in | ||
2008 | + .) ac_abs_builddir=`pwd`;; | ||
2009 | + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
2010 | + *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
2011 | + esac;; | ||
2012 | +esac | ||
2013 | +case $ac_abs_builddir in | ||
2014 | +.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
2015 | +*) | ||
2016 | + case ${ac_top_builddir}. in | ||
2017 | + .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
2018 | + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
2019 | + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
2020 | + esac;; | ||
2021 | +esac | ||
2022 | +case $ac_abs_builddir in | ||
2023 | +.) ac_abs_srcdir=$ac_srcdir;; | ||
2024 | +*) | ||
2025 | + case $ac_srcdir in | ||
2026 | + .) ac_abs_srcdir=$ac_abs_builddir;; | ||
2027 | + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
2028 | + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
2029 | + esac;; | ||
2030 | +esac | ||
2031 | +case $ac_abs_builddir in | ||
2032 | +.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
2033 | +*) | ||
2034 | + case $ac_top_srcdir in | ||
2035 | + .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
2036 | + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
2037 | + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
2038 | + esac;; | ||
2039 | +esac | ||
2040 | |||
2041 | cd $ac_dir | ||
2042 | # Check for guested configure; otherwise get Cygnus style configure. | ||
2043 | @@ -912,13 +946,13 @@ | ||
2044 | echo | ||
2045 | $SHELL $ac_srcdir/configure --help=recursive | ||
2046 | elif test -f $ac_srcdir/configure.ac || | ||
2047 | - test -f $ac_srcdir/configure.in; then | ||
2048 | + test -f $ac_srcdir/configure.in; then | ||
2049 | echo | ||
2050 | $ac_configure --help | ||
2051 | else | ||
2052 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | ||
2053 | fi | ||
2054 | - cd $ac_popdir | ||
2055 | + cd "$ac_popdir" | ||
2056 | done | ||
2057 | fi | ||
2058 | |||
2059 | @@ -926,10 +960,9 @@ | ||
2060 | if $ac_init_version; then | ||
2061 | cat <<\_ACEOF | ||
2062 | patch configure 2.5.9 | ||
2063 | -generated by GNU Autoconf 2.57 | ||
2064 | +generated by GNU Autoconf 2.59 | ||
2065 | |||
2066 | -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
2067 | -Free Software Foundation, Inc. | ||
2068 | +Copyright (C) 2003 Free Software Foundation, Inc. | ||
2069 | This configure script is free software; the Free Software Foundation | ||
2070 | gives unlimited permission to copy, distribute and modify it. | ||
2071 | _ACEOF | ||
2072 | @@ -941,7 +974,7 @@ | ||
2073 | running configure, to aid debugging if configure makes a mistake. | ||
2074 | |||
2075 | It was created by patch $as_me 2.5.9, which was | ||
2076 | -generated by GNU Autoconf 2.57. Invocation command line was | ||
2077 | +generated by GNU Autoconf 2.59. Invocation command line was | ||
2078 | |||
2079 | $ $0 $@ | ||
2080 | |||
2081 | @@ -1018,19 +1051,19 @@ | ||
2082 | 2) | ||
2083 | ac_configure_args1="$ac_configure_args1 '$ac_arg'" | ||
2084 | if test $ac_must_keep_next = true; then | ||
2085 | - ac_must_keep_next=false # Got value, back to normal. | ||
2086 | + ac_must_keep_next=false # Got value, back to normal. | ||
2087 | else | ||
2088 | - case $ac_arg in | ||
2089 | - *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
2090 | - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
2091 | - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
2092 | - | -with-* | --with-* | -without-* | --without-* | --x) | ||
2093 | - case "$ac_configure_args0 " in | ||
2094 | - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
2095 | - esac | ||
2096 | - ;; | ||
2097 | - -* ) ac_must_keep_next=true ;; | ||
2098 | - esac | ||
2099 | + case $ac_arg in | ||
2100 | + *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
2101 | + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
2102 | + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
2103 | + | -with-* | --with-* | -without-* | --without-* | --x) | ||
2104 | + case "$ac_configure_args0 " in | ||
2105 | + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
2106 | + esac | ||
2107 | + ;; | ||
2108 | + -* ) ac_must_keep_next=true ;; | ||
2109 | + esac | ||
2110 | fi | ||
2111 | ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | ||
2112 | # Get rid of the leading space. | ||
2113 | @@ -1064,12 +1097,12 @@ | ||
2114 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in | ||
2115 | *ac_space=\ *) | ||
2116 | sed -n \ | ||
2117 | - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
2118 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
2119 | + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
2120 | + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
2121 | ;; | ||
2122 | *) | ||
2123 | sed -n \ | ||
2124 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
2125 | + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
2126 | ;; | ||
2127 | esac; | ||
2128 | } | ||
2129 | @@ -1098,7 +1131,7 @@ | ||
2130 | for ac_var in $ac_subst_files | ||
2131 | do | ||
2132 | eval ac_val=$`echo $ac_var` | ||
2133 | - echo "$ac_var='"'"'$ac_val'"'"'" | ||
2134 | + echo "$ac_var='"'"'$ac_val'"'"'" | ||
2135 | done | sort | ||
2136 | echo | ||
2137 | fi | ||
2138 | @@ -1117,7 +1150,7 @@ | ||
2139 | echo "$as_me: caught signal $ac_signal" | ||
2140 | echo "$as_me: exit $exit_status" | ||
2141 | } >&5 | ||
2142 | - rm -f core core.* *.core && | ||
2143 | + rm -f core *.core && | ||
2144 | rm -rf conftest* confdefs* conf$$* $ac_clean_files && | ||
2145 | exit $exit_status | ||
2146 | ' 0 | ||
2147 | @@ -1197,7 +1230,7 @@ | ||
2148 | # value. | ||
2149 | ac_cache_corrupted=false | ||
2150 | for ac_var in `(set) 2>&1 | | ||
2151 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
2152 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
2153 | eval ac_old_set=\$ac_cv_env_${ac_var}_set | ||
2154 | eval ac_new_set=\$ac_env_${ac_var}_set | ||
2155 | eval ac_old_val="\$ac_cv_env_${ac_var}_value" | ||
2156 | @@ -1214,13 +1247,13 @@ | ||
2157 | ,);; | ||
2158 | *) | ||
2159 | if test "x$ac_old_val" != "x$ac_new_val"; then | ||
2160 | - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2161 | + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2162 | echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
2163 | - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
2164 | + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
2165 | echo "$as_me: former value: $ac_old_val" >&2;} | ||
2166 | - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
2167 | + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
2168 | echo "$as_me: current value: $ac_new_val" >&2;} | ||
2169 | - ac_cache_corrupted=: | ||
2170 | + ac_cache_corrupted=: | ||
2171 | fi;; | ||
2172 | esac | ||
2173 | # Pass precious variables to config.status. | ||
2174 | @@ -1629,7 +1662,6 @@ | ||
2175 | (exit $ac_status); } | ||
2176 | |||
2177 | cat >conftest.$ac_ext <<_ACEOF | ||
2178 | -#line $LINENO "configure" | ||
2179 | /* confdefs.h. */ | ||
2180 | _ACEOF | ||
2181 | cat confdefs.h >>conftest.$ac_ext | ||
2182 | @@ -1649,8 +1681,8 @@ | ||
2183 | # Try to create an executable without -o first, disregard a.out. | ||
2184 | # It will help us diagnose broken compilers, and finding out an intuition | ||
2185 | # of exeext. | ||
2186 | -echo "$as_me:$LINENO: checking for C compiler default output" >&5 | ||
2187 | -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 | ||
2188 | +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | ||
2189 | +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 | ||
2190 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
2191 | if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 | ||
2192 | (eval $ac_link_default) 2>&5 | ||
2193 | @@ -1670,23 +1702,23 @@ | ||
2194 | test -f "$ac_file" || continue | ||
2195 | case $ac_file in | ||
2196 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) | ||
2197 | - ;; | ||
2198 | + ;; | ||
2199 | conftest.$ac_ext ) | ||
2200 | - # This is the source file. | ||
2201 | - ;; | ||
2202 | + # This is the source file. | ||
2203 | + ;; | ||
2204 | [ab].out ) | ||
2205 | - # We found the default executable, but exeext='' is most | ||
2206 | - # certainly right. | ||
2207 | - break;; | ||
2208 | + # We found the default executable, but exeext='' is most | ||
2209 | + # certainly right. | ||
2210 | + break;; | ||
2211 | *.* ) | ||
2212 | - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2213 | - # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
2214 | - # but it would be cool to find out if it's true. Does anybody | ||
2215 | - # maintain Libtool? --akim. | ||
2216 | - export ac_cv_exeext | ||
2217 | - break;; | ||
2218 | + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2219 | + # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
2220 | + # but it would be cool to find out if it's true. Does anybody | ||
2221 | + # maintain Libtool? --akim. | ||
2222 | + export ac_cv_exeext | ||
2223 | + break;; | ||
2224 | * ) | ||
2225 | - break;; | ||
2226 | + break;; | ||
2227 | esac | ||
2228 | done | ||
2229 | else | ||
2230 | @@ -1760,8 +1792,8 @@ | ||
2231 | case $ac_file in | ||
2232 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; | ||
2233 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2234 | - export ac_cv_exeext | ||
2235 | - break;; | ||
2236 | + export ac_cv_exeext | ||
2237 | + break;; | ||
2238 | * ) break;; | ||
2239 | esac | ||
2240 | done | ||
2241 | @@ -1786,7 +1818,6 @@ | ||
2242 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2243 | else | ||
2244 | cat >conftest.$ac_ext <<_ACEOF | ||
2245 | -#line $LINENO "configure" | ||
2246 | /* confdefs.h. */ | ||
2247 | _ACEOF | ||
2248 | cat confdefs.h >>conftest.$ac_ext | ||
2249 | @@ -1837,7 +1868,6 @@ | ||
2250 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2251 | else | ||
2252 | cat >conftest.$ac_ext <<_ACEOF | ||
2253 | -#line $LINENO "configure" | ||
2254 | /* confdefs.h. */ | ||
2255 | _ACEOF | ||
2256 | cat confdefs.h >>conftest.$ac_ext | ||
2257 | @@ -1857,11 +1887,20 @@ | ||
2258 | _ACEOF | ||
2259 | rm -f conftest.$ac_objext | ||
2260 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2261 | - (eval $ac_compile) 2>&5 | ||
2262 | + (eval $ac_compile) 2>conftest.er1 | ||
2263 | ac_status=$? | ||
2264 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2265 | + rm -f conftest.er1 | ||
2266 | + cat conftest.err >&5 | ||
2267 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2268 | (exit $ac_status); } && | ||
2269 | - { ac_try='test -s conftest.$ac_objext' | ||
2270 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2271 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2272 | + (eval $ac_try) 2>&5 | ||
2273 | + ac_status=$? | ||
2274 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2275 | + (exit $ac_status); }; } && | ||
2276 | + { ac_try='test -s conftest.$ac_objext' | ||
2277 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2278 | (eval $ac_try) 2>&5 | ||
2279 | ac_status=$? | ||
2280 | @@ -1874,7 +1913,7 @@ | ||
2281 | |||
2282 | ac_compiler_gnu=no | ||
2283 | fi | ||
2284 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2285 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2286 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
2287 | |||
2288 | fi | ||
2289 | @@ -1890,7 +1929,6 @@ | ||
2290 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2291 | else | ||
2292 | cat >conftest.$ac_ext <<_ACEOF | ||
2293 | -#line $LINENO "configure" | ||
2294 | /* confdefs.h. */ | ||
2295 | _ACEOF | ||
2296 | cat confdefs.h >>conftest.$ac_ext | ||
2297 | @@ -1907,11 +1945,20 @@ | ||
2298 | _ACEOF | ||
2299 | rm -f conftest.$ac_objext | ||
2300 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2301 | - (eval $ac_compile) 2>&5 | ||
2302 | + (eval $ac_compile) 2>conftest.er1 | ||
2303 | ac_status=$? | ||
2304 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2305 | + rm -f conftest.er1 | ||
2306 | + cat conftest.err >&5 | ||
2307 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2308 | (exit $ac_status); } && | ||
2309 | - { ac_try='test -s conftest.$ac_objext' | ||
2310 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2311 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2312 | + (eval $ac_try) 2>&5 | ||
2313 | + ac_status=$? | ||
2314 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2315 | + (exit $ac_status); }; } && | ||
2316 | + { ac_try='test -s conftest.$ac_objext' | ||
2317 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2318 | (eval $ac_try) 2>&5 | ||
2319 | ac_status=$? | ||
2320 | @@ -1924,7 +1971,7 @@ | ||
2321 | |||
2322 | ac_cv_prog_cc_g=no | ||
2323 | fi | ||
2324 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2325 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2326 | fi | ||
2327 | echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
2328 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | ||
2329 | @@ -1951,7 +1998,6 @@ | ||
2330 | ac_cv_prog_cc_stdc=no | ||
2331 | ac_save_CC=$CC | ||
2332 | cat >conftest.$ac_ext <<_ACEOF | ||
2333 | -#line $LINENO "configure" | ||
2334 | /* confdefs.h. */ | ||
2335 | _ACEOF | ||
2336 | cat confdefs.h >>conftest.$ac_ext | ||
2337 | @@ -1979,6 +2025,16 @@ | ||
2338 | va_end (v); | ||
2339 | return s; | ||
2340 | } | ||
2341 | + | ||
2342 | +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | ||
2343 | + function prototypes and stuff, but not '\xHH' hex character constants. | ||
2344 | + These don't provoke an error unfortunately, instead are silently treated | ||
2345 | + as 'x'. The following induces an error, until -std1 is added to get | ||
2346 | + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | ||
2347 | + array size at least. It's necessary to write '\x00'==0 to get something | ||
2348 | + that's true only with -std1. */ | ||
2349 | +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | ||
2350 | + | ||
2351 | int test (int i, double x); | ||
2352 | struct s1 {int (*f) (int a);}; | ||
2353 | struct s2 {int (*f) (double a);}; | ||
2354 | @@ -2005,11 +2061,20 @@ | ||
2355 | CC="$ac_save_CC $ac_arg" | ||
2356 | rm -f conftest.$ac_objext | ||
2357 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2358 | - (eval $ac_compile) 2>&5 | ||
2359 | + (eval $ac_compile) 2>conftest.er1 | ||
2360 | ac_status=$? | ||
2361 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2362 | + rm -f conftest.er1 | ||
2363 | + cat conftest.err >&5 | ||
2364 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2365 | (exit $ac_status); } && | ||
2366 | - { ac_try='test -s conftest.$ac_objext' | ||
2367 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2368 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2369 | + (eval $ac_try) 2>&5 | ||
2370 | + ac_status=$? | ||
2371 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2372 | + (exit $ac_status); }; } && | ||
2373 | + { ac_try='test -s conftest.$ac_objext' | ||
2374 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2375 | (eval $ac_try) 2>&5 | ||
2376 | ac_status=$? | ||
2377 | @@ -2022,7 +2087,7 @@ | ||
2378 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2379 | |||
2380 | fi | ||
2381 | -rm -f conftest.$ac_objext | ||
2382 | +rm -f conftest.err conftest.$ac_objext | ||
2383 | done | ||
2384 | rm -f conftest.$ac_ext conftest.$ac_objext | ||
2385 | CC=$ac_save_CC | ||
2386 | @@ -2050,19 +2115,27 @@ | ||
2387 | _ACEOF | ||
2388 | rm -f conftest.$ac_objext | ||
2389 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2390 | - (eval $ac_compile) 2>&5 | ||
2391 | + (eval $ac_compile) 2>conftest.er1 | ||
2392 | ac_status=$? | ||
2393 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2394 | + rm -f conftest.er1 | ||
2395 | + cat conftest.err >&5 | ||
2396 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2397 | (exit $ac_status); } && | ||
2398 | - { ac_try='test -s conftest.$ac_objext' | ||
2399 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2400 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2401 | + (eval $ac_try) 2>&5 | ||
2402 | + ac_status=$? | ||
2403 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2404 | + (exit $ac_status); }; } && | ||
2405 | + { ac_try='test -s conftest.$ac_objext' | ||
2406 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2407 | (eval $ac_try) 2>&5 | ||
2408 | ac_status=$? | ||
2409 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2410 | (exit $ac_status); }; }; then | ||
2411 | for ac_declaration in \ | ||
2412 | - ''\ | ||
2413 | - '#include <stdlib.h>' \ | ||
2414 | + '' \ | ||
2415 | 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
2416 | 'extern "C" void std::exit (int); using std::exit;' \ | ||
2417 | 'extern "C" void exit (int) throw ();' \ | ||
2418 | @@ -2070,14 +2143,13 @@ | ||
2419 | 'void exit (int);' | ||
2420 | do | ||
2421 | cat >conftest.$ac_ext <<_ACEOF | ||
2422 | -#line $LINENO "configure" | ||
2423 | /* confdefs.h. */ | ||
2424 | _ACEOF | ||
2425 | cat confdefs.h >>conftest.$ac_ext | ||
2426 | cat >>conftest.$ac_ext <<_ACEOF | ||
2427 | /* end confdefs.h. */ | ||
2428 | -#include <stdlib.h> | ||
2429 | $ac_declaration | ||
2430 | +#include <stdlib.h> | ||
2431 | int | ||
2432 | main () | ||
2433 | { | ||
2434 | @@ -2088,11 +2160,20 @@ | ||
2435 | _ACEOF | ||
2436 | rm -f conftest.$ac_objext | ||
2437 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2438 | - (eval $ac_compile) 2>&5 | ||
2439 | + (eval $ac_compile) 2>conftest.er1 | ||
2440 | ac_status=$? | ||
2441 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2442 | + rm -f conftest.er1 | ||
2443 | + cat conftest.err >&5 | ||
2444 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2445 | (exit $ac_status); } && | ||
2446 | - { ac_try='test -s conftest.$ac_objext' | ||
2447 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2448 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2449 | + (eval $ac_try) 2>&5 | ||
2450 | + ac_status=$? | ||
2451 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2452 | + (exit $ac_status); }; } && | ||
2453 | + { ac_try='test -s conftest.$ac_objext' | ||
2454 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2455 | (eval $ac_try) 2>&5 | ||
2456 | ac_status=$? | ||
2457 | @@ -2105,9 +2186,8 @@ | ||
2458 | |||
2459 | continue | ||
2460 | fi | ||
2461 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2462 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2463 | cat >conftest.$ac_ext <<_ACEOF | ||
2464 | -#line $LINENO "configure" | ||
2465 | /* confdefs.h. */ | ||
2466 | _ACEOF | ||
2467 | cat confdefs.h >>conftest.$ac_ext | ||
2468 | @@ -2124,11 +2204,20 @@ | ||
2469 | _ACEOF | ||
2470 | rm -f conftest.$ac_objext | ||
2471 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2472 | - (eval $ac_compile) 2>&5 | ||
2473 | + (eval $ac_compile) 2>conftest.er1 | ||
2474 | ac_status=$? | ||
2475 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2476 | + rm -f conftest.er1 | ||
2477 | + cat conftest.err >&5 | ||
2478 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2479 | (exit $ac_status); } && | ||
2480 | - { ac_try='test -s conftest.$ac_objext' | ||
2481 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2482 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2483 | + (eval $ac_try) 2>&5 | ||
2484 | + ac_status=$? | ||
2485 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2486 | + (exit $ac_status); }; } && | ||
2487 | + { ac_try='test -s conftest.$ac_objext' | ||
2488 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2489 | (eval $ac_try) 2>&5 | ||
2490 | ac_status=$? | ||
2491 | @@ -2140,7 +2229,7 @@ | ||
2492 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2493 | |||
2494 | fi | ||
2495 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2496 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2497 | done | ||
2498 | rm -f conftest* | ||
2499 | if test -n "$ac_declaration"; then | ||
2500 | @@ -2154,7 +2243,7 @@ | ||
2501 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2502 | |||
2503 | fi | ||
2504 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2505 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2506 | ac_ext=c | ||
2507 | ac_cpp='$CPP $CPPFLAGS' | ||
2508 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
2509 | @@ -2189,7 +2278,6 @@ | ||
2510 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
2511 | # not just through cpp. "Syntax error" is here to catch this case. | ||
2512 | cat >conftest.$ac_ext <<_ACEOF | ||
2513 | -#line $LINENO "configure" | ||
2514 | /* confdefs.h. */ | ||
2515 | _ACEOF | ||
2516 | cat confdefs.h >>conftest.$ac_ext | ||
2517 | @@ -2200,7 +2288,7 @@ | ||
2518 | #else | ||
2519 | # include <assert.h> | ||
2520 | #endif | ||
2521 | - Syntax error | ||
2522 | + Syntax error | ||
2523 | _ACEOF | ||
2524 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2525 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
2526 | @@ -2212,6 +2300,7 @@ | ||
2527 | (exit $ac_status); } >/dev/null; then | ||
2528 | if test -s conftest.err; then | ||
2529 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2530 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2531 | else | ||
2532 | ac_cpp_err= | ||
2533 | fi | ||
2534 | @@ -2232,7 +2321,6 @@ | ||
2535 | # OK, works on sane cases. Now check whether non-existent headers | ||
2536 | # can be detected and how. | ||
2537 | cat >conftest.$ac_ext <<_ACEOF | ||
2538 | -#line $LINENO "configure" | ||
2539 | /* confdefs.h. */ | ||
2540 | _ACEOF | ||
2541 | cat confdefs.h >>conftest.$ac_ext | ||
2542 | @@ -2250,6 +2338,7 @@ | ||
2543 | (exit $ac_status); } >/dev/null; then | ||
2544 | if test -s conftest.err; then | ||
2545 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2546 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2547 | else | ||
2548 | ac_cpp_err= | ||
2549 | fi | ||
2550 | @@ -2296,7 +2385,6 @@ | ||
2551 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
2552 | # not just through cpp. "Syntax error" is here to catch this case. | ||
2553 | cat >conftest.$ac_ext <<_ACEOF | ||
2554 | -#line $LINENO "configure" | ||
2555 | /* confdefs.h. */ | ||
2556 | _ACEOF | ||
2557 | cat confdefs.h >>conftest.$ac_ext | ||
2558 | @@ -2307,7 +2395,7 @@ | ||
2559 | #else | ||
2560 | # include <assert.h> | ||
2561 | #endif | ||
2562 | - Syntax error | ||
2563 | + Syntax error | ||
2564 | _ACEOF | ||
2565 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2566 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
2567 | @@ -2319,6 +2407,7 @@ | ||
2568 | (exit $ac_status); } >/dev/null; then | ||
2569 | if test -s conftest.err; then | ||
2570 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2571 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2572 | else | ||
2573 | ac_cpp_err= | ||
2574 | fi | ||
2575 | @@ -2339,7 +2428,6 @@ | ||
2576 | # OK, works on sane cases. Now check whether non-existent headers | ||
2577 | # can be detected and how. | ||
2578 | cat >conftest.$ac_ext <<_ACEOF | ||
2579 | -#line $LINENO "configure" | ||
2580 | /* confdefs.h. */ | ||
2581 | _ACEOF | ||
2582 | cat confdefs.h >>conftest.$ac_ext | ||
2583 | @@ -2357,6 +2445,7 @@ | ||
2584 | (exit $ac_status); } >/dev/null; then | ||
2585 | if test -s conftest.err; then | ||
2586 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2587 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2588 | else | ||
2589 | ac_cpp_err= | ||
2590 | fi | ||
2591 | @@ -2431,6 +2520,7 @@ | ||
2592 | # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag | ||
2593 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
2594 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
2595 | +# OS/2's system install, which has a completely different semantic | ||
2596 | # ./install, which can be erroneously created by make from ./install.sh. | ||
2597 | echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
2598 | echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 | ||
2599 | @@ -2447,6 +2537,7 @@ | ||
2600 | case $as_dir/ in | ||
2601 | ./ | .// | /cC/* | \ | ||
2602 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | ||
2603 | + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ | ||
2604 | /usr/ucb/* ) ;; | ||
2605 | *) | ||
2606 | # OSF1 and SCO ODT 3.0 have their own names for install. | ||
2607 | @@ -2454,20 +2545,20 @@ | ||
2608 | # by default. | ||
2609 | for ac_prog in ginstall scoinst install; do | ||
2610 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2611 | - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2612 | - if test $ac_prog = install && | ||
2613 | - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2614 | - # AIX install. It has an incompatible calling convention. | ||
2615 | - : | ||
2616 | - elif test $ac_prog = install && | ||
2617 | - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2618 | - # program-specific install script used by HP pwplus--don't use. | ||
2619 | - : | ||
2620 | - else | ||
2621 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2622 | - break 3 | ||
2623 | - fi | ||
2624 | - fi | ||
2625 | + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2626 | + if test $ac_prog = install && | ||
2627 | + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2628 | + # AIX install. It has an incompatible calling convention. | ||
2629 | + : | ||
2630 | + elif test $ac_prog = install && | ||
2631 | + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2632 | + # program-specific install script used by HP pwplus--don't use. | ||
2633 | + : | ||
2634 | + else | ||
2635 | + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2636 | + break 3 | ||
2637 | + fi | ||
2638 | + fi | ||
2639 | done | ||
2640 | done | ||
2641 | ;; | ||
2642 | @@ -2499,7 +2590,7 @@ | ||
2643 | |||
2644 | echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
2645 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | ||
2646 | -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | ||
2647 | +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` | ||
2648 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | ||
2649 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2650 | else | ||
2651 | @@ -2596,7 +2687,6 @@ | ||
2652 | echo "$as_me:$LINENO: checking for AIX" >&5 | ||
2653 | echo $ECHO_N "checking for AIX... $ECHO_C" >&6 | ||
2654 | cat >conftest.$ac_ext <<_ACEOF | ||
2655 | -#line $LINENO "configure" | ||
2656 | /* confdefs.h. */ | ||
2657 | _ACEOF | ||
2658 | cat confdefs.h >>conftest.$ac_ext | ||
2659 | @@ -2628,7 +2718,6 @@ | ||
2660 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2661 | else | ||
2662 | cat >conftest.$ac_ext <<_ACEOF | ||
2663 | -#line $LINENO "configure" | ||
2664 | /* confdefs.h. */ | ||
2665 | _ACEOF | ||
2666 | cat confdefs.h >>conftest.$ac_ext | ||
2667 | @@ -2649,11 +2738,20 @@ | ||
2668 | _ACEOF | ||
2669 | rm -f conftest.$ac_objext | ||
2670 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2671 | - (eval $ac_compile) 2>&5 | ||
2672 | + (eval $ac_compile) 2>conftest.er1 | ||
2673 | ac_status=$? | ||
2674 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2675 | + rm -f conftest.er1 | ||
2676 | + cat conftest.err >&5 | ||
2677 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2678 | (exit $ac_status); } && | ||
2679 | - { ac_try='test -s conftest.$ac_objext' | ||
2680 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2681 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2682 | + (eval $ac_try) 2>&5 | ||
2683 | + ac_status=$? | ||
2684 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2685 | + (exit $ac_status); }; } && | ||
2686 | + { ac_try='test -s conftest.$ac_objext' | ||
2687 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2688 | (eval $ac_try) 2>&5 | ||
2689 | ac_status=$? | ||
2690 | @@ -2666,12 +2764,11 @@ | ||
2691 | |||
2692 | ac_cv_header_stdc=no | ||
2693 | fi | ||
2694 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2695 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2696 | |||
2697 | if test $ac_cv_header_stdc = yes; then | ||
2698 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
2699 | cat >conftest.$ac_ext <<_ACEOF | ||
2700 | -#line $LINENO "configure" | ||
2701 | /* confdefs.h. */ | ||
2702 | _ACEOF | ||
2703 | cat confdefs.h >>conftest.$ac_ext | ||
2704 | @@ -2693,7 +2790,6 @@ | ||
2705 | if test $ac_cv_header_stdc = yes; then | ||
2706 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
2707 | cat >conftest.$ac_ext <<_ACEOF | ||
2708 | -#line $LINENO "configure" | ||
2709 | /* confdefs.h. */ | ||
2710 | _ACEOF | ||
2711 | cat confdefs.h >>conftest.$ac_ext | ||
2712 | @@ -2718,7 +2814,6 @@ | ||
2713 | : | ||
2714 | else | ||
2715 | cat >conftest.$ac_ext <<_ACEOF | ||
2716 | -#line $LINENO "configure" | ||
2717 | /* confdefs.h. */ | ||
2718 | _ACEOF | ||
2719 | cat confdefs.h >>conftest.$ac_ext | ||
2720 | @@ -2730,9 +2825,9 @@ | ||
2721 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
2722 | #else | ||
2723 | # define ISLOWER(c) \ | ||
2724 | - (('a' <= (c) && (c) <= 'i') \ | ||
2725 | - || ('j' <= (c) && (c) <= 'r') \ | ||
2726 | - || ('s' <= (c) && (c) <= 'z')) | ||
2727 | + (('a' <= (c) && (c) <= 'i') \ | ||
2728 | + || ('j' <= (c) && (c) <= 'r') \ | ||
2729 | + || ('s' <= (c) && (c) <= 'z')) | ||
2730 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
2731 | #endif | ||
2732 | |||
2733 | @@ -2743,7 +2838,7 @@ | ||
2734 | int i; | ||
2735 | for (i = 0; i < 256; i++) | ||
2736 | if (XOR (islower (i), ISLOWER (i)) | ||
2737 | - || toupper (i) != TOUPPER (i)) | ||
2738 | + || toupper (i) != TOUPPER (i)) | ||
2739 | exit(2); | ||
2740 | exit (0); | ||
2741 | } | ||
2742 | @@ -2768,7 +2863,7 @@ | ||
2743 | ( exit $ac_status ) | ||
2744 | ac_cv_header_stdc=no | ||
2745 | fi | ||
2746 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
2747 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
2748 | fi | ||
2749 | fi | ||
2750 | fi | ||
2751 | @@ -2793,7 +2888,7 @@ | ||
2752 | |||
2753 | |||
2754 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
2755 | - inttypes.h stdint.h unistd.h | ||
2756 | + inttypes.h stdint.h unistd.h | ||
2757 | do | ||
2758 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
2759 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
2760 | @@ -2802,7 +2897,6 @@ | ||
2761 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2762 | else | ||
2763 | cat >conftest.$ac_ext <<_ACEOF | ||
2764 | -#line $LINENO "configure" | ||
2765 | /* confdefs.h. */ | ||
2766 | _ACEOF | ||
2767 | cat confdefs.h >>conftest.$ac_ext | ||
2768 | @@ -2814,11 +2908,20 @@ | ||
2769 | _ACEOF | ||
2770 | rm -f conftest.$ac_objext | ||
2771 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2772 | - (eval $ac_compile) 2>&5 | ||
2773 | + (eval $ac_compile) 2>conftest.er1 | ||
2774 | ac_status=$? | ||
2775 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2776 | + rm -f conftest.er1 | ||
2777 | + cat conftest.err >&5 | ||
2778 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2779 | (exit $ac_status); } && | ||
2780 | - { ac_try='test -s conftest.$ac_objext' | ||
2781 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2782 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2783 | + (eval $ac_try) 2>&5 | ||
2784 | + ac_status=$? | ||
2785 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2786 | + (exit $ac_status); }; } && | ||
2787 | + { ac_try='test -s conftest.$ac_objext' | ||
2788 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2789 | (eval $ac_try) 2>&5 | ||
2790 | ac_status=$? | ||
2791 | @@ -2831,7 +2934,7 @@ | ||
2792 | |||
2793 | eval "$as_ac_Header=no" | ||
2794 | fi | ||
2795 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2796 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2797 | fi | ||
2798 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
2799 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
2800 | @@ -2858,7 +2961,6 @@ | ||
2801 | echo "$as_me:$LINENO: checking minix/config.h usability" >&5 | ||
2802 | echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6 | ||
2803 | cat >conftest.$ac_ext <<_ACEOF | ||
2804 | -#line $LINENO "configure" | ||
2805 | /* confdefs.h. */ | ||
2806 | _ACEOF | ||
2807 | cat confdefs.h >>conftest.$ac_ext | ||
2808 | @@ -2869,11 +2971,20 @@ | ||
2809 | _ACEOF | ||
2810 | rm -f conftest.$ac_objext | ||
2811 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2812 | - (eval $ac_compile) 2>&5 | ||
2813 | + (eval $ac_compile) 2>conftest.er1 | ||
2814 | ac_status=$? | ||
2815 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2816 | + rm -f conftest.er1 | ||
2817 | + cat conftest.err >&5 | ||
2818 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2819 | (exit $ac_status); } && | ||
2820 | - { ac_try='test -s conftest.$ac_objext' | ||
2821 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2822 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2823 | + (eval $ac_try) 2>&5 | ||
2824 | + ac_status=$? | ||
2825 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2826 | + (exit $ac_status); }; } && | ||
2827 | + { ac_try='test -s conftest.$ac_objext' | ||
2828 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2829 | (eval $ac_try) 2>&5 | ||
2830 | ac_status=$? | ||
2831 | @@ -2886,7 +2997,7 @@ | ||
2832 | |||
2833 | ac_header_compiler=no | ||
2834 | fi | ||
2835 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2836 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2837 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
2838 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
2839 | |||
2840 | @@ -2894,7 +3005,6 @@ | ||
2841 | echo "$as_me:$LINENO: checking minix/config.h presence" >&5 | ||
2842 | echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6 | ||
2843 | cat >conftest.$ac_ext <<_ACEOF | ||
2844 | -#line $LINENO "configure" | ||
2845 | /* confdefs.h. */ | ||
2846 | _ACEOF | ||
2847 | cat confdefs.h >>conftest.$ac_ext | ||
2848 | @@ -2912,6 +3022,7 @@ | ||
2849 | (exit $ac_status); } >/dev/null; then | ||
2850 | if test -s conftest.err; then | ||
2851 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2852 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2853 | else | ||
2854 | ac_cpp_err= | ||
2855 | fi | ||
2856 | @@ -2931,33 +3042,32 @@ | ||
2857 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
2858 | |||
2859 | # So? What about this header? | ||
2860 | -case $ac_header_compiler:$ac_header_preproc in | ||
2861 | - yes:no ) | ||
2862 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
2863 | + yes:no: ) | ||
2864 | { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
2865 | echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
2866 | - { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 | ||
2867 | -echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} | ||
2868 | - ( | ||
2869 | - cat <<\_ASBOX | ||
2870 | -## ------------------------------------ ## | ||
2871 | -## Report this to bug-autoconf@gnu.org. ## | ||
2872 | -## ------------------------------------ ## | ||
2873 | -_ASBOX | ||
2874 | - ) | | ||
2875 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
2876 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 | ||
2877 | +echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} | ||
2878 | + ac_header_preproc=yes | ||
2879 | ;; | ||
2880 | - no:yes ) | ||
2881 | + no:yes:* ) | ||
2882 | { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 | ||
2883 | echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} | ||
2884 | - { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 | ||
2885 | -echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
2889 | +echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} | ||
2890 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
2891 | +echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
2892 | { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 | ||
2893 | echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} | ||
2894 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 | ||
2895 | +echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} | ||
2896 | ( | ||
2897 | cat <<\_ASBOX | ||
2898 | -## ------------------------------------ ## | ||
2899 | -## Report this to bug-autoconf@gnu.org. ## | ||
2900 | -## ------------------------------------ ## | ||
2901 | +## -------------------------------- ## | ||
2902 | +## Report this to bug-patch@gnu.org ## | ||
2903 | +## -------------------------------- ## | ||
2904 | _ASBOX | ||
2905 | ) | | ||
2906 | sed "s/^/$as_me: WARNING: /" >&2 | ||
2907 | @@ -3000,15 +3110,15 @@ | ||
2908 | fi | ||
2909 | |||
2910 | |||
2911 | -echo "$as_me:$LINENO: checking for library containing strerror" >&5 | ||
2912 | -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 | ||
2913 | -if test "${ac_cv_search_strerror+set}" = set; then | ||
2914 | + | ||
2915 | + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 | ||
2916 | +echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 | ||
2917 | +if test "${ac_cv_lib_cposix_strerror+set}" = set; then | ||
2918 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2919 | else | ||
2920 | - ac_func_search_save_LIBS=$LIBS | ||
2921 | -ac_cv_search_strerror=no | ||
2922 | + ac_check_lib_save_LIBS=$LIBS | ||
2923 | +LIBS="-lcposix $LIBS" | ||
2924 | cat >conftest.$ac_ext <<_ACEOF | ||
2925 | -#line $LINENO "configure" | ||
2926 | /* confdefs.h. */ | ||
2927 | _ACEOF | ||
2928 | cat confdefs.h >>conftest.$ac_ext | ||
2929 | @@ -3032,79 +3142,43 @@ | ||
2930 | _ACEOF | ||
2931 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
2932 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
2933 | - (eval $ac_link) 2>&5 | ||
2934 | + (eval $ac_link) 2>conftest.er1 | ||
2935 | ac_status=$? | ||
2936 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2937 | + rm -f conftest.er1 | ||
2938 | + cat conftest.err >&5 | ||
2939 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2940 | (exit $ac_status); } && | ||
2941 | - { ac_try='test -s conftest$ac_exeext' | ||
2942 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2943 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2944 | (eval $ac_try) 2>&5 | ||
2945 | ac_status=$? | ||
2946 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2947 | - (exit $ac_status); }; }; then | ||
2948 | - ac_cv_search_strerror="none required" | ||
2949 | -else | ||
2950 | - echo "$as_me: failed program was:" >&5 | ||
2951 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2952 | - | ||
2953 | -fi | ||
2954 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
2955 | -if test "$ac_cv_search_strerror" = no; then | ||
2956 | - for ac_lib in cposix; do | ||
2957 | - LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
2958 | - cat >conftest.$ac_ext <<_ACEOF | ||
2959 | -#line $LINENO "configure" | ||
2960 | -/* confdefs.h. */ | ||
2961 | -_ACEOF | ||
2962 | -cat confdefs.h >>conftest.$ac_ext | ||
2963 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2964 | -/* end confdefs.h. */ | ||
2965 | - | ||
2966 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
2967 | -#ifdef __cplusplus | ||
2968 | -extern "C" | ||
2969 | -#endif | ||
2970 | -/* We use char because int might match the return type of a gcc2 | ||
2971 | - builtin and then its argument prototype would still apply. */ | ||
2972 | -char strerror (); | ||
2973 | -int | ||
2974 | -main () | ||
2975 | -{ | ||
2976 | -strerror (); | ||
2977 | - ; | ||
2978 | - return 0; | ||
2979 | -} | ||
2980 | -_ACEOF | ||
2981 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
2982 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
2983 | - (eval $ac_link) 2>&5 | ||
2984 | - ac_status=$? | ||
2985 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2986 | - (exit $ac_status); } && | ||
2987 | - { ac_try='test -s conftest$ac_exeext' | ||
2988 | + (exit $ac_status); }; } && | ||
2989 | + { ac_try='test -s conftest$ac_exeext' | ||
2990 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2991 | (eval $ac_try) 2>&5 | ||
2992 | ac_status=$? | ||
2993 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2994 | (exit $ac_status); }; }; then | ||
2995 | - ac_cv_search_strerror="-l$ac_lib" | ||
2996 | -break | ||
2997 | + ac_cv_lib_cposix_strerror=yes | ||
2998 | else | ||
2999 | echo "$as_me: failed program was:" >&5 | ||
3000 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3001 | |||
3002 | +ac_cv_lib_cposix_strerror=no | ||
3003 | fi | ||
3004 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3005 | - done | ||
3006 | +rm -f conftest.err conftest.$ac_objext \ | ||
3007 | + conftest$ac_exeext conftest.$ac_ext | ||
3008 | +LIBS=$ac_check_lib_save_LIBS | ||
3009 | fi | ||
3010 | -LIBS=$ac_func_search_save_LIBS | ||
3011 | +echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 | ||
3012 | +echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 | ||
3013 | +if test $ac_cv_lib_cposix_strerror = yes; then | ||
3014 | + LIBS="$LIBS -lcposix" | ||
3015 | fi | ||
3016 | -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 | ||
3017 | -echo "${ECHO_T}$ac_cv_search_strerror" >&6 | ||
3018 | -if test "$ac_cv_search_strerror" != no; then | ||
3019 | - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" | ||
3020 | |||
3021 | -fi | ||
3022 | + | ||
3023 | |||
3024 | # Check whether --enable-largefile or --disable-largefile was given. | ||
3025 | if test "${enable_largefile+set}" = set; then | ||
3026 | @@ -3124,8 +3198,7 @@ | ||
3027 | while :; do | ||
3028 | # IRIX 6.2 and later do not support large files by default, | ||
3029 | # so use the C compiler's -n32 option if that helps. | ||
3030 | - cat >conftest.$ac_ext <<_ACEOF | ||
3031 | -#line $LINENO "configure" | ||
3032 | + cat >conftest.$ac_ext <<_ACEOF | ||
3033 | /* confdefs.h. */ | ||
3034 | _ACEOF | ||
3035 | cat confdefs.h >>conftest.$ac_ext | ||
3036 | @@ -3150,11 +3223,20 @@ | ||
3037 | _ACEOF | ||
3038 | rm -f conftest.$ac_objext | ||
3039 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3040 | - (eval $ac_compile) 2>&5 | ||
3041 | + (eval $ac_compile) 2>conftest.er1 | ||
3042 | ac_status=$? | ||
3043 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3044 | + rm -f conftest.er1 | ||
3045 | + cat conftest.err >&5 | ||
3046 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3047 | (exit $ac_status); } && | ||
3048 | - { ac_try='test -s conftest.$ac_objext' | ||
3049 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3050 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3051 | + (eval $ac_try) 2>&5 | ||
3052 | + ac_status=$? | ||
3053 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3054 | + (exit $ac_status); }; } && | ||
3055 | + { ac_try='test -s conftest.$ac_objext' | ||
3056 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3057 | (eval $ac_try) 2>&5 | ||
3058 | ac_status=$? | ||
3059 | @@ -3166,15 +3248,24 @@ | ||
3060 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3061 | |||
3062 | fi | ||
3063 | -rm -f conftest.$ac_objext | ||
3064 | +rm -f conftest.err conftest.$ac_objext | ||
3065 | CC="$CC -n32" | ||
3066 | rm -f conftest.$ac_objext | ||
3067 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3068 | - (eval $ac_compile) 2>&5 | ||
3069 | + (eval $ac_compile) 2>conftest.er1 | ||
3070 | ac_status=$? | ||
3071 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3072 | + rm -f conftest.er1 | ||
3073 | + cat conftest.err >&5 | ||
3074 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3075 | (exit $ac_status); } && | ||
3076 | - { ac_try='test -s conftest.$ac_objext' | ||
3077 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3078 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3079 | + (eval $ac_try) 2>&5 | ||
3080 | + ac_status=$? | ||
3081 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3082 | + (exit $ac_status); }; } && | ||
3083 | + { ac_try='test -s conftest.$ac_objext' | ||
3084 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3085 | (eval $ac_try) 2>&5 | ||
3086 | ac_status=$? | ||
3087 | @@ -3186,8 +3277,8 @@ | ||
3088 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3089 | |||
3090 | fi | ||
3091 | -rm -f conftest.$ac_objext | ||
3092 | - break | ||
3093 | +rm -f conftest.err conftest.$ac_objext | ||
3094 | + break | ||
3095 | done | ||
3096 | CC=$ac_save_CC | ||
3097 | rm -f conftest.$ac_ext | ||
3098 | @@ -3207,7 +3298,6 @@ | ||
3099 | while :; do | ||
3100 | ac_cv_sys_file_offset_bits=no | ||
3101 | cat >conftest.$ac_ext <<_ACEOF | ||
3102 | -#line $LINENO "configure" | ||
3103 | /* confdefs.h. */ | ||
3104 | _ACEOF | ||
3105 | cat confdefs.h >>conftest.$ac_ext | ||
3106 | @@ -3232,11 +3322,20 @@ | ||
3107 | _ACEOF | ||
3108 | rm -f conftest.$ac_objext | ||
3109 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3110 | - (eval $ac_compile) 2>&5 | ||
3111 | + (eval $ac_compile) 2>conftest.er1 | ||
3112 | ac_status=$? | ||
3113 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3114 | + rm -f conftest.er1 | ||
3115 | + cat conftest.err >&5 | ||
3116 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3117 | (exit $ac_status); } && | ||
3118 | - { ac_try='test -s conftest.$ac_objext' | ||
3119 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3120 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3121 | + (eval $ac_try) 2>&5 | ||
3122 | + ac_status=$? | ||
3123 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3124 | + (exit $ac_status); }; } && | ||
3125 | + { ac_try='test -s conftest.$ac_objext' | ||
3126 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3127 | (eval $ac_try) 2>&5 | ||
3128 | ac_status=$? | ||
3129 | @@ -3248,9 +3347,8 @@ | ||
3130 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3131 | |||
3132 | fi | ||
3133 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3134 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3135 | cat >conftest.$ac_ext <<_ACEOF | ||
3136 | -#line $LINENO "configure" | ||
3137 | /* confdefs.h. */ | ||
3138 | _ACEOF | ||
3139 | cat confdefs.h >>conftest.$ac_ext | ||
3140 | @@ -3276,11 +3374,20 @@ | ||
3141 | _ACEOF | ||
3142 | rm -f conftest.$ac_objext | ||
3143 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3144 | - (eval $ac_compile) 2>&5 | ||
3145 | + (eval $ac_compile) 2>conftest.er1 | ||
3146 | ac_status=$? | ||
3147 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3148 | + rm -f conftest.er1 | ||
3149 | + cat conftest.err >&5 | ||
3150 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3151 | (exit $ac_status); } && | ||
3152 | - { ac_try='test -s conftest.$ac_objext' | ||
3153 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3154 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3155 | + (eval $ac_try) 2>&5 | ||
3156 | + ac_status=$? | ||
3157 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3158 | + (exit $ac_status); }; } && | ||
3159 | + { ac_try='test -s conftest.$ac_objext' | ||
3160 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3161 | (eval $ac_try) 2>&5 | ||
3162 | ac_status=$? | ||
3163 | @@ -3292,7 +3399,7 @@ | ||
3164 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3165 | |||
3166 | fi | ||
3167 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3168 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3169 | break | ||
3170 | done | ||
3171 | fi | ||
3172 | @@ -3314,7 +3421,6 @@ | ||
3173 | while :; do | ||
3174 | ac_cv_sys_large_files=no | ||
3175 | cat >conftest.$ac_ext <<_ACEOF | ||
3176 | -#line $LINENO "configure" | ||
3177 | /* confdefs.h. */ | ||
3178 | _ACEOF | ||
3179 | cat confdefs.h >>conftest.$ac_ext | ||
3180 | @@ -3339,11 +3445,20 @@ | ||
3181 | _ACEOF | ||
3182 | rm -f conftest.$ac_objext | ||
3183 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3184 | - (eval $ac_compile) 2>&5 | ||
3185 | + (eval $ac_compile) 2>conftest.er1 | ||
3186 | ac_status=$? | ||
3187 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3188 | + rm -f conftest.er1 | ||
3189 | + cat conftest.err >&5 | ||
3190 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3191 | (exit $ac_status); } && | ||
3192 | - { ac_try='test -s conftest.$ac_objext' | ||
3193 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3194 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3195 | + (eval $ac_try) 2>&5 | ||
3196 | + ac_status=$? | ||
3197 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3198 | + (exit $ac_status); }; } && | ||
3199 | + { ac_try='test -s conftest.$ac_objext' | ||
3200 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3201 | (eval $ac_try) 2>&5 | ||
3202 | ac_status=$? | ||
3203 | @@ -3355,9 +3470,8 @@ | ||
3204 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3205 | |||
3206 | fi | ||
3207 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3208 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3209 | cat >conftest.$ac_ext <<_ACEOF | ||
3210 | -#line $LINENO "configure" | ||
3211 | /* confdefs.h. */ | ||
3212 | _ACEOF | ||
3213 | cat confdefs.h >>conftest.$ac_ext | ||
3214 | @@ -3383,11 +3497,20 @@ | ||
3215 | _ACEOF | ||
3216 | rm -f conftest.$ac_objext | ||
3217 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3218 | - (eval $ac_compile) 2>&5 | ||
3219 | + (eval $ac_compile) 2>conftest.er1 | ||
3220 | ac_status=$? | ||
3221 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3222 | + rm -f conftest.er1 | ||
3223 | + cat conftest.err >&5 | ||
3224 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3225 | (exit $ac_status); } && | ||
3226 | - { ac_try='test -s conftest.$ac_objext' | ||
3227 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3228 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3229 | + (eval $ac_try) 2>&5 | ||
3230 | + ac_status=$? | ||
3231 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3232 | + (exit $ac_status); }; } && | ||
3233 | + { ac_try='test -s conftest.$ac_objext' | ||
3234 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3235 | (eval $ac_try) 2>&5 | ||
3236 | ac_status=$? | ||
3237 | @@ -3399,7 +3522,7 @@ | ||
3238 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3239 | |||
3240 | fi | ||
3241 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3242 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3243 | break | ||
3244 | done | ||
3245 | fi | ||
3246 | @@ -3443,7 +3566,6 @@ | ||
3247 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3248 | else | ||
3249 | cat >conftest.$ac_ext <<_ACEOF | ||
3250 | -#line $LINENO "configure" | ||
3251 | /* confdefs.h. */ | ||
3252 | _ACEOF | ||
3253 | cat confdefs.h >>conftest.$ac_ext | ||
3254 | @@ -3506,11 +3628,20 @@ | ||
3255 | _ACEOF | ||
3256 | rm -f conftest.$ac_objext | ||
3257 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3258 | - (eval $ac_compile) 2>&5 | ||
3259 | + (eval $ac_compile) 2>conftest.er1 | ||
3260 | ac_status=$? | ||
3261 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3262 | + rm -f conftest.er1 | ||
3263 | + cat conftest.err >&5 | ||
3264 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3265 | (exit $ac_status); } && | ||
3266 | - { ac_try='test -s conftest.$ac_objext' | ||
3267 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3268 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3269 | + (eval $ac_try) 2>&5 | ||
3270 | + ac_status=$? | ||
3271 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3272 | + (exit $ac_status); }; } && | ||
3273 | + { ac_try='test -s conftest.$ac_objext' | ||
3274 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3275 | (eval $ac_try) 2>&5 | ||
3276 | ac_status=$? | ||
3277 | @@ -3523,7 +3654,7 @@ | ||
3278 | |||
3279 | ac_cv_c_const=no | ||
3280 | fi | ||
3281 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3282 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3283 | fi | ||
3284 | echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 | ||
3285 | echo "${ECHO_T}$ac_cv_c_const" >&6 | ||
3286 | @@ -3550,7 +3681,6 @@ | ||
3287 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3288 | else | ||
3289 | cat >conftest.$ac_ext <<_ACEOF | ||
3290 | -#line $LINENO "configure" | ||
3291 | /* confdefs.h. */ | ||
3292 | _ACEOF | ||
3293 | cat confdefs.h >>conftest.$ac_ext | ||
3294 | @@ -3570,11 +3700,20 @@ | ||
3295 | _ACEOF | ||
3296 | rm -f conftest.$ac_objext | ||
3297 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3298 | - (eval $ac_compile) 2>&5 | ||
3299 | + (eval $ac_compile) 2>conftest.er1 | ||
3300 | ac_status=$? | ||
3301 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3302 | + rm -f conftest.er1 | ||
3303 | + cat conftest.err >&5 | ||
3304 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3305 | (exit $ac_status); } && | ||
3306 | - { ac_try='test -s conftest.$ac_objext' | ||
3307 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3308 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3309 | + (eval $ac_try) 2>&5 | ||
3310 | + ac_status=$? | ||
3311 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3312 | + (exit $ac_status); }; } && | ||
3313 | + { ac_try='test -s conftest.$ac_objext' | ||
3314 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3315 | (eval $ac_try) 2>&5 | ||
3316 | ac_status=$? | ||
3317 | @@ -3587,7 +3726,7 @@ | ||
3318 | |||
3319 | eval "$as_ac_Header=no" | ||
3320 | fi | ||
3321 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3322 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3323 | fi | ||
3324 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
3325 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
3326 | @@ -3610,7 +3749,6 @@ | ||
3327 | ac_func_search_save_LIBS=$LIBS | ||
3328 | ac_cv_search_opendir=no | ||
3329 | cat >conftest.$ac_ext <<_ACEOF | ||
3330 | -#line $LINENO "configure" | ||
3331 | /* confdefs.h. */ | ||
3332 | _ACEOF | ||
3333 | cat confdefs.h >>conftest.$ac_ext | ||
3334 | @@ -3634,11 +3772,20 @@ | ||
3335 | _ACEOF | ||
3336 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3337 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3338 | - (eval $ac_link) 2>&5 | ||
3339 | + (eval $ac_link) 2>conftest.er1 | ||
3340 | ac_status=$? | ||
3341 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3342 | + rm -f conftest.er1 | ||
3343 | + cat conftest.err >&5 | ||
3344 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3345 | (exit $ac_status); } && | ||
3346 | - { ac_try='test -s conftest$ac_exeext' | ||
3347 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3348 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3349 | + (eval $ac_try) 2>&5 | ||
3350 | + ac_status=$? | ||
3351 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3352 | + (exit $ac_status); }; } && | ||
3353 | + { ac_try='test -s conftest$ac_exeext' | ||
3354 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3355 | (eval $ac_try) 2>&5 | ||
3356 | ac_status=$? | ||
3357 | @@ -3650,12 +3797,12 @@ | ||
3358 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3359 | |||
3360 | fi | ||
3361 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3362 | +rm -f conftest.err conftest.$ac_objext \ | ||
3363 | + conftest$ac_exeext conftest.$ac_ext | ||
3364 | if test "$ac_cv_search_opendir" = no; then | ||
3365 | for ac_lib in dir; do | ||
3366 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
3367 | cat >conftest.$ac_ext <<_ACEOF | ||
3368 | -#line $LINENO "configure" | ||
3369 | /* confdefs.h. */ | ||
3370 | _ACEOF | ||
3371 | cat confdefs.h >>conftest.$ac_ext | ||
3372 | @@ -3679,11 +3826,20 @@ | ||
3373 | _ACEOF | ||
3374 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3375 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3376 | - (eval $ac_link) 2>&5 | ||
3377 | + (eval $ac_link) 2>conftest.er1 | ||
3378 | ac_status=$? | ||
3379 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3380 | + rm -f conftest.er1 | ||
3381 | + cat conftest.err >&5 | ||
3382 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3383 | (exit $ac_status); } && | ||
3384 | - { ac_try='test -s conftest$ac_exeext' | ||
3385 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3386 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3387 | + (eval $ac_try) 2>&5 | ||
3388 | + ac_status=$? | ||
3389 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3390 | + (exit $ac_status); }; } && | ||
3391 | + { ac_try='test -s conftest$ac_exeext' | ||
3392 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3393 | (eval $ac_try) 2>&5 | ||
3394 | ac_status=$? | ||
3395 | @@ -3696,7 +3852,8 @@ | ||
3396 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3397 | |||
3398 | fi | ||
3399 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3400 | +rm -f conftest.err conftest.$ac_objext \ | ||
3401 | + conftest$ac_exeext conftest.$ac_ext | ||
3402 | done | ||
3403 | fi | ||
3404 | LIBS=$ac_func_search_save_LIBS | ||
3405 | @@ -3717,7 +3874,6 @@ | ||
3406 | ac_func_search_save_LIBS=$LIBS | ||
3407 | ac_cv_search_opendir=no | ||
3408 | cat >conftest.$ac_ext <<_ACEOF | ||
3409 | -#line $LINENO "configure" | ||
3410 | /* confdefs.h. */ | ||
3411 | _ACEOF | ||
3412 | cat confdefs.h >>conftest.$ac_ext | ||
3413 | @@ -3741,11 +3897,20 @@ | ||
3414 | _ACEOF | ||
3415 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3416 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3417 | - (eval $ac_link) 2>&5 | ||
3418 | + (eval $ac_link) 2>conftest.er1 | ||
3419 | ac_status=$? | ||
3420 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3421 | + rm -f conftest.er1 | ||
3422 | + cat conftest.err >&5 | ||
3423 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3424 | (exit $ac_status); } && | ||
3425 | - { ac_try='test -s conftest$ac_exeext' | ||
3426 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3427 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3428 | + (eval $ac_try) 2>&5 | ||
3429 | + ac_status=$? | ||
3430 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3431 | + (exit $ac_status); }; } && | ||
3432 | + { ac_try='test -s conftest$ac_exeext' | ||
3433 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3434 | (eval $ac_try) 2>&5 | ||
3435 | ac_status=$? | ||
3436 | @@ -3757,12 +3922,12 @@ | ||
3437 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3438 | |||
3439 | fi | ||
3440 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3441 | +rm -f conftest.err conftest.$ac_objext \ | ||
3442 | + conftest$ac_exeext conftest.$ac_ext | ||
3443 | if test "$ac_cv_search_opendir" = no; then | ||
3444 | for ac_lib in x; do | ||
3445 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
3446 | cat >conftest.$ac_ext <<_ACEOF | ||
3447 | -#line $LINENO "configure" | ||
3448 | /* confdefs.h. */ | ||
3449 | _ACEOF | ||
3450 | cat confdefs.h >>conftest.$ac_ext | ||
3451 | @@ -3786,11 +3951,20 @@ | ||
3452 | _ACEOF | ||
3453 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3454 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3455 | - (eval $ac_link) 2>&5 | ||
3456 | + (eval $ac_link) 2>conftest.er1 | ||
3457 | ac_status=$? | ||
3458 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3459 | + rm -f conftest.er1 | ||
3460 | + cat conftest.err >&5 | ||
3461 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3462 | (exit $ac_status); } && | ||
3463 | - { ac_try='test -s conftest$ac_exeext' | ||
3464 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3465 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3466 | + (eval $ac_try) 2>&5 | ||
3467 | + ac_status=$? | ||
3468 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3469 | + (exit $ac_status); }; } && | ||
3470 | + { ac_try='test -s conftest$ac_exeext' | ||
3471 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3472 | (eval $ac_try) 2>&5 | ||
3473 | ac_status=$? | ||
3474 | @@ -3803,7 +3977,8 @@ | ||
3475 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3476 | |||
3477 | fi | ||
3478 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3479 | +rm -f conftest.err conftest.$ac_objext \ | ||
3480 | + conftest$ac_exeext conftest.$ac_ext | ||
3481 | done | ||
3482 | fi | ||
3483 | LIBS=$ac_func_search_save_LIBS | ||
3484 | @@ -3823,7 +3998,6 @@ | ||
3485 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3486 | else | ||
3487 | cat >conftest.$ac_ext <<_ACEOF | ||
3488 | -#line $LINENO "configure" | ||
3489 | /* confdefs.h. */ | ||
3490 | _ACEOF | ||
3491 | cat confdefs.h >>conftest.$ac_ext | ||
3492 | @@ -3844,11 +4018,20 @@ | ||
3493 | _ACEOF | ||
3494 | rm -f conftest.$ac_objext | ||
3495 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3496 | - (eval $ac_compile) 2>&5 | ||
3497 | + (eval $ac_compile) 2>conftest.er1 | ||
3498 | ac_status=$? | ||
3499 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3500 | + rm -f conftest.er1 | ||
3501 | + cat conftest.err >&5 | ||
3502 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3503 | (exit $ac_status); } && | ||
3504 | - { ac_try='test -s conftest.$ac_objext' | ||
3505 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3506 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3507 | + (eval $ac_try) 2>&5 | ||
3508 | + ac_status=$? | ||
3509 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3510 | + (exit $ac_status); }; } && | ||
3511 | + { ac_try='test -s conftest.$ac_objext' | ||
3512 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3513 | (eval $ac_try) 2>&5 | ||
3514 | ac_status=$? | ||
3515 | @@ -3861,12 +4044,11 @@ | ||
3516 | |||
3517 | ac_cv_header_stdc=no | ||
3518 | fi | ||
3519 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3520 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3521 | |||
3522 | if test $ac_cv_header_stdc = yes; then | ||
3523 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
3524 | cat >conftest.$ac_ext <<_ACEOF | ||
3525 | -#line $LINENO "configure" | ||
3526 | /* confdefs.h. */ | ||
3527 | _ACEOF | ||
3528 | cat confdefs.h >>conftest.$ac_ext | ||
3529 | @@ -3888,7 +4070,6 @@ | ||
3530 | if test $ac_cv_header_stdc = yes; then | ||
3531 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
3532 | cat >conftest.$ac_ext <<_ACEOF | ||
3533 | -#line $LINENO "configure" | ||
3534 | /* confdefs.h. */ | ||
3535 | _ACEOF | ||
3536 | cat confdefs.h >>conftest.$ac_ext | ||
3537 | @@ -3913,7 +4094,6 @@ | ||
3538 | : | ||
3539 | else | ||
3540 | cat >conftest.$ac_ext <<_ACEOF | ||
3541 | -#line $LINENO "configure" | ||
3542 | /* confdefs.h. */ | ||
3543 | _ACEOF | ||
3544 | cat confdefs.h >>conftest.$ac_ext | ||
3545 | @@ -3925,9 +4105,9 @@ | ||
3546 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
3547 | #else | ||
3548 | # define ISLOWER(c) \ | ||
3549 | - (('a' <= (c) && (c) <= 'i') \ | ||
3550 | - || ('j' <= (c) && (c) <= 'r') \ | ||
3551 | - || ('s' <= (c) && (c) <= 'z')) | ||
3552 | + (('a' <= (c) && (c) <= 'i') \ | ||
3553 | + || ('j' <= (c) && (c) <= 'r') \ | ||
3554 | + || ('s' <= (c) && (c) <= 'z')) | ||
3555 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
3556 | #endif | ||
3557 | |||
3558 | @@ -3938,7 +4118,7 @@ | ||
3559 | int i; | ||
3560 | for (i = 0; i < 256; i++) | ||
3561 | if (XOR (islower (i), ISLOWER (i)) | ||
3562 | - || toupper (i) != TOUPPER (i)) | ||
3563 | + || toupper (i) != TOUPPER (i)) | ||
3564 | exit(2); | ||
3565 | exit (0); | ||
3566 | } | ||
3567 | @@ -3963,7 +4143,7 @@ | ||
3568 | ( exit $ac_status ) | ||
3569 | ac_cv_header_stdc=no | ||
3570 | fi | ||
3571 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
3572 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
3573 | fi | ||
3574 | fi | ||
3575 | fi | ||
3576 | @@ -3999,7 +4179,6 @@ | ||
3577 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
3578 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
3579 | cat >conftest.$ac_ext <<_ACEOF | ||
3580 | -#line $LINENO "configure" | ||
3581 | /* confdefs.h. */ | ||
3582 | _ACEOF | ||
3583 | cat confdefs.h >>conftest.$ac_ext | ||
3584 | @@ -4010,11 +4189,20 @@ | ||
3585 | _ACEOF | ||
3586 | rm -f conftest.$ac_objext | ||
3587 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3588 | - (eval $ac_compile) 2>&5 | ||
3589 | + (eval $ac_compile) 2>conftest.er1 | ||
3590 | ac_status=$? | ||
3591 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3592 | + rm -f conftest.er1 | ||
3593 | + cat conftest.err >&5 | ||
3594 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3595 | (exit $ac_status); } && | ||
3596 | - { ac_try='test -s conftest.$ac_objext' | ||
3597 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3598 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3599 | + (eval $ac_try) 2>&5 | ||
3600 | + ac_status=$? | ||
3601 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3602 | + (exit $ac_status); }; } && | ||
3603 | + { ac_try='test -s conftest.$ac_objext' | ||
3604 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3605 | (eval $ac_try) 2>&5 | ||
3606 | ac_status=$? | ||
3607 | @@ -4027,7 +4215,7 @@ | ||
3608 | |||
3609 | ac_header_compiler=no | ||
3610 | fi | ||
3611 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3612 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3613 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
3614 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
3615 | |||
3616 | @@ -4035,7 +4223,6 @@ | ||
3617 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
3618 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
3619 | cat >conftest.$ac_ext <<_ACEOF | ||
3620 | -#line $LINENO "configure" | ||
3621 | /* confdefs.h. */ | ||
3622 | _ACEOF | ||
3623 | cat confdefs.h >>conftest.$ac_ext | ||
3624 | @@ -4053,6 +4240,7 @@ | ||
3625 | (exit $ac_status); } >/dev/null; then | ||
3626 | if test -s conftest.err; then | ||
3627 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
3628 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
3629 | else | ||
3630 | ac_cpp_err= | ||
3631 | fi | ||
3632 | @@ -4072,33 +4260,32 @@ | ||
3633 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
3634 | |||
3635 | # So? What about this header? | ||
3636 | -case $ac_header_compiler:$ac_header_preproc in | ||
3637 | - yes:no ) | ||
3638 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
3639 | + yes:no: ) | ||
3640 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
3641 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
3642 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
3643 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
3644 | + ac_header_preproc=yes | ||
3645 | + ;; | ||
3646 | + no:yes:* ) | ||
3647 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
3648 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
3649 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
3650 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
3651 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
3652 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
3653 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
3654 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
3655 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
3656 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
3657 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
3658 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
3659 | ( | ||
3660 | cat <<\_ASBOX | ||
3661 | -## ------------------------------------ ## | ||
3662 | -## Report this to bug-autoconf@gnu.org. ## | ||
3663 | -## ------------------------------------ ## | ||
3664 | -_ASBOX | ||
3665 | - ) | | ||
3666 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
3667 | - ;; | ||
3668 | - no:yes ) | ||
3669 | - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
3670 | -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
3671 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
3672 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
3673 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
3674 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
3675 | - ( | ||
3676 | - cat <<\_ASBOX | ||
3677 | -## ------------------------------------ ## | ||
3678 | -## Report this to bug-autoconf@gnu.org. ## | ||
3679 | -## ------------------------------------ ## | ||
3680 | +## -------------------------------- ## | ||
3681 | +## Report this to bug-patch@gnu.org ## | ||
3682 | +## -------------------------------- ## | ||
3683 | _ASBOX | ||
3684 | ) | | ||
3685 | sed "s/^/$as_me: WARNING: /" >&2 | ||
3686 | @@ -4109,7 +4296,7 @@ | ||
3687 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
3688 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3689 | else | ||
3690 | - eval "$as_ac_Header=$ac_header_preproc" | ||
3691 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
3692 | fi | ||
3693 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
3694 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
3695 | @@ -4131,7 +4318,6 @@ | ||
3696 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3697 | else | ||
3698 | cat >conftest.$ac_ext <<_ACEOF | ||
3699 | -#line $LINENO "configure" | ||
3700 | /* confdefs.h. */ | ||
3701 | _ACEOF | ||
3702 | cat confdefs.h >>conftest.$ac_ext | ||
3703 | @@ -4151,11 +4337,20 @@ | ||
3704 | _ACEOF | ||
3705 | rm -f conftest.$ac_objext | ||
3706 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3707 | - (eval $ac_compile) 2>&5 | ||
3708 | + (eval $ac_compile) 2>conftest.er1 | ||
3709 | ac_status=$? | ||
3710 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3711 | + rm -f conftest.er1 | ||
3712 | + cat conftest.err >&5 | ||
3713 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3714 | (exit $ac_status); } && | ||
3715 | - { ac_try='test -s conftest.$ac_objext' | ||
3716 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3717 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3718 | + (eval $ac_try) 2>&5 | ||
3719 | + ac_status=$? | ||
3720 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3721 | + (exit $ac_status); }; } && | ||
3722 | + { ac_try='test -s conftest.$ac_objext' | ||
3723 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3724 | (eval $ac_try) 2>&5 | ||
3725 | ac_status=$? | ||
3726 | @@ -4168,7 +4363,7 @@ | ||
3727 | |||
3728 | ac_cv_type_mode_t=no | ||
3729 | fi | ||
3730 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3731 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3732 | fi | ||
3733 | echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 | ||
3734 | echo "${ECHO_T}$ac_cv_type_mode_t" >&6 | ||
3735 | @@ -4188,7 +4383,6 @@ | ||
3736 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3737 | else | ||
3738 | cat >conftest.$ac_ext <<_ACEOF | ||
3739 | -#line $LINENO "configure" | ||
3740 | /* confdefs.h. */ | ||
3741 | _ACEOF | ||
3742 | cat confdefs.h >>conftest.$ac_ext | ||
3743 | @@ -4208,11 +4402,20 @@ | ||
3744 | _ACEOF | ||
3745 | rm -f conftest.$ac_objext | ||
3746 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3747 | - (eval $ac_compile) 2>&5 | ||
3748 | + (eval $ac_compile) 2>conftest.er1 | ||
3749 | ac_status=$? | ||
3750 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3751 | + rm -f conftest.er1 | ||
3752 | + cat conftest.err >&5 | ||
3753 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3754 | (exit $ac_status); } && | ||
3755 | - { ac_try='test -s conftest.$ac_objext' | ||
3756 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3757 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3758 | + (eval $ac_try) 2>&5 | ||
3759 | + ac_status=$? | ||
3760 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3761 | + (exit $ac_status); }; } && | ||
3762 | + { ac_try='test -s conftest.$ac_objext' | ||
3763 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3764 | (eval $ac_try) 2>&5 | ||
3765 | ac_status=$? | ||
3766 | @@ -4225,7 +4428,7 @@ | ||
3767 | |||
3768 | ac_cv_type_off_t=no | ||
3769 | fi | ||
3770 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3771 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3772 | fi | ||
3773 | echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 | ||
3774 | echo "${ECHO_T}$ac_cv_type_off_t" >&6 | ||
3775 | @@ -4245,7 +4448,6 @@ | ||
3776 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3777 | else | ||
3778 | cat >conftest.$ac_ext <<_ACEOF | ||
3779 | -#line $LINENO "configure" | ||
3780 | /* confdefs.h. */ | ||
3781 | _ACEOF | ||
3782 | cat confdefs.h >>conftest.$ac_ext | ||
3783 | @@ -4265,11 +4467,20 @@ | ||
3784 | _ACEOF | ||
3785 | rm -f conftest.$ac_objext | ||
3786 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3787 | - (eval $ac_compile) 2>&5 | ||
3788 | + (eval $ac_compile) 2>conftest.er1 | ||
3789 | ac_status=$? | ||
3790 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3791 | + rm -f conftest.er1 | ||
3792 | + cat conftest.err >&5 | ||
3793 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3794 | (exit $ac_status); } && | ||
3795 | - { ac_try='test -s conftest.$ac_objext' | ||
3796 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3797 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3798 | + (eval $ac_try) 2>&5 | ||
3799 | + ac_status=$? | ||
3800 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3801 | + (exit $ac_status); }; } && | ||
3802 | + { ac_try='test -s conftest.$ac_objext' | ||
3803 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3804 | (eval $ac_try) 2>&5 | ||
3805 | ac_status=$? | ||
3806 | @@ -4282,7 +4493,7 @@ | ||
3807 | |||
3808 | ac_cv_type_pid_t=no | ||
3809 | fi | ||
3810 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3811 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3812 | fi | ||
3813 | echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 | ||
3814 | echo "${ECHO_T}$ac_cv_type_pid_t" >&6 | ||
3815 | @@ -4302,7 +4513,6 @@ | ||
3816 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3817 | else | ||
3818 | cat >conftest.$ac_ext <<_ACEOF | ||
3819 | -#line $LINENO "configure" | ||
3820 | /* confdefs.h. */ | ||
3821 | _ACEOF | ||
3822 | cat confdefs.h >>conftest.$ac_ext | ||
3823 | @@ -4329,11 +4539,20 @@ | ||
3824 | _ACEOF | ||
3825 | rm -f conftest.$ac_objext | ||
3826 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3827 | - (eval $ac_compile) 2>&5 | ||
3828 | + (eval $ac_compile) 2>conftest.er1 | ||
3829 | ac_status=$? | ||
3830 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3831 | + rm -f conftest.er1 | ||
3832 | + cat conftest.err >&5 | ||
3833 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3834 | (exit $ac_status); } && | ||
3835 | - { ac_try='test -s conftest.$ac_objext' | ||
3836 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3837 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3838 | + (eval $ac_try) 2>&5 | ||
3839 | + ac_status=$? | ||
3840 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3841 | + (exit $ac_status); }; } && | ||
3842 | + { ac_try='test -s conftest.$ac_objext' | ||
3843 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3844 | (eval $ac_try) 2>&5 | ||
3845 | ac_status=$? | ||
3846 | @@ -4346,7 +4565,7 @@ | ||
3847 | |||
3848 | ac_cv_type_signal=int | ||
3849 | fi | ||
3850 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3851 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3852 | fi | ||
3853 | echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 | ||
3854 | echo "${ECHO_T}$ac_cv_type_signal" >&6 | ||
3855 | @@ -4362,7 +4581,6 @@ | ||
3856 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3857 | else | ||
3858 | cat >conftest.$ac_ext <<_ACEOF | ||
3859 | -#line $LINENO "configure" | ||
3860 | /* confdefs.h. */ | ||
3861 | _ACEOF | ||
3862 | cat confdefs.h >>conftest.$ac_ext | ||
3863 | @@ -4382,11 +4600,20 @@ | ||
3864 | _ACEOF | ||
3865 | rm -f conftest.$ac_objext | ||
3866 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3867 | - (eval $ac_compile) 2>&5 | ||
3868 | + (eval $ac_compile) 2>conftest.er1 | ||
3869 | ac_status=$? | ||
3870 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3871 | + rm -f conftest.er1 | ||
3872 | + cat conftest.err >&5 | ||
3873 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3874 | (exit $ac_status); } && | ||
3875 | - { ac_try='test -s conftest.$ac_objext' | ||
3876 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3877 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3878 | + (eval $ac_try) 2>&5 | ||
3879 | + ac_status=$? | ||
3880 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3881 | + (exit $ac_status); }; } && | ||
3882 | + { ac_try='test -s conftest.$ac_objext' | ||
3883 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3884 | (eval $ac_try) 2>&5 | ||
3885 | ac_status=$? | ||
3886 | @@ -4399,7 +4626,7 @@ | ||
3887 | |||
3888 | ac_cv_type_size_t=no | ||
3889 | fi | ||
3890 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3891 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3892 | fi | ||
3893 | echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 | ||
3894 | echo "${ECHO_T}$ac_cv_type_size_t" >&6 | ||
3895 | @@ -4419,7 +4646,6 @@ | ||
3896 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3897 | else | ||
3898 | cat >conftest.$ac_ext <<_ACEOF | ||
3899 | -#line $LINENO "configure" | ||
3900 | /* confdefs.h. */ | ||
3901 | _ACEOF | ||
3902 | cat confdefs.h >>conftest.$ac_ext | ||
3903 | @@ -4468,11 +4694,20 @@ | ||
3904 | _ACEOF | ||
3905 | rm -f conftest.$ac_objext | ||
3906 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3907 | - (eval $ac_compile) 2>&5 | ||
3908 | + (eval $ac_compile) 2>conftest.er1 | ||
3909 | ac_status=$? | ||
3910 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3911 | + rm -f conftest.er1 | ||
3912 | + cat conftest.err >&5 | ||
3913 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3914 | (exit $ac_status); } && | ||
3915 | - { ac_try='test -s conftest.$ac_objext' | ||
3916 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3917 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3918 | + (eval $ac_try) 2>&5 | ||
3919 | + ac_status=$? | ||
3920 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3921 | + (exit $ac_status); }; } && | ||
3922 | + { ac_try='test -s conftest.$ac_objext' | ||
3923 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3924 | (eval $ac_try) 2>&5 | ||
3925 | ac_status=$? | ||
3926 | @@ -4485,7 +4720,7 @@ | ||
3927 | |||
3928 | ac_cv_header_stdbool_h=no | ||
3929 | fi | ||
3930 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3931 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3932 | fi | ||
3933 | echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 | ||
3934 | echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 | ||
3935 | @@ -4495,7 +4730,6 @@ | ||
3936 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3937 | else | ||
3938 | cat >conftest.$ac_ext <<_ACEOF | ||
3939 | -#line $LINENO "configure" | ||
3940 | /* confdefs.h. */ | ||
3941 | _ACEOF | ||
3942 | cat confdefs.h >>conftest.$ac_ext | ||
3943 | @@ -4515,11 +4749,20 @@ | ||
3944 | _ACEOF | ||
3945 | rm -f conftest.$ac_objext | ||
3946 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3947 | - (eval $ac_compile) 2>&5 | ||
3948 | + (eval $ac_compile) 2>conftest.er1 | ||
3949 | ac_status=$? | ||
3950 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3951 | + rm -f conftest.er1 | ||
3952 | + cat conftest.err >&5 | ||
3953 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3954 | (exit $ac_status); } && | ||
3955 | - { ac_try='test -s conftest.$ac_objext' | ||
3956 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3957 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3958 | + (eval $ac_try) 2>&5 | ||
3959 | + ac_status=$? | ||
3960 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3961 | + (exit $ac_status); }; } && | ||
3962 | + { ac_try='test -s conftest.$ac_objext' | ||
3963 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3964 | (eval $ac_try) 2>&5 | ||
3965 | ac_status=$? | ||
3966 | @@ -4532,7 +4775,7 @@ | ||
3967 | |||
3968 | ac_cv_type__Bool=no | ||
3969 | fi | ||
3970 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3971 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3972 | fi | ||
3973 | echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 | ||
3974 | echo "${ECHO_T}$ac_cv_type__Bool" >&6 | ||
3975 | @@ -4589,7 +4832,6 @@ | ||
3976 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
3977 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
3978 | cat >conftest.$ac_ext <<_ACEOF | ||
3979 | -#line $LINENO "configure" | ||
3980 | /* confdefs.h. */ | ||
3981 | _ACEOF | ||
3982 | cat confdefs.h >>conftest.$ac_ext | ||
3983 | @@ -4600,11 +4842,20 @@ | ||
3984 | _ACEOF | ||
3985 | rm -f conftest.$ac_objext | ||
3986 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3987 | - (eval $ac_compile) 2>&5 | ||
3988 | + (eval $ac_compile) 2>conftest.er1 | ||
3989 | ac_status=$? | ||
3990 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3991 | + rm -f conftest.er1 | ||
3992 | + cat conftest.err >&5 | ||
3993 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3994 | (exit $ac_status); } && | ||
3995 | - { ac_try='test -s conftest.$ac_objext' | ||
3996 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3997 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3998 | + (eval $ac_try) 2>&5 | ||
3999 | + ac_status=$? | ||
4000 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4001 | + (exit $ac_status); }; } && | ||
4002 | + { ac_try='test -s conftest.$ac_objext' | ||
4003 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4004 | (eval $ac_try) 2>&5 | ||
4005 | ac_status=$? | ||
4006 | @@ -4617,7 +4868,7 @@ | ||
4007 | |||
4008 | ac_header_compiler=no | ||
4009 | fi | ||
4010 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4011 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4012 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4013 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4014 | |||
4015 | @@ -4625,7 +4876,6 @@ | ||
4016 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4017 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4018 | cat >conftest.$ac_ext <<_ACEOF | ||
4019 | -#line $LINENO "configure" | ||
4020 | /* confdefs.h. */ | ||
4021 | _ACEOF | ||
4022 | cat confdefs.h >>conftest.$ac_ext | ||
4023 | @@ -4643,6 +4893,7 @@ | ||
4024 | (exit $ac_status); } >/dev/null; then | ||
4025 | if test -s conftest.err; then | ||
4026 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4027 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4028 | else | ||
4029 | ac_cpp_err= | ||
4030 | fi | ||
4031 | @@ -4662,33 +4913,32 @@ | ||
4032 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4033 | |||
4034 | # So? What about this header? | ||
4035 | -case $ac_header_compiler:$ac_header_preproc in | ||
4036 | - yes:no ) | ||
4037 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4038 | + yes:no: ) | ||
4039 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4040 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4041 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4042 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4043 | - ( | ||
4044 | - cat <<\_ASBOX | ||
4045 | -## ------------------------------------ ## | ||
4046 | -## Report this to bug-autoconf@gnu.org. ## | ||
4047 | -## ------------------------------------ ## | ||
4048 | -_ASBOX | ||
4049 | - ) | | ||
4050 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4051 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4052 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4053 | + ac_header_preproc=yes | ||
4054 | ;; | ||
4055 | - no:yes ) | ||
4056 | + no:yes:* ) | ||
4057 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4058 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4059 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4060 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
4064 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4065 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4066 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4067 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4068 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4069 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4070 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4071 | ( | ||
4072 | cat <<\_ASBOX | ||
4073 | -## ------------------------------------ ## | ||
4074 | -## Report this to bug-autoconf@gnu.org. ## | ||
4075 | -## ------------------------------------ ## | ||
4076 | +## -------------------------------- ## | ||
4077 | +## Report this to bug-patch@gnu.org ## | ||
4078 | +## -------------------------------- ## | ||
4079 | _ASBOX | ||
4080 | ) | | ||
4081 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4082 | @@ -4699,7 +4949,7 @@ | ||
4083 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4084 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4085 | else | ||
4086 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4087 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4088 | fi | ||
4089 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4090 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4091 | @@ -4733,7 +4983,6 @@ | ||
4092 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4093 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4094 | cat >conftest.$ac_ext <<_ACEOF | ||
4095 | -#line $LINENO "configure" | ||
4096 | /* confdefs.h. */ | ||
4097 | _ACEOF | ||
4098 | cat confdefs.h >>conftest.$ac_ext | ||
4099 | @@ -4744,11 +4993,20 @@ | ||
4100 | _ACEOF | ||
4101 | rm -f conftest.$ac_objext | ||
4102 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4103 | - (eval $ac_compile) 2>&5 | ||
4104 | + (eval $ac_compile) 2>conftest.er1 | ||
4105 | ac_status=$? | ||
4106 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4107 | + rm -f conftest.er1 | ||
4108 | + cat conftest.err >&5 | ||
4109 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4110 | (exit $ac_status); } && | ||
4111 | - { ac_try='test -s conftest.$ac_objext' | ||
4112 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4113 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4114 | + (eval $ac_try) 2>&5 | ||
4115 | + ac_status=$? | ||
4116 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4117 | + (exit $ac_status); }; } && | ||
4118 | + { ac_try='test -s conftest.$ac_objext' | ||
4119 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4120 | (eval $ac_try) 2>&5 | ||
4121 | ac_status=$? | ||
4122 | @@ -4761,7 +5019,7 @@ | ||
4123 | |||
4124 | ac_header_compiler=no | ||
4125 | fi | ||
4126 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4127 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4128 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4129 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4130 | |||
4131 | @@ -4769,7 +5027,6 @@ | ||
4132 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4133 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4134 | cat >conftest.$ac_ext <<_ACEOF | ||
4135 | -#line $LINENO "configure" | ||
4136 | /* confdefs.h. */ | ||
4137 | _ACEOF | ||
4138 | cat confdefs.h >>conftest.$ac_ext | ||
4139 | @@ -4787,6 +5044,7 @@ | ||
4140 | (exit $ac_status); } >/dev/null; then | ||
4141 | if test -s conftest.err; then | ||
4142 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4143 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4144 | else | ||
4145 | ac_cpp_err= | ||
4146 | fi | ||
4147 | @@ -4806,33 +5064,32 @@ | ||
4148 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4149 | |||
4150 | # So? What about this header? | ||
4151 | -case $ac_header_compiler:$ac_header_preproc in | ||
4152 | - yes:no ) | ||
4153 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4154 | + yes:no: ) | ||
4155 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4156 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4157 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4158 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4159 | - ( | ||
4160 | - cat <<\_ASBOX | ||
4161 | -## ------------------------------------ ## | ||
4162 | -## Report this to bug-autoconf@gnu.org. ## | ||
4163 | -## ------------------------------------ ## | ||
4164 | -_ASBOX | ||
4165 | - ) | | ||
4166 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4167 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4168 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4169 | + ac_header_preproc=yes | ||
4170 | ;; | ||
4171 | - no:yes ) | ||
4172 | + no:yes:* ) | ||
4173 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4174 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4175 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4176 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
4180 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4181 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4182 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4183 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4184 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4185 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4186 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4187 | ( | ||
4188 | cat <<\_ASBOX | ||
4189 | -## ------------------------------------ ## | ||
4190 | -## Report this to bug-autoconf@gnu.org. ## | ||
4191 | -## ------------------------------------ ## | ||
4192 | +## -------------------------------- ## | ||
4193 | +## Report this to bug-patch@gnu.org ## | ||
4194 | +## -------------------------------- ## | ||
4195 | _ASBOX | ||
4196 | ) | | ||
4197 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4198 | @@ -4843,7 +5100,7 @@ | ||
4199 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4200 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4201 | else | ||
4202 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4203 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4204 | fi | ||
4205 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4206 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4207 | @@ -4865,7 +5122,6 @@ | ||
4208 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4209 | else | ||
4210 | cat >conftest.$ac_ext <<_ACEOF | ||
4211 | -#line $LINENO "configure" | ||
4212 | /* confdefs.h. */ | ||
4213 | _ACEOF | ||
4214 | cat confdefs.h >>conftest.$ac_ext | ||
4215 | @@ -4886,11 +5142,20 @@ | ||
4216 | _ACEOF | ||
4217 | rm -f conftest.$ac_objext | ||
4218 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4219 | - (eval $ac_compile) 2>&5 | ||
4220 | + (eval $ac_compile) 2>conftest.er1 | ||
4221 | ac_status=$? | ||
4222 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4223 | + rm -f conftest.er1 | ||
4224 | + cat conftest.err >&5 | ||
4225 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4226 | (exit $ac_status); } && | ||
4227 | - { ac_try='test -s conftest.$ac_objext' | ||
4228 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4229 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4230 | + (eval $ac_try) 2>&5 | ||
4231 | + ac_status=$? | ||
4232 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4233 | + (exit $ac_status); }; } && | ||
4234 | + { ac_try='test -s conftest.$ac_objext' | ||
4235 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4236 | (eval $ac_try) 2>&5 | ||
4237 | ac_status=$? | ||
4238 | @@ -4903,7 +5168,7 @@ | ||
4239 | |||
4240 | ac_cv_header_time=no | ||
4241 | fi | ||
4242 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4243 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4244 | fi | ||
4245 | echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 | ||
4246 | echo "${ECHO_T}$ac_cv_header_time" >&6 | ||
4247 | @@ -4933,7 +5198,6 @@ | ||
4248 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4249 | else | ||
4250 | cat >conftest.$ac_ext <<_ACEOF | ||
4251 | -#line $LINENO "configure" | ||
4252 | /* confdefs.h. */ | ||
4253 | _ACEOF | ||
4254 | cat confdefs.h >>conftest.$ac_ext | ||
4255 | @@ -4964,11 +5228,20 @@ | ||
4256 | _ACEOF | ||
4257 | rm -f conftest.$ac_objext | ||
4258 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4259 | - (eval $ac_compile) 2>&5 | ||
4260 | + (eval $ac_compile) 2>conftest.er1 | ||
4261 | ac_status=$? | ||
4262 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4263 | + rm -f conftest.er1 | ||
4264 | + cat conftest.err >&5 | ||
4265 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4266 | (exit $ac_status); } && | ||
4267 | - { ac_try='test -s conftest.$ac_objext' | ||
4268 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4269 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4270 | + (eval $ac_try) 2>&5 | ||
4271 | + ac_status=$? | ||
4272 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4273 | + (exit $ac_status); }; } && | ||
4274 | + { ac_try='test -s conftest.$ac_objext' | ||
4275 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4276 | (eval $ac_try) 2>&5 | ||
4277 | ac_status=$? | ||
4278 | @@ -4981,7 +5254,7 @@ | ||
4279 | |||
4280 | fu_cv_sys_struct_utimbuf=no | ||
4281 | fi | ||
4282 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4283 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4284 | |||
4285 | fi | ||
4286 | echo "$as_me:$LINENO: result: $fu_cv_sys_struct_utimbuf" >&5 | ||
4287 | @@ -5005,7 +5278,6 @@ | ||
4288 | ac_cv_func_closedir_void=yes | ||
4289 | else | ||
4290 | cat >conftest.$ac_ext <<_ACEOF | ||
4291 | -#line $LINENO "configure" | ||
4292 | /* confdefs.h. */ | ||
4293 | _ACEOF | ||
4294 | cat confdefs.h >>conftest.$ac_ext | ||
4295 | @@ -5045,7 +5317,7 @@ | ||
4296 | ( exit $ac_status ) | ||
4297 | ac_cv_func_closedir_void=yes | ||
4298 | fi | ||
4299 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4300 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4301 | fi | ||
4302 | fi | ||
4303 | echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 | ||
4304 | @@ -5076,7 +5348,6 @@ | ||
4305 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4306 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4307 | cat >conftest.$ac_ext <<_ACEOF | ||
4308 | -#line $LINENO "configure" | ||
4309 | /* confdefs.h. */ | ||
4310 | _ACEOF | ||
4311 | cat confdefs.h >>conftest.$ac_ext | ||
4312 | @@ -5087,11 +5358,20 @@ | ||
4313 | _ACEOF | ||
4314 | rm -f conftest.$ac_objext | ||
4315 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4316 | - (eval $ac_compile) 2>&5 | ||
4317 | + (eval $ac_compile) 2>conftest.er1 | ||
4318 | ac_status=$? | ||
4319 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4320 | + rm -f conftest.er1 | ||
4321 | + cat conftest.err >&5 | ||
4322 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4323 | (exit $ac_status); } && | ||
4324 | - { ac_try='test -s conftest.$ac_objext' | ||
4325 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4326 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4327 | + (eval $ac_try) 2>&5 | ||
4328 | + ac_status=$? | ||
4329 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4330 | + (exit $ac_status); }; } && | ||
4331 | + { ac_try='test -s conftest.$ac_objext' | ||
4332 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4333 | (eval $ac_try) 2>&5 | ||
4334 | ac_status=$? | ||
4335 | @@ -5104,7 +5384,7 @@ | ||
4336 | |||
4337 | ac_header_compiler=no | ||
4338 | fi | ||
4339 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4340 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4341 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4342 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4343 | |||
4344 | @@ -5112,7 +5392,6 @@ | ||
4345 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4346 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4347 | cat >conftest.$ac_ext <<_ACEOF | ||
4348 | -#line $LINENO "configure" | ||
4349 | /* confdefs.h. */ | ||
4350 | _ACEOF | ||
4351 | cat confdefs.h >>conftest.$ac_ext | ||
4352 | @@ -5130,6 +5409,7 @@ | ||
4353 | (exit $ac_status); } >/dev/null; then | ||
4354 | if test -s conftest.err; then | ||
4355 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4356 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4357 | else | ||
4358 | ac_cpp_err= | ||
4359 | fi | ||
4360 | @@ -5149,33 +5429,32 @@ | ||
4361 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4362 | |||
4363 | # So? What about this header? | ||
4364 | -case $ac_header_compiler:$ac_header_preproc in | ||
4365 | - yes:no ) | ||
4366 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4367 | + yes:no: ) | ||
4368 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4369 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4370 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4371 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4372 | - ( | ||
4373 | - cat <<\_ASBOX | ||
4374 | -## ------------------------------------ ## | ||
4375 | -## Report this to bug-autoconf@gnu.org. ## | ||
4376 | -## ------------------------------------ ## | ||
4377 | -_ASBOX | ||
4378 | - ) | | ||
4379 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4380 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4381 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4382 | + ac_header_preproc=yes | ||
4383 | ;; | ||
4384 | - no:yes ) | ||
4385 | + no:yes:* ) | ||
4386 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4387 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4388 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4389 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
4393 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4394 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4395 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4396 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4397 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4398 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4399 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4400 | ( | ||
4401 | cat <<\_ASBOX | ||
4402 | -## ------------------------------------ ## | ||
4403 | -## Report this to bug-autoconf@gnu.org. ## | ||
4404 | -## ------------------------------------ ## | ||
4405 | +## -------------------------------- ## | ||
4406 | +## Report this to bug-patch@gnu.org ## | ||
4407 | +## -------------------------------- ## | ||
4408 | _ASBOX | ||
4409 | ) | | ||
4410 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4411 | @@ -5186,7 +5465,7 @@ | ||
4412 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4413 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4414 | else | ||
4415 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4416 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4417 | fi | ||
4418 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4419 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4420 | @@ -5220,7 +5499,6 @@ | ||
4421 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4422 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4423 | cat >conftest.$ac_ext <<_ACEOF | ||
4424 | -#line $LINENO "configure" | ||
4425 | /* confdefs.h. */ | ||
4426 | _ACEOF | ||
4427 | cat confdefs.h >>conftest.$ac_ext | ||
4428 | @@ -5231,11 +5509,20 @@ | ||
4429 | _ACEOF | ||
4430 | rm -f conftest.$ac_objext | ||
4431 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4432 | - (eval $ac_compile) 2>&5 | ||
4433 | + (eval $ac_compile) 2>conftest.er1 | ||
4434 | ac_status=$? | ||
4435 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4436 | + rm -f conftest.er1 | ||
4437 | + cat conftest.err >&5 | ||
4438 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4439 | (exit $ac_status); } && | ||
4440 | - { ac_try='test -s conftest.$ac_objext' | ||
4441 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4442 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4443 | + (eval $ac_try) 2>&5 | ||
4444 | + ac_status=$? | ||
4445 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4446 | + (exit $ac_status); }; } && | ||
4447 | + { ac_try='test -s conftest.$ac_objext' | ||
4448 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4449 | (eval $ac_try) 2>&5 | ||
4450 | ac_status=$? | ||
4451 | @@ -5248,7 +5535,7 @@ | ||
4452 | |||
4453 | ac_header_compiler=no | ||
4454 | fi | ||
4455 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4456 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4457 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4458 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4459 | |||
4460 | @@ -5256,7 +5543,6 @@ | ||
4461 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4462 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4463 | cat >conftest.$ac_ext <<_ACEOF | ||
4464 | -#line $LINENO "configure" | ||
4465 | /* confdefs.h. */ | ||
4466 | _ACEOF | ||
4467 | cat confdefs.h >>conftest.$ac_ext | ||
4468 | @@ -5274,6 +5560,7 @@ | ||
4469 | (exit $ac_status); } >/dev/null; then | ||
4470 | if test -s conftest.err; then | ||
4471 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4472 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4473 | else | ||
4474 | ac_cpp_err= | ||
4475 | fi | ||
4476 | @@ -5293,33 +5580,32 @@ | ||
4477 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4478 | |||
4479 | # So? What about this header? | ||
4480 | -case $ac_header_compiler:$ac_header_preproc in | ||
4481 | - yes:no ) | ||
4482 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4483 | + yes:no: ) | ||
4484 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4485 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4486 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4487 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4488 | - ( | ||
4489 | - cat <<\_ASBOX | ||
4490 | -## ------------------------------------ ## | ||
4491 | -## Report this to bug-autoconf@gnu.org. ## | ||
4492 | -## ------------------------------------ ## | ||
4493 | -_ASBOX | ||
4494 | - ) | | ||
4495 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4496 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4497 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4498 | + ac_header_preproc=yes | ||
4499 | ;; | ||
4500 | - no:yes ) | ||
4501 | + no:yes:* ) | ||
4502 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4503 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4504 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4505 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
4509 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4510 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4511 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4512 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4513 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4514 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4515 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4516 | ( | ||
4517 | cat <<\_ASBOX | ||
4518 | -## ------------------------------------ ## | ||
4519 | -## Report this to bug-autoconf@gnu.org. ## | ||
4520 | -## ------------------------------------ ## | ||
4521 | +## -------------------------------- ## | ||
4522 | +## Report this to bug-patch@gnu.org ## | ||
4523 | +## -------------------------------- ## | ||
4524 | _ASBOX | ||
4525 | ) | | ||
4526 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4527 | @@ -5330,7 +5616,7 @@ | ||
4528 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4529 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4530 | else | ||
4531 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4532 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4533 | fi | ||
4534 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4535 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4536 | @@ -5364,7 +5650,6 @@ | ||
4537 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4538 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4539 | cat >conftest.$ac_ext <<_ACEOF | ||
4540 | -#line $LINENO "configure" | ||
4541 | /* confdefs.h. */ | ||
4542 | _ACEOF | ||
4543 | cat confdefs.h >>conftest.$ac_ext | ||
4544 | @@ -5375,11 +5660,20 @@ | ||
4545 | _ACEOF | ||
4546 | rm -f conftest.$ac_objext | ||
4547 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4548 | - (eval $ac_compile) 2>&5 | ||
4549 | + (eval $ac_compile) 2>conftest.er1 | ||
4550 | ac_status=$? | ||
4551 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4552 | + rm -f conftest.er1 | ||
4553 | + cat conftest.err >&5 | ||
4554 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4555 | (exit $ac_status); } && | ||
4556 | - { ac_try='test -s conftest.$ac_objext' | ||
4557 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4558 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4559 | + (eval $ac_try) 2>&5 | ||
4560 | + ac_status=$? | ||
4561 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4562 | + (exit $ac_status); }; } && | ||
4563 | + { ac_try='test -s conftest.$ac_objext' | ||
4564 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4565 | (eval $ac_try) 2>&5 | ||
4566 | ac_status=$? | ||
4567 | @@ -5392,7 +5686,7 @@ | ||
4568 | |||
4569 | ac_header_compiler=no | ||
4570 | fi | ||
4571 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4572 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4573 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4574 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4575 | |||
4576 | @@ -5400,7 +5694,6 @@ | ||
4577 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4578 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4579 | cat >conftest.$ac_ext <<_ACEOF | ||
4580 | -#line $LINENO "configure" | ||
4581 | /* confdefs.h. */ | ||
4582 | _ACEOF | ||
4583 | cat confdefs.h >>conftest.$ac_ext | ||
4584 | @@ -5418,6 +5711,7 @@ | ||
4585 | (exit $ac_status); } >/dev/null; then | ||
4586 | if test -s conftest.err; then | ||
4587 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4588 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4589 | else | ||
4590 | ac_cpp_err= | ||
4591 | fi | ||
4592 | @@ -5437,33 +5731,32 @@ | ||
4593 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4594 | |||
4595 | # So? What about this header? | ||
4596 | -case $ac_header_compiler:$ac_header_preproc in | ||
4597 | - yes:no ) | ||
4598 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4599 | + yes:no: ) | ||
4600 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4601 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4602 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4603 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4604 | - ( | ||
4605 | - cat <<\_ASBOX | ||
4606 | -## ------------------------------------ ## | ||
4607 | -## Report this to bug-autoconf@gnu.org. ## | ||
4608 | -## ------------------------------------ ## | ||
4609 | -_ASBOX | ||
4610 | - ) | | ||
4611 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4612 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4613 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4614 | + ac_header_preproc=yes | ||
4615 | ;; | ||
4616 | - no:yes ) | ||
4617 | + no:yes:* ) | ||
4618 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4619 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4620 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4621 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
4625 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4626 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4627 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4628 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4629 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4630 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4631 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4632 | ( | ||
4633 | cat <<\_ASBOX | ||
4634 | -## ------------------------------------ ## | ||
4635 | -## Report this to bug-autoconf@gnu.org. ## | ||
4636 | -## ------------------------------------ ## | ||
4637 | +## -------------------------------- ## | ||
4638 | +## Report this to bug-patch@gnu.org ## | ||
4639 | +## -------------------------------- ## | ||
4640 | _ASBOX | ||
4641 | ) | | ||
4642 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4643 | @@ -5474,7 +5767,7 @@ | ||
4644 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4645 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4646 | else | ||
4647 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4648 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4649 | fi | ||
4650 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4651 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4652 | @@ -5497,7 +5790,6 @@ | ||
4653 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4654 | else | ||
4655 | cat >conftest.$ac_ext <<_ACEOF | ||
4656 | -#line $LINENO "configure" | ||
4657 | /* confdefs.h. */ | ||
4658 | _ACEOF | ||
4659 | cat confdefs.h >>conftest.$ac_ext | ||
4660 | @@ -5517,11 +5809,20 @@ | ||
4661 | _ACEOF | ||
4662 | rm -f conftest.$ac_objext | ||
4663 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4664 | - (eval $ac_compile) 2>&5 | ||
4665 | + (eval $ac_compile) 2>conftest.er1 | ||
4666 | ac_status=$? | ||
4667 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4668 | + rm -f conftest.er1 | ||
4669 | + cat conftest.err >&5 | ||
4670 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4671 | (exit $ac_status); } && | ||
4672 | - { ac_try='test -s conftest.$ac_objext' | ||
4673 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4674 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4675 | + (eval $ac_try) 2>&5 | ||
4676 | + ac_status=$? | ||
4677 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4678 | + (exit $ac_status); }; } && | ||
4679 | + { ac_try='test -s conftest.$ac_objext' | ||
4680 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4681 | (eval $ac_try) 2>&5 | ||
4682 | ac_status=$? | ||
4683 | @@ -5534,7 +5835,7 @@ | ||
4684 | |||
4685 | ac_cv_have_decl_getenv=no | ||
4686 | fi | ||
4687 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4688 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4689 | fi | ||
4690 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5 | ||
4691 | echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6 | ||
4692 | @@ -5562,7 +5863,6 @@ | ||
4693 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4694 | else | ||
4695 | cat >conftest.$ac_ext <<_ACEOF | ||
4696 | -#line $LINENO "configure" | ||
4697 | /* confdefs.h. */ | ||
4698 | _ACEOF | ||
4699 | cat confdefs.h >>conftest.$ac_ext | ||
4700 | @@ -5582,11 +5882,20 @@ | ||
4701 | _ACEOF | ||
4702 | rm -f conftest.$ac_objext | ||
4703 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4704 | - (eval $ac_compile) 2>&5 | ||
4705 | + (eval $ac_compile) 2>conftest.er1 | ||
4706 | ac_status=$? | ||
4707 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4708 | + rm -f conftest.er1 | ||
4709 | + cat conftest.err >&5 | ||
4710 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4711 | (exit $ac_status); } && | ||
4712 | - { ac_try='test -s conftest.$ac_objext' | ||
4713 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4714 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4715 | + (eval $ac_try) 2>&5 | ||
4716 | + ac_status=$? | ||
4717 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4718 | + (exit $ac_status); }; } && | ||
4719 | + { ac_try='test -s conftest.$ac_objext' | ||
4720 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4721 | (eval $ac_try) 2>&5 | ||
4722 | ac_status=$? | ||
4723 | @@ -5599,7 +5908,7 @@ | ||
4724 | |||
4725 | ac_cv_have_decl_malloc=no | ||
4726 | fi | ||
4727 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4728 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4729 | fi | ||
4730 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_malloc" >&5 | ||
4731 | echo "${ECHO_T}$ac_cv_have_decl_malloc" >&6 | ||
4732 | @@ -5628,7 +5937,6 @@ | ||
4733 | else | ||
4734 | |||
4735 | cat >conftest.$ac_ext <<_ACEOF | ||
4736 | -#line $LINENO "configure" | ||
4737 | /* confdefs.h. */ | ||
4738 | _ACEOF | ||
4739 | cat confdefs.h >>conftest.$ac_ext | ||
4740 | @@ -5647,11 +5955,20 @@ | ||
4741 | _ACEOF | ||
4742 | rm -f conftest.$ac_objext | ||
4743 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4744 | - (eval $ac_compile) 2>&5 | ||
4745 | + (eval $ac_compile) 2>conftest.er1 | ||
4746 | ac_status=$? | ||
4747 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4748 | + rm -f conftest.er1 | ||
4749 | + cat conftest.err >&5 | ||
4750 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4751 | (exit $ac_status); } && | ||
4752 | - { ac_try='test -s conftest.$ac_objext' | ||
4753 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4754 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4755 | + (eval $ac_try) 2>&5 | ||
4756 | + ac_status=$? | ||
4757 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4758 | + (exit $ac_status); }; } && | ||
4759 | + { ac_try='test -s conftest.$ac_objext' | ||
4760 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4761 | (eval $ac_try) 2>&5 | ||
4762 | ac_status=$? | ||
4763 | @@ -5664,7 +5981,7 @@ | ||
4764 | |||
4765 | ac_cv_win_or_dos=no | ||
4766 | fi | ||
4767 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4768 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4769 | |||
4770 | fi | ||
4771 | echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 | ||
4772 | @@ -5714,7 +6031,6 @@ | ||
4773 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4774 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4775 | cat >conftest.$ac_ext <<_ACEOF | ||
4776 | -#line $LINENO "configure" | ||
4777 | /* confdefs.h. */ | ||
4778 | _ACEOF | ||
4779 | cat confdefs.h >>conftest.$ac_ext | ||
4780 | @@ -5725,11 +6041,20 @@ | ||
4781 | _ACEOF | ||
4782 | rm -f conftest.$ac_objext | ||
4783 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4784 | - (eval $ac_compile) 2>&5 | ||
4785 | + (eval $ac_compile) 2>conftest.er1 | ||
4786 | ac_status=$? | ||
4787 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4788 | + rm -f conftest.er1 | ||
4789 | + cat conftest.err >&5 | ||
4790 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4791 | (exit $ac_status); } && | ||
4792 | - { ac_try='test -s conftest.$ac_objext' | ||
4793 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4794 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4795 | + (eval $ac_try) 2>&5 | ||
4796 | + ac_status=$? | ||
4797 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4798 | + (exit $ac_status); }; } && | ||
4799 | + { ac_try='test -s conftest.$ac_objext' | ||
4800 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4801 | (eval $ac_try) 2>&5 | ||
4802 | ac_status=$? | ||
4803 | @@ -5742,7 +6067,7 @@ | ||
4804 | |||
4805 | ac_header_compiler=no | ||
4806 | fi | ||
4807 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4808 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4809 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4810 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4811 | |||
4812 | @@ -5750,7 +6075,6 @@ | ||
4813 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4814 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4815 | cat >conftest.$ac_ext <<_ACEOF | ||
4816 | -#line $LINENO "configure" | ||
4817 | /* confdefs.h. */ | ||
4818 | _ACEOF | ||
4819 | cat confdefs.h >>conftest.$ac_ext | ||
4820 | @@ -5768,6 +6092,7 @@ | ||
4821 | (exit $ac_status); } >/dev/null; then | ||
4822 | if test -s conftest.err; then | ||
4823 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
4824 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4825 | else | ||
4826 | ac_cpp_err= | ||
4827 | fi | ||
4828 | @@ -5787,33 +6112,32 @@ | ||
4829 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4830 | |||
4831 | # So? What about this header? | ||
4832 | -case $ac_header_compiler:$ac_header_preproc in | ||
4833 | - yes:no ) | ||
4834 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4835 | + yes:no: ) | ||
4836 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4837 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4838 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4839 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4840 | - ( | ||
4841 | - cat <<\_ASBOX | ||
4842 | -## ------------------------------------ ## | ||
4843 | -## Report this to bug-autoconf@gnu.org. ## | ||
4844 | -## ------------------------------------ ## | ||
4845 | -_ASBOX | ||
4846 | - ) | | ||
4847 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4848 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
4849 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
4850 | + ac_header_preproc=yes | ||
4851 | ;; | ||
4852 | - no:yes ) | ||
4853 | + no:yes:* ) | ||
4854 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
4855 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
4856 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
4857 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
4861 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
4862 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
4863 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
4864 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
4865 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4866 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4867 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4868 | ( | ||
4869 | cat <<\_ASBOX | ||
4870 | -## ------------------------------------ ## | ||
4871 | -## Report this to bug-autoconf@gnu.org. ## | ||
4872 | -## ------------------------------------ ## | ||
4873 | +## -------------------------------- ## | ||
4874 | +## Report this to bug-patch@gnu.org ## | ||
4875 | +## -------------------------------- ## | ||
4876 | _ASBOX | ||
4877 | ) | | ||
4878 | sed "s/^/$as_me: WARNING: /" >&2 | ||
4879 | @@ -5824,7 +6148,7 @@ | ||
4880 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4881 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4882 | else | ||
4883 | - eval "$as_ac_Header=$ac_header_preproc" | ||
4884 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
4885 | fi | ||
4886 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4887 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4888 | @@ -5872,7 +6196,6 @@ | ||
4889 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4890 | else | ||
4891 | cat >conftest.$ac_ext <<_ACEOF | ||
4892 | -#line $LINENO "configure" | ||
4893 | /* confdefs.h. */ | ||
4894 | _ACEOF | ||
4895 | cat confdefs.h >>conftest.$ac_ext | ||
4896 | @@ -5905,11 +6228,20 @@ | ||
4897 | _ACEOF | ||
4898 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4899 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
4900 | - (eval $ac_link) 2>&5 | ||
4901 | + (eval $ac_link) 2>conftest.er1 | ||
4902 | ac_status=$? | ||
4903 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4904 | + rm -f conftest.er1 | ||
4905 | + cat conftest.err >&5 | ||
4906 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4907 | (exit $ac_status); } && | ||
4908 | - { ac_try='test -s conftest$ac_exeext' | ||
4909 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4910 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4911 | + (eval $ac_try) 2>&5 | ||
4912 | + ac_status=$? | ||
4913 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4914 | + (exit $ac_status); }; } && | ||
4915 | + { ac_try='test -s conftest$ac_exeext' | ||
4916 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4917 | (eval $ac_try) 2>&5 | ||
4918 | ac_status=$? | ||
4919 | @@ -5922,7 +6254,8 @@ | ||
4920 | |||
4921 | jm_cv_struct_dirent_d_ino=no | ||
4922 | fi | ||
4923 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
4924 | +rm -f conftest.err conftest.$ac_objext \ | ||
4925 | + conftest$ac_exeext conftest.$ac_ext | ||
4926 | |||
4927 | |||
4928 | fi | ||
4929 | @@ -6011,21 +6344,28 @@ | ||
4930 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4931 | else | ||
4932 | cat >conftest.$ac_ext <<_ACEOF | ||
4933 | -#line $LINENO "configure" | ||
4934 | /* confdefs.h. */ | ||
4935 | _ACEOF | ||
4936 | cat confdefs.h >>conftest.$ac_ext | ||
4937 | cat >>conftest.$ac_ext <<_ACEOF | ||
4938 | /* end confdefs.h. */ | ||
4939 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
4940 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
4941 | +#define $ac_func innocuous_$ac_func | ||
4942 | + | ||
4943 | /* System header to define __stub macros and hopefully few prototypes, | ||
4944 | which can conflict with char $ac_func (); below. | ||
4945 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
4946 | <limits.h> exists even on freestanding compilers. */ | ||
4947 | + | ||
4948 | #ifdef __STDC__ | ||
4949 | # include <limits.h> | ||
4950 | #else | ||
4951 | # include <assert.h> | ||
4952 | #endif | ||
4953 | + | ||
4954 | +#undef $ac_func | ||
4955 | + | ||
4956 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4957 | #ifdef __cplusplus | ||
4958 | extern "C" | ||
4959 | @@ -6056,11 +6396,20 @@ | ||
4960 | _ACEOF | ||
4961 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4962 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
4963 | - (eval $ac_link) 2>&5 | ||
4964 | + (eval $ac_link) 2>conftest.er1 | ||
4965 | ac_status=$? | ||
4966 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4967 | + rm -f conftest.er1 | ||
4968 | + cat conftest.err >&5 | ||
4969 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4970 | (exit $ac_status); } && | ||
4971 | - { ac_try='test -s conftest$ac_exeext' | ||
4972 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4973 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4974 | + (eval $ac_try) 2>&5 | ||
4975 | + ac_status=$? | ||
4976 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4977 | + (exit $ac_status); }; } && | ||
4978 | + { ac_try='test -s conftest$ac_exeext' | ||
4979 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4980 | (eval $ac_try) 2>&5 | ||
4981 | ac_status=$? | ||
4982 | @@ -6073,7 +6422,8 @@ | ||
4983 | |||
4984 | eval "$as_ac_var=no" | ||
4985 | fi | ||
4986 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
4987 | +rm -f conftest.err conftest.$ac_objext \ | ||
4988 | + conftest$ac_exeext conftest.$ac_ext | ||
4989 | fi | ||
4990 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
4991 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
4992 | @@ -6126,21 +6476,28 @@ | ||
4993 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4994 | else | ||
4995 | cat >conftest.$ac_ext <<_ACEOF | ||
4996 | -#line $LINENO "configure" | ||
4997 | /* confdefs.h. */ | ||
4998 | _ACEOF | ||
4999 | cat confdefs.h >>conftest.$ac_ext | ||
5000 | cat >>conftest.$ac_ext <<_ACEOF | ||
5001 | /* end confdefs.h. */ | ||
5002 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5003 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5004 | +#define $ac_func innocuous_$ac_func | ||
5005 | + | ||
5006 | /* System header to define __stub macros and hopefully few prototypes, | ||
5007 | which can conflict with char $ac_func (); below. | ||
5008 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5009 | <limits.h> exists even on freestanding compilers. */ | ||
5010 | + | ||
5011 | #ifdef __STDC__ | ||
5012 | # include <limits.h> | ||
5013 | #else | ||
5014 | # include <assert.h> | ||
5015 | #endif | ||
5016 | + | ||
5017 | +#undef $ac_func | ||
5018 | + | ||
5019 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5020 | #ifdef __cplusplus | ||
5021 | extern "C" | ||
5022 | @@ -6171,11 +6528,20 @@ | ||
5023 | _ACEOF | ||
5024 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5025 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5026 | - (eval $ac_link) 2>&5 | ||
5027 | + (eval $ac_link) 2>conftest.er1 | ||
5028 | ac_status=$? | ||
5029 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5030 | + rm -f conftest.er1 | ||
5031 | + cat conftest.err >&5 | ||
5032 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5033 | (exit $ac_status); } && | ||
5034 | - { ac_try='test -s conftest$ac_exeext' | ||
5035 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5036 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5037 | + (eval $ac_try) 2>&5 | ||
5038 | + ac_status=$? | ||
5039 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5040 | + (exit $ac_status); }; } && | ||
5041 | + { ac_try='test -s conftest$ac_exeext' | ||
5042 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5043 | (eval $ac_try) 2>&5 | ||
5044 | ac_status=$? | ||
5045 | @@ -6188,7 +6554,8 @@ | ||
5046 | |||
5047 | eval "$as_ac_var=no" | ||
5048 | fi | ||
5049 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5050 | +rm -f conftest.err conftest.$ac_objext \ | ||
5051 | + conftest$ac_exeext conftest.$ac_ext | ||
5052 | fi | ||
5053 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5054 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5055 | @@ -6203,21 +6570,28 @@ | ||
5056 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5057 | else | ||
5058 | cat >conftest.$ac_ext <<_ACEOF | ||
5059 | -#line $LINENO "configure" | ||
5060 | /* confdefs.h. */ | ||
5061 | _ACEOF | ||
5062 | cat confdefs.h >>conftest.$ac_ext | ||
5063 | cat >>conftest.$ac_ext <<_ACEOF | ||
5064 | /* end confdefs.h. */ | ||
5065 | +/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. | ||
5066 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5067 | +#define _doprnt innocuous__doprnt | ||
5068 | + | ||
5069 | /* System header to define __stub macros and hopefully few prototypes, | ||
5070 | which can conflict with char _doprnt (); below. | ||
5071 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5072 | <limits.h> exists even on freestanding compilers. */ | ||
5073 | + | ||
5074 | #ifdef __STDC__ | ||
5075 | # include <limits.h> | ||
5076 | #else | ||
5077 | # include <assert.h> | ||
5078 | #endif | ||
5079 | + | ||
5080 | +#undef _doprnt | ||
5081 | + | ||
5082 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5083 | #ifdef __cplusplus | ||
5084 | extern "C" | ||
5085 | @@ -6248,11 +6622,20 @@ | ||
5086 | _ACEOF | ||
5087 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5088 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5089 | - (eval $ac_link) 2>&5 | ||
5090 | + (eval $ac_link) 2>conftest.er1 | ||
5091 | ac_status=$? | ||
5092 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5093 | + rm -f conftest.er1 | ||
5094 | + cat conftest.err >&5 | ||
5095 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5096 | (exit $ac_status); } && | ||
5097 | - { ac_try='test -s conftest$ac_exeext' | ||
5098 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5099 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5100 | + (eval $ac_try) 2>&5 | ||
5101 | + ac_status=$? | ||
5102 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5103 | + (exit $ac_status); }; } && | ||
5104 | + { ac_try='test -s conftest$ac_exeext' | ||
5105 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5106 | (eval $ac_try) 2>&5 | ||
5107 | ac_status=$? | ||
5108 | @@ -6265,7 +6648,8 @@ | ||
5109 | |||
5110 | ac_cv_func__doprnt=no | ||
5111 | fi | ||
5112 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5113 | +rm -f conftest.err conftest.$ac_objext \ | ||
5114 | + conftest$ac_exeext conftest.$ac_ext | ||
5115 | fi | ||
5116 | echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 | ||
5117 | echo "${ECHO_T}$ac_cv_func__doprnt" >&6 | ||
5118 | @@ -6288,13 +6672,12 @@ | ||
5119 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5120 | else | ||
5121 | cat >conftest.$ac_ext <<_ACEOF | ||
5122 | -#line $LINENO "configure" | ||
5123 | /* confdefs.h. */ | ||
5124 | _ACEOF | ||
5125 | cat confdefs.h >>conftest.$ac_ext | ||
5126 | cat >>conftest.$ac_ext <<_ACEOF | ||
5127 | /* end confdefs.h. */ | ||
5128 | - | ||
5129 | +$ac_includes_default | ||
5130 | int | ||
5131 | main () | ||
5132 | { | ||
5133 | @@ -6305,11 +6688,20 @@ | ||
5134 | _ACEOF | ||
5135 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5136 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5137 | - (eval $ac_link) 2>&5 | ||
5138 | + (eval $ac_link) 2>conftest.er1 | ||
5139 | ac_status=$? | ||
5140 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5141 | + rm -f conftest.er1 | ||
5142 | + cat conftest.err >&5 | ||
5143 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5144 | (exit $ac_status); } && | ||
5145 | - { ac_try='test -s conftest$ac_exeext' | ||
5146 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5147 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5148 | + (eval $ac_try) 2>&5 | ||
5149 | + ac_status=$? | ||
5150 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5151 | + (exit $ac_status); }; } && | ||
5152 | + { ac_try='test -s conftest$ac_exeext' | ||
5153 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5154 | (eval $ac_try) 2>&5 | ||
5155 | ac_status=$? | ||
5156 | @@ -6322,12 +6714,20 @@ | ||
5157 | |||
5158 | ac_cv_lib_error_at_line=no | ||
5159 | fi | ||
5160 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5161 | +rm -f conftest.err conftest.$ac_objext \ | ||
5162 | + conftest$ac_exeext conftest.$ac_ext | ||
5163 | fi | ||
5164 | echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5 | ||
5165 | echo "${ECHO_T}$ac_cv_lib_error_at_line" >&6 | ||
5166 | if test $ac_cv_lib_error_at_line = no; then | ||
5167 | - LIBOBJS="$LIBOBJS error.$ac_objext" | ||
5168 | + case $LIBOBJS in | ||
5169 | + "error.$ac_objext" | \ | ||
5170 | + *" error.$ac_objext" | \ | ||
5171 | + "error.$ac_objext "* | \ | ||
5172 | + *" error.$ac_objext "* ) ;; | ||
5173 | + *) LIBOBJS="$LIBOBJS error.$ac_objext" ;; | ||
5174 | +esac | ||
5175 | + | ||
5176 | fi | ||
5177 | |||
5178 | |||
5179 | @@ -6343,21 +6743,28 @@ | ||
5180 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5181 | else | ||
5182 | cat >conftest.$ac_ext <<_ACEOF | ||
5183 | -#line $LINENO "configure" | ||
5184 | /* confdefs.h. */ | ||
5185 | _ACEOF | ||
5186 | cat confdefs.h >>conftest.$ac_ext | ||
5187 | cat >>conftest.$ac_ext <<_ACEOF | ||
5188 | /* end confdefs.h. */ | ||
5189 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5190 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5191 | +#define $ac_func innocuous_$ac_func | ||
5192 | + | ||
5193 | /* System header to define __stub macros and hopefully few prototypes, | ||
5194 | which can conflict with char $ac_func (); below. | ||
5195 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5196 | <limits.h> exists even on freestanding compilers. */ | ||
5197 | + | ||
5198 | #ifdef __STDC__ | ||
5199 | # include <limits.h> | ||
5200 | #else | ||
5201 | # include <assert.h> | ||
5202 | #endif | ||
5203 | + | ||
5204 | +#undef $ac_func | ||
5205 | + | ||
5206 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5207 | #ifdef __cplusplus | ||
5208 | extern "C" | ||
5209 | @@ -6388,11 +6795,20 @@ | ||
5210 | _ACEOF | ||
5211 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5212 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5213 | - (eval $ac_link) 2>&5 | ||
5214 | + (eval $ac_link) 2>conftest.er1 | ||
5215 | ac_status=$? | ||
5216 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5217 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5218 | + rm -f conftest.er1 | ||
5219 | + cat conftest.err >&5 | ||
5220 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5221 | (exit $ac_status); } && | ||
5222 | - { ac_try='test -s conftest$ac_exeext' | ||
5223 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5224 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5225 | + (eval $ac_try) 2>&5 | ||
5226 | + ac_status=$? | ||
5227 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5228 | + (exit $ac_status); }; } && | ||
5229 | + { ac_try='test -s conftest$ac_exeext' | ||
5230 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5231 | (eval $ac_try) 2>&5 | ||
5232 | ac_status=$? | ||
5233 | @@ -6405,7 +6821,8 @@ | ||
5234 | |||
5235 | eval "$as_ac_var=no" | ||
5236 | fi | ||
5237 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5238 | +rm -f conftest.err conftest.$ac_objext \ | ||
5239 | + conftest$ac_exeext conftest.$ac_ext | ||
5240 | fi | ||
5241 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5242 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5243 | @@ -6423,7 +6840,6 @@ | ||
5244 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5245 | else | ||
5246 | cat >conftest.$ac_ext <<_ACEOF | ||
5247 | -#line $LINENO "configure" | ||
5248 | /* confdefs.h. */ | ||
5249 | _ACEOF | ||
5250 | cat confdefs.h >>conftest.$ac_ext | ||
5251 | @@ -6443,11 +6859,20 @@ | ||
5252 | _ACEOF | ||
5253 | rm -f conftest.$ac_objext | ||
5254 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5255 | - (eval $ac_compile) 2>&5 | ||
5256 | + (eval $ac_compile) 2>conftest.er1 | ||
5257 | ac_status=$? | ||
5258 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5259 | + rm -f conftest.er1 | ||
5260 | + cat conftest.err >&5 | ||
5261 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5262 | (exit $ac_status); } && | ||
5263 | - { ac_try='test -s conftest.$ac_objext' | ||
5264 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5265 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5266 | + (eval $ac_try) 2>&5 | ||
5267 | + ac_status=$? | ||
5268 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5269 | + (exit $ac_status); }; } && | ||
5270 | + { ac_try='test -s conftest.$ac_objext' | ||
5271 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5272 | (eval $ac_try) 2>&5 | ||
5273 | ac_status=$? | ||
5274 | @@ -6460,7 +6885,7 @@ | ||
5275 | |||
5276 | ac_cv_have_decl_strerror=no | ||
5277 | fi | ||
5278 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5279 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5280 | fi | ||
5281 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5 | ||
5282 | echo "${ECHO_T}$ac_cv_have_decl_strerror" >&6 | ||
5283 | @@ -6486,7 +6911,6 @@ | ||
5284 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5285 | else | ||
5286 | cat >conftest.$ac_ext <<_ACEOF | ||
5287 | -#line $LINENO "configure" | ||
5288 | /* confdefs.h. */ | ||
5289 | _ACEOF | ||
5290 | cat confdefs.h >>conftest.$ac_ext | ||
5291 | @@ -6506,11 +6930,20 @@ | ||
5292 | _ACEOF | ||
5293 | rm -f conftest.$ac_objext | ||
5294 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5295 | - (eval $ac_compile) 2>&5 | ||
5296 | + (eval $ac_compile) 2>conftest.er1 | ||
5297 | ac_status=$? | ||
5298 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5299 | + rm -f conftest.er1 | ||
5300 | + cat conftest.err >&5 | ||
5301 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5302 | (exit $ac_status); } && | ||
5303 | - { ac_try='test -s conftest.$ac_objext' | ||
5304 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5305 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5306 | + (eval $ac_try) 2>&5 | ||
5307 | + ac_status=$? | ||
5308 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5309 | + (exit $ac_status); }; } && | ||
5310 | + { ac_try='test -s conftest.$ac_objext' | ||
5311 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5312 | (eval $ac_try) 2>&5 | ||
5313 | ac_status=$? | ||
5314 | @@ -6523,7 +6956,7 @@ | ||
5315 | |||
5316 | ac_cv_have_decl_strerror_r=no | ||
5317 | fi | ||
5318 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5319 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5320 | fi | ||
5321 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5 | ||
5322 | echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6 | ||
5323 | @@ -6553,21 +6986,28 @@ | ||
5324 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5325 | else | ||
5326 | cat >conftest.$ac_ext <<_ACEOF | ||
5327 | -#line $LINENO "configure" | ||
5328 | /* confdefs.h. */ | ||
5329 | _ACEOF | ||
5330 | cat confdefs.h >>conftest.$ac_ext | ||
5331 | cat >>conftest.$ac_ext <<_ACEOF | ||
5332 | /* end confdefs.h. */ | ||
5333 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5334 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5335 | +#define $ac_func innocuous_$ac_func | ||
5336 | + | ||
5337 | /* System header to define __stub macros and hopefully few prototypes, | ||
5338 | which can conflict with char $ac_func (); below. | ||
5339 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5340 | <limits.h> exists even on freestanding compilers. */ | ||
5341 | + | ||
5342 | #ifdef __STDC__ | ||
5343 | # include <limits.h> | ||
5344 | #else | ||
5345 | # include <assert.h> | ||
5346 | #endif | ||
5347 | + | ||
5348 | +#undef $ac_func | ||
5349 | + | ||
5350 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5351 | #ifdef __cplusplus | ||
5352 | extern "C" | ||
5353 | @@ -6598,11 +7038,20 @@ | ||
5354 | _ACEOF | ||
5355 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5356 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5357 | - (eval $ac_link) 2>&5 | ||
5358 | + (eval $ac_link) 2>conftest.er1 | ||
5359 | ac_status=$? | ||
5360 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5361 | + rm -f conftest.er1 | ||
5362 | + cat conftest.err >&5 | ||
5363 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5364 | (exit $ac_status); } && | ||
5365 | - { ac_try='test -s conftest$ac_exeext' | ||
5366 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5367 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5368 | + (eval $ac_try) 2>&5 | ||
5369 | + ac_status=$? | ||
5370 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5371 | + (exit $ac_status); }; } && | ||
5372 | + { ac_try='test -s conftest$ac_exeext' | ||
5373 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5374 | (eval $ac_try) 2>&5 | ||
5375 | ac_status=$? | ||
5376 | @@ -6615,7 +7064,8 @@ | ||
5377 | |||
5378 | eval "$as_ac_var=no" | ||
5379 | fi | ||
5380 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5381 | +rm -f conftest.err conftest.$ac_objext \ | ||
5382 | + conftest$ac_exeext conftest.$ac_ext | ||
5383 | fi | ||
5384 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5385 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5386 | @@ -6636,7 +7086,6 @@ | ||
5387 | ac_cv_func_strerror_r_char_p=no | ||
5388 | if test $ac_cv_have_decl_strerror_r = yes; then | ||
5389 | cat >conftest.$ac_ext <<_ACEOF | ||
5390 | -#line $LINENO "configure" | ||
5391 | /* confdefs.h. */ | ||
5392 | _ACEOF | ||
5393 | cat confdefs.h >>conftest.$ac_ext | ||
5394 | @@ -6657,11 +7106,20 @@ | ||
5395 | _ACEOF | ||
5396 | rm -f conftest.$ac_objext | ||
5397 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5398 | - (eval $ac_compile) 2>&5 | ||
5399 | + (eval $ac_compile) 2>conftest.er1 | ||
5400 | ac_status=$? | ||
5401 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5402 | + rm -f conftest.er1 | ||
5403 | + cat conftest.err >&5 | ||
5404 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5405 | (exit $ac_status); } && | ||
5406 | - { ac_try='test -s conftest.$ac_objext' | ||
5407 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5408 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5409 | + (eval $ac_try) 2>&5 | ||
5410 | + ac_status=$? | ||
5411 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5412 | + (exit $ac_status); }; } && | ||
5413 | + { ac_try='test -s conftest.$ac_objext' | ||
5414 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5415 | (eval $ac_try) 2>&5 | ||
5416 | ac_status=$? | ||
5417 | @@ -6673,7 +7131,7 @@ | ||
5418 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5419 | |||
5420 | fi | ||
5421 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5422 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5423 | else | ||
5424 | # strerror_r is not declared. Choose between | ||
5425 | # systems that have relatively inaccessible declarations for the | ||
5426 | @@ -6685,7 +7143,6 @@ | ||
5427 | : | ||
5428 | else | ||
5429 | cat >conftest.$ac_ext <<_ACEOF | ||
5430 | -#line $LINENO "configure" | ||
5431 | /* confdefs.h. */ | ||
5432 | _ACEOF | ||
5433 | cat confdefs.h >>conftest.$ac_ext | ||
5434 | @@ -6721,7 +7178,7 @@ | ||
5435 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5436 | |||
5437 | fi | ||
5438 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5439 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5440 | fi | ||
5441 | fi | ||
5442 | |||
5443 | @@ -6749,21 +7206,28 @@ | ||
5444 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5445 | else | ||
5446 | cat >conftest.$ac_ext <<_ACEOF | ||
5447 | -#line $LINENO "configure" | ||
5448 | /* confdefs.h. */ | ||
5449 | _ACEOF | ||
5450 | cat confdefs.h >>conftest.$ac_ext | ||
5451 | cat >>conftest.$ac_ext <<_ACEOF | ||
5452 | /* end confdefs.h. */ | ||
5453 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5454 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5455 | +#define $ac_func innocuous_$ac_func | ||
5456 | + | ||
5457 | /* System header to define __stub macros and hopefully few prototypes, | ||
5458 | which can conflict with char $ac_func (); below. | ||
5459 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5460 | <limits.h> exists even on freestanding compilers. */ | ||
5461 | + | ||
5462 | #ifdef __STDC__ | ||
5463 | # include <limits.h> | ||
5464 | #else | ||
5465 | # include <assert.h> | ||
5466 | #endif | ||
5467 | + | ||
5468 | +#undef $ac_func | ||
5469 | + | ||
5470 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5471 | #ifdef __cplusplus | ||
5472 | extern "C" | ||
5473 | @@ -6794,11 +7258,20 @@ | ||
5474 | _ACEOF | ||
5475 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5476 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5477 | - (eval $ac_link) 2>&5 | ||
5478 | + (eval $ac_link) 2>conftest.er1 | ||
5479 | ac_status=$? | ||
5480 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5481 | + rm -f conftest.er1 | ||
5482 | + cat conftest.err >&5 | ||
5483 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5484 | (exit $ac_status); } && | ||
5485 | - { ac_try='test -s conftest$ac_exeext' | ||
5486 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5487 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5488 | + (eval $ac_try) 2>&5 | ||
5489 | + ac_status=$? | ||
5490 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5491 | + (exit $ac_status); }; } && | ||
5492 | + { ac_try='test -s conftest$ac_exeext' | ||
5493 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5494 | (eval $ac_try) 2>&5 | ||
5495 | ac_status=$? | ||
5496 | @@ -6811,7 +7284,8 @@ | ||
5497 | |||
5498 | eval "$as_ac_var=no" | ||
5499 | fi | ||
5500 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5501 | +rm -f conftest.err conftest.$ac_objext \ | ||
5502 | + conftest$ac_exeext conftest.$ac_ext | ||
5503 | fi | ||
5504 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5505 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5506 | @@ -6821,7 +7295,14 @@ | ||
5507 | _ACEOF | ||
5508 | |||
5509 | else | ||
5510 | - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" | ||
5511 | + case $LIBOBJS in | ||
5512 | + "$ac_func.$ac_objext" | \ | ||
5513 | + *" $ac_func.$ac_objext" | \ | ||
5514 | + "$ac_func.$ac_objext "* | \ | ||
5515 | + *" $ac_func.$ac_objext "* ) ;; | ||
5516 | + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; | ||
5517 | +esac | ||
5518 | + | ||
5519 | fi | ||
5520 | done | ||
5521 | |||
5522 | @@ -6855,7 +7336,6 @@ | ||
5523 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
5524 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
5525 | cat >conftest.$ac_ext <<_ACEOF | ||
5526 | -#line $LINENO "configure" | ||
5527 | /* confdefs.h. */ | ||
5528 | _ACEOF | ||
5529 | cat confdefs.h >>conftest.$ac_ext | ||
5530 | @@ -6866,11 +7346,20 @@ | ||
5531 | _ACEOF | ||
5532 | rm -f conftest.$ac_objext | ||
5533 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5534 | - (eval $ac_compile) 2>&5 | ||
5535 | + (eval $ac_compile) 2>conftest.er1 | ||
5536 | ac_status=$? | ||
5537 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5538 | + rm -f conftest.er1 | ||
5539 | + cat conftest.err >&5 | ||
5540 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5541 | (exit $ac_status); } && | ||
5542 | - { ac_try='test -s conftest.$ac_objext' | ||
5543 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5544 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5545 | + (eval $ac_try) 2>&5 | ||
5546 | + ac_status=$? | ||
5547 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5548 | + (exit $ac_status); }; } && | ||
5549 | + { ac_try='test -s conftest.$ac_objext' | ||
5550 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5551 | (eval $ac_try) 2>&5 | ||
5552 | ac_status=$? | ||
5553 | @@ -6883,7 +7372,7 @@ | ||
5554 | |||
5555 | ac_header_compiler=no | ||
5556 | fi | ||
5557 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5558 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5559 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
5560 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
5561 | |||
5562 | @@ -6891,7 +7380,6 @@ | ||
5563 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
5564 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
5565 | cat >conftest.$ac_ext <<_ACEOF | ||
5566 | -#line $LINENO "configure" | ||
5567 | /* confdefs.h. */ | ||
5568 | _ACEOF | ||
5569 | cat confdefs.h >>conftest.$ac_ext | ||
5570 | @@ -6909,6 +7397,7 @@ | ||
5571 | (exit $ac_status); } >/dev/null; then | ||
5572 | if test -s conftest.err; then | ||
5573 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
5574 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5575 | else | ||
5576 | ac_cpp_err= | ||
5577 | fi | ||
5578 | @@ -6928,33 +7417,32 @@ | ||
5579 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
5580 | |||
5581 | # So? What about this header? | ||
5582 | -case $ac_header_compiler:$ac_header_preproc in | ||
5583 | - yes:no ) | ||
5584 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
5585 | + yes:no: ) | ||
5586 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
5587 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
5588 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5589 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5590 | - ( | ||
5591 | - cat <<\_ASBOX | ||
5592 | -## ------------------------------------ ## | ||
5593 | -## Report this to bug-autoconf@gnu.org. ## | ||
5594 | -## ------------------------------------ ## | ||
5595 | -_ASBOX | ||
5596 | - ) | | ||
5597 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
5598 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
5599 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
5600 | + ac_header_preproc=yes | ||
5601 | ;; | ||
5602 | - no:yes ) | ||
5603 | + no:yes:* ) | ||
5604 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
5605 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
5606 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5607 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
5611 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
5612 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
5613 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
5614 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5615 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5616 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
5617 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
5618 | ( | ||
5619 | cat <<\_ASBOX | ||
5620 | -## ------------------------------------ ## | ||
5621 | -## Report this to bug-autoconf@gnu.org. ## | ||
5622 | -## ------------------------------------ ## | ||
5623 | +## -------------------------------- ## | ||
5624 | +## Report this to bug-patch@gnu.org ## | ||
5625 | +## -------------------------------- ## | ||
5626 | _ASBOX | ||
5627 | ) | | ||
5628 | sed "s/^/$as_me: WARNING: /" >&2 | ||
5629 | @@ -6965,7 +7453,7 @@ | ||
5630 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
5631 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5632 | else | ||
5633 | - eval "$as_ac_Header=$ac_header_preproc" | ||
5634 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
5635 | fi | ||
5636 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
5637 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5638 | @@ -6989,7 +7477,6 @@ | ||
5639 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5640 | else | ||
5641 | cat >conftest.$ac_ext <<_ACEOF | ||
5642 | -#line $LINENO "configure" | ||
5643 | /* confdefs.h. */ | ||
5644 | _ACEOF | ||
5645 | cat confdefs.h >>conftest.$ac_ext | ||
5646 | @@ -7053,21 +7540,28 @@ | ||
5647 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5648 | else | ||
5649 | cat >conftest.$ac_ext <<_ACEOF | ||
5650 | -#line $LINENO "configure" | ||
5651 | /* confdefs.h. */ | ||
5652 | _ACEOF | ||
5653 | cat confdefs.h >>conftest.$ac_ext | ||
5654 | cat >>conftest.$ac_ext <<_ACEOF | ||
5655 | /* end confdefs.h. */ | ||
5656 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5657 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5658 | +#define $ac_func innocuous_$ac_func | ||
5659 | + | ||
5660 | /* System header to define __stub macros and hopefully few prototypes, | ||
5661 | which can conflict with char $ac_func (); below. | ||
5662 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
5663 | <limits.h> exists even on freestanding compilers. */ | ||
5664 | + | ||
5665 | #ifdef __STDC__ | ||
5666 | # include <limits.h> | ||
5667 | #else | ||
5668 | # include <assert.h> | ||
5669 | #endif | ||
5670 | + | ||
5671 | +#undef $ac_func | ||
5672 | + | ||
5673 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5674 | #ifdef __cplusplus | ||
5675 | extern "C" | ||
5676 | @@ -7098,11 +7592,20 @@ | ||
5677 | _ACEOF | ||
5678 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5679 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
5680 | - (eval $ac_link) 2>&5 | ||
5681 | + (eval $ac_link) 2>conftest.er1 | ||
5682 | ac_status=$? | ||
5683 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5684 | + rm -f conftest.er1 | ||
5685 | + cat conftest.err >&5 | ||
5686 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5687 | (exit $ac_status); } && | ||
5688 | - { ac_try='test -s conftest$ac_exeext' | ||
5689 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5690 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5691 | + (eval $ac_try) 2>&5 | ||
5692 | + ac_status=$? | ||
5693 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5694 | + (exit $ac_status); }; } && | ||
5695 | + { ac_try='test -s conftest$ac_exeext' | ||
5696 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5697 | (eval $ac_try) 2>&5 | ||
5698 | ac_status=$? | ||
5699 | @@ -7115,7 +7618,8 @@ | ||
5700 | |||
5701 | eval "$as_ac_var=no" | ||
5702 | fi | ||
5703 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5704 | +rm -f conftest.err conftest.$ac_objext \ | ||
5705 | + conftest$ac_exeext conftest.$ac_ext | ||
5706 | fi | ||
5707 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
5708 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
5709 | @@ -7125,7 +7629,14 @@ | ||
5710 | _ACEOF | ||
5711 | |||
5712 | else | ||
5713 | - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" | ||
5714 | + case $LIBOBJS in | ||
5715 | + "$ac_func.$ac_objext" | \ | ||
5716 | + *" $ac_func.$ac_objext" | \ | ||
5717 | + "$ac_func.$ac_objext "* | \ | ||
5718 | + *" $ac_func.$ac_objext "* ) ;; | ||
5719 | + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; | ||
5720 | +esac | ||
5721 | + | ||
5722 | fi | ||
5723 | done | ||
5724 | |||
5725 | @@ -7163,7 +7674,6 @@ | ||
5726 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
5727 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
5728 | cat >conftest.$ac_ext <<_ACEOF | ||
5729 | -#line $LINENO "configure" | ||
5730 | /* confdefs.h. */ | ||
5731 | _ACEOF | ||
5732 | cat confdefs.h >>conftest.$ac_ext | ||
5733 | @@ -7174,11 +7684,20 @@ | ||
5734 | _ACEOF | ||
5735 | rm -f conftest.$ac_objext | ||
5736 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5737 | - (eval $ac_compile) 2>&5 | ||
5738 | + (eval $ac_compile) 2>conftest.er1 | ||
5739 | ac_status=$? | ||
5740 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5741 | + rm -f conftest.er1 | ||
5742 | + cat conftest.err >&5 | ||
5743 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5744 | (exit $ac_status); } && | ||
5745 | - { ac_try='test -s conftest.$ac_objext' | ||
5746 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5747 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5748 | + (eval $ac_try) 2>&5 | ||
5749 | + ac_status=$? | ||
5750 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5751 | + (exit $ac_status); }; } && | ||
5752 | + { ac_try='test -s conftest.$ac_objext' | ||
5753 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5754 | (eval $ac_try) 2>&5 | ||
5755 | ac_status=$? | ||
5756 | @@ -7191,7 +7710,7 @@ | ||
5757 | |||
5758 | ac_header_compiler=no | ||
5759 | fi | ||
5760 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5761 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5762 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
5763 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
5764 | |||
5765 | @@ -7199,7 +7718,6 @@ | ||
5766 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
5767 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
5768 | cat >conftest.$ac_ext <<_ACEOF | ||
5769 | -#line $LINENO "configure" | ||
5770 | /* confdefs.h. */ | ||
5771 | _ACEOF | ||
5772 | cat confdefs.h >>conftest.$ac_ext | ||
5773 | @@ -7217,6 +7735,7 @@ | ||
5774 | (exit $ac_status); } >/dev/null; then | ||
5775 | if test -s conftest.err; then | ||
5776 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
5777 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5778 | else | ||
5779 | ac_cpp_err= | ||
5780 | fi | ||
5781 | @@ -7236,33 +7755,32 @@ | ||
5782 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
5783 | |||
5784 | # So? What about this header? | ||
5785 | -case $ac_header_compiler:$ac_header_preproc in | ||
5786 | - yes:no ) | ||
5787 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
5788 | + yes:no: ) | ||
5789 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
5790 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
5791 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5792 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5793 | - ( | ||
5794 | - cat <<\_ASBOX | ||
5795 | -## ------------------------------------ ## | ||
5796 | -## Report this to bug-autoconf@gnu.org. ## | ||
5797 | -## ------------------------------------ ## | ||
5798 | -_ASBOX | ||
5799 | - ) | | ||
5800 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
5801 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
5802 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
5803 | + ac_header_preproc=yes | ||
5804 | ;; | ||
5805 | - no:yes ) | ||
5806 | + no:yes:* ) | ||
5807 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
5808 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
5809 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5810 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
5814 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
5815 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
5816 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
5817 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5818 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5819 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
5820 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
5821 | ( | ||
5822 | cat <<\_ASBOX | ||
5823 | -## ------------------------------------ ## | ||
5824 | -## Report this to bug-autoconf@gnu.org. ## | ||
5825 | -## ------------------------------------ ## | ||
5826 | +## -------------------------------- ## | ||
5827 | +## Report this to bug-patch@gnu.org ## | ||
5828 | +## -------------------------------- ## | ||
5829 | _ASBOX | ||
5830 | ) | | ||
5831 | sed "s/^/$as_me: WARNING: /" >&2 | ||
5832 | @@ -7273,7 +7791,7 @@ | ||
5833 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
5834 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5835 | else | ||
5836 | - eval "$as_ac_Header=$ac_header_preproc" | ||
5837 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
5838 | fi | ||
5839 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
5840 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5841 | @@ -7297,7 +7815,6 @@ | ||
5842 | ac_cv_func_malloc_0_nonnull=no | ||
5843 | else | ||
5844 | cat >conftest.$ac_ext <<_ACEOF | ||
5845 | -#line $LINENO "configure" | ||
5846 | /* confdefs.h. */ | ||
5847 | _ACEOF | ||
5848 | cat confdefs.h >>conftest.$ac_ext | ||
5849 | @@ -7337,7 +7854,7 @@ | ||
5850 | ( exit $ac_status ) | ||
5851 | ac_cv_func_malloc_0_nonnull=no | ||
5852 | fi | ||
5853 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5854 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
5855 | fi | ||
5856 | fi | ||
5857 | echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 | ||
5858 | @@ -7353,7 +7870,14 @@ | ||
5859 | #define HAVE_MALLOC 0 | ||
5860 | _ACEOF | ||
5861 | |||
5862 | - LIBOBJS="$LIBOBJS malloc.$ac_objext" | ||
5863 | + case $LIBOBJS in | ||
5864 | + "malloc.$ac_objext" | \ | ||
5865 | + *" malloc.$ac_objext" | \ | ||
5866 | + "malloc.$ac_objext "* | \ | ||
5867 | + *" malloc.$ac_objext "* ) ;; | ||
5868 | + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;; | ||
5869 | +esac | ||
5870 | + | ||
5871 | |||
5872 | cat >>confdefs.h <<\_ACEOF | ||
5873 | #define malloc rpl_malloc | ||
5874 | @@ -7388,7 +7912,6 @@ | ||
5875 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
5876 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
5877 | cat >conftest.$ac_ext <<_ACEOF | ||
5878 | -#line $LINENO "configure" | ||
5879 | /* confdefs.h. */ | ||
5880 | _ACEOF | ||
5881 | cat confdefs.h >>conftest.$ac_ext | ||
5882 | @@ -7399,11 +7922,20 @@ | ||
5883 | _ACEOF | ||
5884 | rm -f conftest.$ac_objext | ||
5885 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5886 | - (eval $ac_compile) 2>&5 | ||
5887 | + (eval $ac_compile) 2>conftest.er1 | ||
5888 | ac_status=$? | ||
5889 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5890 | + rm -f conftest.er1 | ||
5891 | + cat conftest.err >&5 | ||
5892 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5893 | (exit $ac_status); } && | ||
5894 | - { ac_try='test -s conftest.$ac_objext' | ||
5895 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
5896 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5897 | + (eval $ac_try) 2>&5 | ||
5898 | + ac_status=$? | ||
5899 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5900 | + (exit $ac_status); }; } && | ||
5901 | + { ac_try='test -s conftest.$ac_objext' | ||
5902 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5903 | (eval $ac_try) 2>&5 | ||
5904 | ac_status=$? | ||
5905 | @@ -7416,7 +7948,7 @@ | ||
5906 | |||
5907 | ac_header_compiler=no | ||
5908 | fi | ||
5909 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
5910 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5911 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
5912 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
5913 | |||
5914 | @@ -7424,7 +7956,6 @@ | ||
5915 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
5916 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
5917 | cat >conftest.$ac_ext <<_ACEOF | ||
5918 | -#line $LINENO "configure" | ||
5919 | /* confdefs.h. */ | ||
5920 | _ACEOF | ||
5921 | cat confdefs.h >>conftest.$ac_ext | ||
5922 | @@ -7442,6 +7973,7 @@ | ||
5923 | (exit $ac_status); } >/dev/null; then | ||
5924 | if test -s conftest.err; then | ||
5925 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
5926 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5927 | else | ||
5928 | ac_cpp_err= | ||
5929 | fi | ||
5930 | @@ -7461,33 +7993,32 @@ | ||
5931 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
5932 | |||
5933 | # So? What about this header? | ||
5934 | -case $ac_header_compiler:$ac_header_preproc in | ||
5935 | - yes:no ) | ||
5936 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
5937 | + yes:no: ) | ||
5938 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
5939 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
5940 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5941 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5942 | - ( | ||
5943 | - cat <<\_ASBOX | ||
5944 | -## ------------------------------------ ## | ||
5945 | -## Report this to bug-autoconf@gnu.org. ## | ||
5946 | -## ------------------------------------ ## | ||
5947 | -_ASBOX | ||
5948 | - ) | | ||
5949 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
5950 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
5951 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
5952 | + ac_header_preproc=yes | ||
5953 | ;; | ||
5954 | - no:yes ) | ||
5955 | + no:yes:* ) | ||
5956 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
5957 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
5958 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5959 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
5963 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
5964 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
5965 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
5966 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5967 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5968 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
5969 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
5970 | ( | ||
5971 | cat <<\_ASBOX | ||
5972 | -## ------------------------------------ ## | ||
5973 | -## Report this to bug-autoconf@gnu.org. ## | ||
5974 | -## ------------------------------------ ## | ||
5975 | +## -------------------------------- ## | ||
5976 | +## Report this to bug-patch@gnu.org ## | ||
5977 | +## -------------------------------- ## | ||
5978 | _ASBOX | ||
5979 | ) | | ||
5980 | sed "s/^/$as_me: WARNING: /" >&2 | ||
5981 | @@ -7498,7 +8029,7 @@ | ||
5982 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
5983 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5984 | else | ||
5985 | - eval "$as_ac_Header=$ac_header_preproc" | ||
5986 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
5987 | fi | ||
5988 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
5989 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5990 | @@ -7522,7 +8053,6 @@ | ||
5991 | ac_cv_func_realloc_0_nonnull=no | ||
5992 | else | ||
5993 | cat >conftest.$ac_ext <<_ACEOF | ||
5994 | -#line $LINENO "configure" | ||
5995 | /* confdefs.h. */ | ||
5996 | _ACEOF | ||
5997 | cat confdefs.h >>conftest.$ac_ext | ||
5998 | @@ -7562,7 +8092,7 @@ | ||
5999 | ( exit $ac_status ) | ||
6000 | ac_cv_func_realloc_0_nonnull=no | ||
6001 | fi | ||
6002 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
6003 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
6004 | fi | ||
6005 | fi | ||
6006 | echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5 | ||
6007 | @@ -7578,7 +8108,14 @@ | ||
6008 | #define HAVE_REALLOC 0 | ||
6009 | _ACEOF | ||
6010 | |||
6011 | - LIBOBJS="$LIBOBJS realloc.$ac_objext" | ||
6012 | + case $LIBOBJS in | ||
6013 | + "realloc.$ac_objext" | \ | ||
6014 | + *" realloc.$ac_objext" | \ | ||
6015 | + "realloc.$ac_objext "* | \ | ||
6016 | + *" realloc.$ac_objext "* ) ;; | ||
6017 | + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;; | ||
6018 | +esac | ||
6019 | + | ||
6020 | |||
6021 | cat >>confdefs.h <<\_ACEOF | ||
6022 | #define realloc rpl_realloc | ||
6023 | @@ -7619,7 +8156,6 @@ | ||
6024 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6025 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
6026 | cat >conftest.$ac_ext <<_ACEOF | ||
6027 | -#line $LINENO "configure" | ||
6028 | /* confdefs.h. */ | ||
6029 | _ACEOF | ||
6030 | cat confdefs.h >>conftest.$ac_ext | ||
6031 | @@ -7630,11 +8166,20 @@ | ||
6032 | _ACEOF | ||
6033 | rm -f conftest.$ac_objext | ||
6034 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6035 | - (eval $ac_compile) 2>&5 | ||
6036 | + (eval $ac_compile) 2>conftest.er1 | ||
6037 | ac_status=$? | ||
6038 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6039 | + rm -f conftest.er1 | ||
6040 | + cat conftest.err >&5 | ||
6041 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6042 | (exit $ac_status); } && | ||
6043 | - { ac_try='test -s conftest.$ac_objext' | ||
6044 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6045 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6046 | + (eval $ac_try) 2>&5 | ||
6047 | + ac_status=$? | ||
6048 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6049 | + (exit $ac_status); }; } && | ||
6050 | + { ac_try='test -s conftest.$ac_objext' | ||
6051 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6052 | (eval $ac_try) 2>&5 | ||
6053 | ac_status=$? | ||
6054 | @@ -7647,7 +8192,7 @@ | ||
6055 | |||
6056 | ac_header_compiler=no | ||
6057 | fi | ||
6058 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6059 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6060 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6061 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
6062 | |||
6063 | @@ -7655,7 +8200,6 @@ | ||
6064 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6065 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
6066 | cat >conftest.$ac_ext <<_ACEOF | ||
6067 | -#line $LINENO "configure" | ||
6068 | /* confdefs.h. */ | ||
6069 | _ACEOF | ||
6070 | cat confdefs.h >>conftest.$ac_ext | ||
6071 | @@ -7673,6 +8217,7 @@ | ||
6072 | (exit $ac_status); } >/dev/null; then | ||
6073 | if test -s conftest.err; then | ||
6074 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6075 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
6076 | else | ||
6077 | ac_cpp_err= | ||
6078 | fi | ||
6079 | @@ -7692,33 +8237,32 @@ | ||
6080 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
6081 | |||
6082 | # So? What about this header? | ||
6083 | -case $ac_header_compiler:$ac_header_preproc in | ||
6084 | - yes:no ) | ||
6085 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6086 | + yes:no: ) | ||
6087 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6088 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6089 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6090 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6091 | - ( | ||
6092 | - cat <<\_ASBOX | ||
6093 | -## ------------------------------------ ## | ||
6094 | -## Report this to bug-autoconf@gnu.org. ## | ||
6095 | -## ------------------------------------ ## | ||
6096 | -_ASBOX | ||
6097 | - ) | | ||
6098 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
6099 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6100 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6101 | + ac_header_preproc=yes | ||
6102 | ;; | ||
6103 | - no:yes ) | ||
6104 | + no:yes:* ) | ||
6105 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6106 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6107 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6108 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
6112 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6113 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6114 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6115 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6116 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6117 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6118 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6119 | ( | ||
6120 | cat <<\_ASBOX | ||
6121 | -## ------------------------------------ ## | ||
6122 | -## Report this to bug-autoconf@gnu.org. ## | ||
6123 | -## ------------------------------------ ## | ||
6124 | +## -------------------------------- ## | ||
6125 | +## Report this to bug-patch@gnu.org ## | ||
6126 | +## -------------------------------- ## | ||
6127 | _ASBOX | ||
6128 | ) | | ||
6129 | sed "s/^/$as_me: WARNING: /" >&2 | ||
6130 | @@ -7729,7 +8273,7 @@ | ||
6131 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6132 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6133 | else | ||
6134 | - eval "$as_ac_Header=$ac_header_preproc" | ||
6135 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6136 | fi | ||
6137 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6138 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6139 | @@ -7772,7 +8316,6 @@ | ||
6140 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6141 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
6142 | cat >conftest.$ac_ext <<_ACEOF | ||
6143 | -#line $LINENO "configure" | ||
6144 | /* confdefs.h. */ | ||
6145 | _ACEOF | ||
6146 | cat confdefs.h >>conftest.$ac_ext | ||
6147 | @@ -7783,11 +8326,20 @@ | ||
6148 | _ACEOF | ||
6149 | rm -f conftest.$ac_objext | ||
6150 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6151 | - (eval $ac_compile) 2>&5 | ||
6152 | + (eval $ac_compile) 2>conftest.er1 | ||
6153 | ac_status=$? | ||
6154 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6155 | + rm -f conftest.er1 | ||
6156 | + cat conftest.err >&5 | ||
6157 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6158 | (exit $ac_status); } && | ||
6159 | - { ac_try='test -s conftest.$ac_objext' | ||
6160 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6161 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6162 | + (eval $ac_try) 2>&5 | ||
6163 | + ac_status=$? | ||
6164 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6165 | + (exit $ac_status); }; } && | ||
6166 | + { ac_try='test -s conftest.$ac_objext' | ||
6167 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6168 | (eval $ac_try) 2>&5 | ||
6169 | ac_status=$? | ||
6170 | @@ -7800,7 +8352,7 @@ | ||
6171 | |||
6172 | ac_header_compiler=no | ||
6173 | fi | ||
6174 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6175 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6176 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6177 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
6178 | |||
6179 | @@ -7808,7 +8360,6 @@ | ||
6180 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6181 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
6182 | cat >conftest.$ac_ext <<_ACEOF | ||
6183 | -#line $LINENO "configure" | ||
6184 | /* confdefs.h. */ | ||
6185 | _ACEOF | ||
6186 | cat confdefs.h >>conftest.$ac_ext | ||
6187 | @@ -7826,6 +8377,7 @@ | ||
6188 | (exit $ac_status); } >/dev/null; then | ||
6189 | if test -s conftest.err; then | ||
6190 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6191 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
6192 | else | ||
6193 | ac_cpp_err= | ||
6194 | fi | ||
6195 | @@ -7845,33 +8397,32 @@ | ||
6196 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
6197 | |||
6198 | # So? What about this header? | ||
6199 | -case $ac_header_compiler:$ac_header_preproc in | ||
6200 | - yes:no ) | ||
6201 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6202 | + yes:no: ) | ||
6203 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6204 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6205 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6206 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6207 | - ( | ||
6208 | - cat <<\_ASBOX | ||
6209 | -## ------------------------------------ ## | ||
6210 | -## Report this to bug-autoconf@gnu.org. ## | ||
6211 | -## ------------------------------------ ## | ||
6212 | -_ASBOX | ||
6213 | - ) | | ||
6214 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
6215 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6216 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6217 | + ac_header_preproc=yes | ||
6218 | ;; | ||
6219 | - no:yes ) | ||
6220 | + no:yes:* ) | ||
6221 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6222 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6223 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6224 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
6228 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6229 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6230 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6231 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6232 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6233 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6234 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6235 | ( | ||
6236 | cat <<\_ASBOX | ||
6237 | -## ------------------------------------ ## | ||
6238 | -## Report this to bug-autoconf@gnu.org. ## | ||
6239 | -## ------------------------------------ ## | ||
6240 | +## -------------------------------- ## | ||
6241 | +## Report this to bug-patch@gnu.org ## | ||
6242 | +## -------------------------------- ## | ||
6243 | _ASBOX | ||
6244 | ) | | ||
6245 | sed "s/^/$as_me: WARNING: /" >&2 | ||
6246 | @@ -7882,7 +8433,7 @@ | ||
6247 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6248 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6249 | else | ||
6250 | - eval "$as_ac_Header=$ac_header_preproc" | ||
6251 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6252 | fi | ||
6253 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6254 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6255 | @@ -7916,7 +8467,6 @@ | ||
6256 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6257 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
6258 | cat >conftest.$ac_ext <<_ACEOF | ||
6259 | -#line $LINENO "configure" | ||
6260 | /* confdefs.h. */ | ||
6261 | _ACEOF | ||
6262 | cat confdefs.h >>conftest.$ac_ext | ||
6263 | @@ -7927,11 +8477,20 @@ | ||
6264 | _ACEOF | ||
6265 | rm -f conftest.$ac_objext | ||
6266 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6267 | - (eval $ac_compile) 2>&5 | ||
6268 | + (eval $ac_compile) 2>conftest.er1 | ||
6269 | ac_status=$? | ||
6270 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6271 | + rm -f conftest.er1 | ||
6272 | + cat conftest.err >&5 | ||
6273 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6274 | (exit $ac_status); } && | ||
6275 | - { ac_try='test -s conftest.$ac_objext' | ||
6276 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6277 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6278 | + (eval $ac_try) 2>&5 | ||
6279 | + ac_status=$? | ||
6280 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6281 | + (exit $ac_status); }; } && | ||
6282 | + { ac_try='test -s conftest.$ac_objext' | ||
6283 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6284 | (eval $ac_try) 2>&5 | ||
6285 | ac_status=$? | ||
6286 | @@ -7944,7 +8503,7 @@ | ||
6287 | |||
6288 | ac_header_compiler=no | ||
6289 | fi | ||
6290 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6291 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6292 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6293 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
6294 | |||
6295 | @@ -7952,7 +8511,6 @@ | ||
6296 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6297 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
6298 | cat >conftest.$ac_ext <<_ACEOF | ||
6299 | -#line $LINENO "configure" | ||
6300 | /* confdefs.h. */ | ||
6301 | _ACEOF | ||
6302 | cat confdefs.h >>conftest.$ac_ext | ||
6303 | @@ -7970,6 +8528,7 @@ | ||
6304 | (exit $ac_status); } >/dev/null; then | ||
6305 | if test -s conftest.err; then | ||
6306 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6307 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
6308 | else | ||
6309 | ac_cpp_err= | ||
6310 | fi | ||
6311 | @@ -7989,33 +8548,32 @@ | ||
6312 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
6313 | |||
6314 | # So? What about this header? | ||
6315 | -case $ac_header_compiler:$ac_header_preproc in | ||
6316 | - yes:no ) | ||
6317 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6318 | + yes:no: ) | ||
6319 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6320 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6321 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6322 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6323 | - ( | ||
6324 | - cat <<\_ASBOX | ||
6325 | -## ------------------------------------ ## | ||
6326 | -## Report this to bug-autoconf@gnu.org. ## | ||
6327 | -## ------------------------------------ ## | ||
6328 | -_ASBOX | ||
6329 | - ) | | ||
6330 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
6331 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6332 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6333 | + ac_header_preproc=yes | ||
6334 | ;; | ||
6335 | - no:yes ) | ||
6336 | + no:yes:* ) | ||
6337 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6338 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6339 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6340 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
6344 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6345 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6346 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6347 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6348 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6349 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6350 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6351 | ( | ||
6352 | cat <<\_ASBOX | ||
6353 | -## ------------------------------------ ## | ||
6354 | -## Report this to bug-autoconf@gnu.org. ## | ||
6355 | -## ------------------------------------ ## | ||
6356 | +## -------------------------------- ## | ||
6357 | +## Report this to bug-patch@gnu.org ## | ||
6358 | +## -------------------------------- ## | ||
6359 | _ASBOX | ||
6360 | ) | | ||
6361 | sed "s/^/$as_me: WARNING: /" >&2 | ||
6362 | @@ -8026,7 +8584,7 @@ | ||
6363 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6364 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6365 | else | ||
6366 | - eval "$as_ac_Header=$ac_header_preproc" | ||
6367 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6368 | fi | ||
6369 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6370 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6371 | @@ -8053,21 +8611,28 @@ | ||
6372 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6373 | else | ||
6374 | cat >conftest.$ac_ext <<_ACEOF | ||
6375 | -#line $LINENO "configure" | ||
6376 | /* confdefs.h. */ | ||
6377 | _ACEOF | ||
6378 | cat confdefs.h >>conftest.$ac_ext | ||
6379 | cat >>conftest.$ac_ext <<_ACEOF | ||
6380 | /* end confdefs.h. */ | ||
6381 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
6382 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
6383 | +#define $ac_func innocuous_$ac_func | ||
6384 | + | ||
6385 | /* System header to define __stub macros and hopefully few prototypes, | ||
6386 | which can conflict with char $ac_func (); below. | ||
6387 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
6388 | <limits.h> exists even on freestanding compilers. */ | ||
6389 | + | ||
6390 | #ifdef __STDC__ | ||
6391 | # include <limits.h> | ||
6392 | #else | ||
6393 | # include <assert.h> | ||
6394 | #endif | ||
6395 | + | ||
6396 | +#undef $ac_func | ||
6397 | + | ||
6398 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
6399 | #ifdef __cplusplus | ||
6400 | extern "C" | ||
6401 | @@ -8098,11 +8663,20 @@ | ||
6402 | _ACEOF | ||
6403 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6404 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6405 | - (eval $ac_link) 2>&5 | ||
6406 | + (eval $ac_link) 2>conftest.er1 | ||
6407 | ac_status=$? | ||
6408 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6409 | + rm -f conftest.er1 | ||
6410 | + cat conftest.err >&5 | ||
6411 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6412 | (exit $ac_status); } && | ||
6413 | - { ac_try='test -s conftest$ac_exeext' | ||
6414 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6415 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6416 | + (eval $ac_try) 2>&5 | ||
6417 | + ac_status=$? | ||
6418 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6419 | + (exit $ac_status); }; } && | ||
6420 | + { ac_try='test -s conftest$ac_exeext' | ||
6421 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6422 | (eval $ac_try) 2>&5 | ||
6423 | ac_status=$? | ||
6424 | @@ -8115,7 +8689,8 @@ | ||
6425 | |||
6426 | eval "$as_ac_var=no" | ||
6427 | fi | ||
6428 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
6429 | +rm -f conftest.err conftest.$ac_objext \ | ||
6430 | + conftest$ac_exeext conftest.$ac_ext | ||
6431 | fi | ||
6432 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
6433 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
6434 | @@ -8139,21 +8714,28 @@ | ||
6435 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6436 | else | ||
6437 | cat >conftest.$ac_ext <<_ACEOF | ||
6438 | -#line $LINENO "configure" | ||
6439 | /* confdefs.h. */ | ||
6440 | _ACEOF | ||
6441 | cat confdefs.h >>conftest.$ac_ext | ||
6442 | cat >>conftest.$ac_ext <<_ACEOF | ||
6443 | /* end confdefs.h. */ | ||
6444 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
6445 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
6446 | +#define $ac_func innocuous_$ac_func | ||
6447 | + | ||
6448 | /* System header to define __stub macros and hopefully few prototypes, | ||
6449 | which can conflict with char $ac_func (); below. | ||
6450 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
6451 | <limits.h> exists even on freestanding compilers. */ | ||
6452 | + | ||
6453 | #ifdef __STDC__ | ||
6454 | # include <limits.h> | ||
6455 | #else | ||
6456 | # include <assert.h> | ||
6457 | #endif | ||
6458 | + | ||
6459 | +#undef $ac_func | ||
6460 | + | ||
6461 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
6462 | #ifdef __cplusplus | ||
6463 | extern "C" | ||
6464 | @@ -8184,11 +8766,20 @@ | ||
6465 | _ACEOF | ||
6466 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6467 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6468 | - (eval $ac_link) 2>&5 | ||
6469 | + (eval $ac_link) 2>conftest.er1 | ||
6470 | ac_status=$? | ||
6471 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6472 | + rm -f conftest.er1 | ||
6473 | + cat conftest.err >&5 | ||
6474 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6475 | (exit $ac_status); } && | ||
6476 | - { ac_try='test -s conftest$ac_exeext' | ||
6477 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6478 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6479 | + (eval $ac_try) 2>&5 | ||
6480 | + ac_status=$? | ||
6481 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6482 | + (exit $ac_status); }; } && | ||
6483 | + { ac_try='test -s conftest$ac_exeext' | ||
6484 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6485 | (eval $ac_try) 2>&5 | ||
6486 | ac_status=$? | ||
6487 | @@ -8201,7 +8792,8 @@ | ||
6488 | |||
6489 | eval "$as_ac_var=no" | ||
6490 | fi | ||
6491 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
6492 | +rm -f conftest.err conftest.$ac_objext \ | ||
6493 | + conftest$ac_exeext conftest.$ac_ext | ||
6494 | fi | ||
6495 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
6496 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
6497 | @@ -8241,7 +8833,6 @@ | ||
6498 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6499 | else | ||
6500 | cat >conftest.$ac_ext <<_ACEOF | ||
6501 | -#line $LINENO "configure" | ||
6502 | /* confdefs.h. */ | ||
6503 | _ACEOF | ||
6504 | cat confdefs.h >>conftest.$ac_ext | ||
6505 | @@ -8259,11 +8850,20 @@ | ||
6506 | _ACEOF | ||
6507 | rm -f conftest.$ac_objext | ||
6508 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6509 | - (eval $ac_compile) 2>&5 | ||
6510 | + (eval $ac_compile) 2>conftest.er1 | ||
6511 | ac_status=$? | ||
6512 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6513 | + rm -f conftest.er1 | ||
6514 | + cat conftest.err >&5 | ||
6515 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6516 | (exit $ac_status); } && | ||
6517 | - { ac_try='test -s conftest.$ac_objext' | ||
6518 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6519 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6520 | + (eval $ac_try) 2>&5 | ||
6521 | + ac_status=$? | ||
6522 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6523 | + (exit $ac_status); }; } && | ||
6524 | + { ac_try='test -s conftest.$ac_objext' | ||
6525 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6526 | (eval $ac_try) 2>&5 | ||
6527 | ac_status=$? | ||
6528 | @@ -8276,7 +8876,7 @@ | ||
6529 | |||
6530 | ac_cv_type_mbstate_t=no | ||
6531 | fi | ||
6532 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
6533 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6534 | fi | ||
6535 | echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 | ||
6536 | echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6 | ||
6537 | @@ -8300,7 +8900,6 @@ | ||
6538 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6539 | else | ||
6540 | cat >conftest.$ac_ext <<_ACEOF | ||
6541 | -#line $LINENO "configure" | ||
6542 | /* confdefs.h. */ | ||
6543 | _ACEOF | ||
6544 | cat confdefs.h >>conftest.$ac_ext | ||
6545 | @@ -8317,11 +8916,20 @@ | ||
6546 | _ACEOF | ||
6547 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6548 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6549 | - (eval $ac_link) 2>&5 | ||
6550 | + (eval $ac_link) 2>conftest.er1 | ||
6551 | ac_status=$? | ||
6552 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6553 | + rm -f conftest.er1 | ||
6554 | + cat conftest.err >&5 | ||
6555 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6556 | (exit $ac_status); } && | ||
6557 | - { ac_try='test -s conftest$ac_exeext' | ||
6558 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6559 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6560 | + (eval $ac_try) 2>&5 | ||
6561 | + ac_status=$? | ||
6562 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6563 | + (exit $ac_status); }; } && | ||
6564 | + { ac_try='test -s conftest$ac_exeext' | ||
6565 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6566 | (eval $ac_try) 2>&5 | ||
6567 | ac_status=$? | ||
6568 | @@ -8334,7 +8942,8 @@ | ||
6569 | |||
6570 | jm_cv_func_mbrtowc=no | ||
6571 | fi | ||
6572 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
6573 | +rm -f conftest.err conftest.$ac_objext \ | ||
6574 | + conftest$ac_exeext conftest.$ac_ext | ||
6575 | fi | ||
6576 | echo "$as_me:$LINENO: result: $jm_cv_func_mbrtowc" >&5 | ||
6577 | echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6 | ||
6578 | @@ -8348,69 +8957,465 @@ | ||
6579 | |||
6580 | |||
6581 | |||
6582 | - | ||
6583 | - | ||
6584 | - | ||
6585 | - | ||
6586 | -for ac_func in pathconf | ||
6587 | -do | ||
6588 | -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
6589 | -echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
6590 | -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
6591 | -if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
6592 | + echo "$as_me:$LINENO: checking whether free is declared" >&5 | ||
6593 | +echo $ECHO_N "checking whether free is declared... $ECHO_C" >&6 | ||
6594 | +if test "${ac_cv_have_decl_free+set}" = set; then | ||
6595 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6596 | else | ||
6597 | cat >conftest.$ac_ext <<_ACEOF | ||
6598 | -#line $LINENO "configure" | ||
6599 | /* confdefs.h. */ | ||
6600 | _ACEOF | ||
6601 | cat confdefs.h >>conftest.$ac_ext | ||
6602 | cat >>conftest.$ac_ext <<_ACEOF | ||
6603 | /* end confdefs.h. */ | ||
6604 | -/* System header to define __stub macros and hopefully few prototypes, | ||
6605 | - which can conflict with char $ac_func (); below. | ||
6606 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
6607 | - <limits.h> exists even on freestanding compilers. */ | ||
6608 | -#ifdef __STDC__ | ||
6609 | -# include <limits.h> | ||
6610 | -#else | ||
6611 | -# include <assert.h> | ||
6612 | -#endif | ||
6613 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
6614 | -#ifdef __cplusplus | ||
6615 | -extern "C" | ||
6616 | -{ | ||
6617 | -#endif | ||
6618 | -/* We use char because int might match the return type of a gcc2 | ||
6619 | - builtin and then its argument prototype would still apply. */ | ||
6620 | -char $ac_func (); | ||
6621 | -/* The GNU C library defines this for functions which it implements | ||
6622 | - to always fail with ENOSYS. Some functions are actually named | ||
6623 | - something starting with __ and the normal name is an alias. */ | ||
6624 | -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) | ||
6625 | -choke me | ||
6626 | -#else | ||
6627 | -char (*f) () = $ac_func; | ||
6628 | -#endif | ||
6629 | -#ifdef __cplusplus | ||
6630 | -} | ||
6631 | -#endif | ||
6632 | - | ||
6633 | +$ac_includes_default | ||
6634 | int | ||
6635 | main () | ||
6636 | { | ||
6637 | -return f != $ac_func; | ||
6638 | +#ifndef free | ||
6639 | + char *p = (char *) free; | ||
6640 | +#endif | ||
6641 | + | ||
6642 | ; | ||
6643 | return 0; | ||
6644 | } | ||
6645 | _ACEOF | ||
6646 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
6647 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6648 | - (eval $ac_link) 2>&5 | ||
6649 | +rm -f conftest.$ac_objext | ||
6650 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6651 | + (eval $ac_compile) 2>conftest.er1 | ||
6652 | + ac_status=$? | ||
6653 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6654 | + rm -f conftest.er1 | ||
6655 | + cat conftest.err >&5 | ||
6656 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6657 | + (exit $ac_status); } && | ||
6658 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6659 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6660 | + (eval $ac_try) 2>&5 | ||
6661 | + ac_status=$? | ||
6662 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6663 | + (exit $ac_status); }; } && | ||
6664 | + { ac_try='test -s conftest.$ac_objext' | ||
6665 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6666 | + (eval $ac_try) 2>&5 | ||
6667 | + ac_status=$? | ||
6668 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6669 | + (exit $ac_status); }; }; then | ||
6670 | + ac_cv_have_decl_free=yes | ||
6671 | +else | ||
6672 | + echo "$as_me: failed program was:" >&5 | ||
6673 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6674 | + | ||
6675 | +ac_cv_have_decl_free=no | ||
6676 | +fi | ||
6677 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6678 | +fi | ||
6679 | +echo "$as_me:$LINENO: result: $ac_cv_have_decl_free" >&5 | ||
6680 | +echo "${ECHO_T}$ac_cv_have_decl_free" >&6 | ||
6681 | +if test $ac_cv_have_decl_free = yes; then | ||
6682 | + | ||
6683 | +cat >>confdefs.h <<_ACEOF | ||
6684 | +#define HAVE_DECL_FREE 1 | ||
6685 | +_ACEOF | ||
6686 | + | ||
6687 | + | ||
6688 | +else | ||
6689 | + cat >>confdefs.h <<_ACEOF | ||
6690 | +#define HAVE_DECL_FREE 0 | ||
6691 | +_ACEOF | ||
6692 | + | ||
6693 | + | ||
6694 | +fi | ||
6695 | + | ||
6696 | + | ||
6697 | + | ||
6698 | + | ||
6699 | + | ||
6700 | + : | ||
6701 | + | ||
6702 | + | ||
6703 | + | ||
6704 | + | ||
6705 | + | ||
6706 | + echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 | ||
6707 | +echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 | ||
6708 | +if test "${ac_cv_header_stdbool_h+set}" = set; then | ||
6709 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6710 | +else | ||
6711 | + cat >conftest.$ac_ext <<_ACEOF | ||
6712 | +/* confdefs.h. */ | ||
6713 | +_ACEOF | ||
6714 | +cat confdefs.h >>conftest.$ac_ext | ||
6715 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6716 | +/* end confdefs.h. */ | ||
6717 | + | ||
6718 | + #include <stdbool.h> | ||
6719 | + #ifndef bool | ||
6720 | + "error: bool is not defined" | ||
6721 | + #endif | ||
6722 | + #ifndef false | ||
6723 | + "error: false is not defined" | ||
6724 | + #endif | ||
6725 | + #if false | ||
6726 | + "error: false is not 0" | ||
6727 | + #endif | ||
6728 | + #ifndef true | ||
6729 | + "error: false is not defined" | ||
6730 | + #endif | ||
6731 | + #if true != 1 | ||
6732 | + "error: true is not 1" | ||
6733 | + #endif | ||
6734 | + #ifndef __bool_true_false_are_defined | ||
6735 | + "error: __bool_true_false_are_defined is not defined" | ||
6736 | + #endif | ||
6737 | + | ||
6738 | + struct s { _Bool s: 1; _Bool t; } s; | ||
6739 | + | ||
6740 | + char a[true == 1 ? 1 : -1]; | ||
6741 | + char b[false == 0 ? 1 : -1]; | ||
6742 | + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
6743 | + char d[(bool) -0.5 == true ? 1 : -1]; | ||
6744 | + bool e = &s; | ||
6745 | + char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
6746 | + char g[true]; | ||
6747 | + char h[sizeof (_Bool)]; | ||
6748 | + char i[sizeof s.t]; | ||
6749 | + | ||
6750 | +int | ||
6751 | +main () | ||
6752 | +{ | ||
6753 | + return !a + !b + !c + !d + !e + !f + !g + !h + !i; | ||
6754 | + ; | ||
6755 | + return 0; | ||
6756 | +} | ||
6757 | +_ACEOF | ||
6758 | +rm -f conftest.$ac_objext | ||
6759 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6760 | + (eval $ac_compile) 2>conftest.er1 | ||
6761 | + ac_status=$? | ||
6762 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6763 | + rm -f conftest.er1 | ||
6764 | + cat conftest.err >&5 | ||
6765 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6766 | + (exit $ac_status); } && | ||
6767 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6768 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6769 | + (eval $ac_try) 2>&5 | ||
6770 | + ac_status=$? | ||
6771 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6772 | + (exit $ac_status); }; } && | ||
6773 | + { ac_try='test -s conftest.$ac_objext' | ||
6774 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6775 | + (eval $ac_try) 2>&5 | ||
6776 | + ac_status=$? | ||
6777 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6778 | + (exit $ac_status); }; }; then | ||
6779 | + ac_cv_header_stdbool_h=yes | ||
6780 | +else | ||
6781 | + echo "$as_me: failed program was:" >&5 | ||
6782 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6783 | + | ||
6784 | +ac_cv_header_stdbool_h=no | ||
6785 | +fi | ||
6786 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6787 | +fi | ||
6788 | +echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 | ||
6789 | +echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 | ||
6790 | + echo "$as_me:$LINENO: checking for _Bool" >&5 | ||
6791 | +echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 | ||
6792 | +if test "${ac_cv_type__Bool+set}" = set; then | ||
6793 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6794 | +else | ||
6795 | + cat >conftest.$ac_ext <<_ACEOF | ||
6796 | +/* confdefs.h. */ | ||
6797 | +_ACEOF | ||
6798 | +cat confdefs.h >>conftest.$ac_ext | ||
6799 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6800 | +/* end confdefs.h. */ | ||
6801 | +$ac_includes_default | ||
6802 | +int | ||
6803 | +main () | ||
6804 | +{ | ||
6805 | +if ((_Bool *) 0) | ||
6806 | + return 0; | ||
6807 | +if (sizeof (_Bool)) | ||
6808 | + return 0; | ||
6809 | + ; | ||
6810 | + return 0; | ||
6811 | +} | ||
6812 | +_ACEOF | ||
6813 | +rm -f conftest.$ac_objext | ||
6814 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6815 | + (eval $ac_compile) 2>conftest.er1 | ||
6816 | + ac_status=$? | ||
6817 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6818 | + rm -f conftest.er1 | ||
6819 | + cat conftest.err >&5 | ||
6820 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6821 | + (exit $ac_status); } && | ||
6822 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6823 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6824 | + (eval $ac_try) 2>&5 | ||
6825 | + ac_status=$? | ||
6826 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6827 | + (exit $ac_status); }; } && | ||
6828 | + { ac_try='test -s conftest.$ac_objext' | ||
6829 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6830 | + (eval $ac_try) 2>&5 | ||
6831 | + ac_status=$? | ||
6832 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6833 | + (exit $ac_status); }; }; then | ||
6834 | + ac_cv_type__Bool=yes | ||
6835 | +else | ||
6836 | + echo "$as_me: failed program was:" >&5 | ||
6837 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6838 | + | ||
6839 | +ac_cv_type__Bool=no | ||
6840 | +fi | ||
6841 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6842 | +fi | ||
6843 | +echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 | ||
6844 | +echo "${ECHO_T}$ac_cv_type__Bool" >&6 | ||
6845 | +if test $ac_cv_type__Bool = yes; then | ||
6846 | + | ||
6847 | +cat >>confdefs.h <<_ACEOF | ||
6848 | +#define HAVE__BOOL 1 | ||
6849 | +_ACEOF | ||
6850 | + | ||
6851 | + | ||
6852 | +fi | ||
6853 | + | ||
6854 | + if test $ac_cv_header_stdbool_h = yes; then | ||
6855 | + | ||
6856 | +cat >>confdefs.h <<\_ACEOF | ||
6857 | +#define HAVE_STDBOOL_H 1 | ||
6858 | +_ACEOF | ||
6859 | + | ||
6860 | + fi | ||
6861 | + | ||
6862 | + : | ||
6863 | + | ||
6864 | + | ||
6865 | + | ||
6866 | + | ||
6867 | + | ||
6868 | + | ||
6869 | + | ||
6870 | + | ||
6871 | + | ||
6872 | + | ||
6873 | +echo "$as_me:$LINENO: checking for nanosecond timestamps in struct stat" >&5 | ||
6874 | +echo $ECHO_N "checking for nanosecond timestamps in struct stat... $ECHO_C" >&6 | ||
6875 | +if test "${ac_cv_stat_nsec+set}" = set; then | ||
6876 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6877 | +else | ||
6878 | + cat >conftest.$ac_ext <<_ACEOF | ||
6879 | +/* confdefs.h. */ | ||
6880 | +_ACEOF | ||
6881 | +cat confdefs.h >>conftest.$ac_ext | ||
6882 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6883 | +/* end confdefs.h. */ | ||
6884 | + | ||
6885 | + #include <sys/types.h> | ||
6886 | + #include <sys/stat.h> | ||
6887 | + #include <unistd.h> | ||
6888 | + struct stat st; | ||
6889 | + | ||
6890 | +int | ||
6891 | +main () | ||
6892 | +{ | ||
6893 | + return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; | ||
6894 | + ; | ||
6895 | + return 0; | ||
6896 | +} | ||
6897 | +_ACEOF | ||
6898 | +rm -f conftest.$ac_objext | ||
6899 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6900 | + (eval $ac_compile) 2>conftest.er1 | ||
6901 | ac_status=$? | ||
6902 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6903 | + rm -f conftest.er1 | ||
6904 | + cat conftest.err >&5 | ||
6905 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6906 | (exit $ac_status); } && | ||
6907 | - { ac_try='test -s conftest$ac_exeext' | ||
6908 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6909 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6910 | + (eval $ac_try) 2>&5 | ||
6911 | + ac_status=$? | ||
6912 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6913 | + (exit $ac_status); }; } && | ||
6914 | + { ac_try='test -s conftest.$ac_objext' | ||
6915 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6916 | + (eval $ac_try) 2>&5 | ||
6917 | + ac_status=$? | ||
6918 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6919 | + (exit $ac_status); }; }; then | ||
6920 | + ac_cv_stat_nsec=yes | ||
6921 | +else | ||
6922 | + echo "$as_me: failed program was:" >&5 | ||
6923 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6924 | + | ||
6925 | +ac_cv_stat_nsec=no | ||
6926 | +fi | ||
6927 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6928 | + | ||
6929 | +fi | ||
6930 | +echo "$as_me:$LINENO: result: $ac_cv_stat_nsec" >&5 | ||
6931 | +echo "${ECHO_T}$ac_cv_stat_nsec" >&6 | ||
6932 | + if test $ac_cv_stat_nsec = yes; then | ||
6933 | + | ||
6934 | +cat >>confdefs.h <<\_ACEOF | ||
6935 | +#define HAVE_STAT_NSEC 1 | ||
6936 | +_ACEOF | ||
6937 | + | ||
6938 | + fi | ||
6939 | + | ||
6940 | + echo "$as_me:$LINENO: checking for nanosecond timestamps in struct stat" >&5 | ||
6941 | +echo $ECHO_N "checking for nanosecond timestamps in struct stat... $ECHO_C" >&6 | ||
6942 | +if test "${ac_cv_stat_timeval+set}" = set; then | ||
6943 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6944 | +else | ||
6945 | + cat >conftest.$ac_ext <<_ACEOF | ||
6946 | +/* confdefs.h. */ | ||
6947 | +_ACEOF | ||
6948 | +cat confdefs.h >>conftest.$ac_ext | ||
6949 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6950 | +/* end confdefs.h. */ | ||
6951 | + | ||
6952 | + #include <time.h> | ||
6953 | + #include <sys/types.h> | ||
6954 | + #include <sys/stat.h> | ||
6955 | + #include <unistd.h> | ||
6956 | + struct stat st; | ||
6957 | + | ||
6958 | +int | ||
6959 | +main () | ||
6960 | +{ | ||
6961 | + return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; | ||
6962 | + ; | ||
6963 | + return 0; | ||
6964 | +} | ||
6965 | +_ACEOF | ||
6966 | +rm -f conftest.$ac_objext | ||
6967 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6968 | + (eval $ac_compile) 2>conftest.er1 | ||
6969 | + ac_status=$? | ||
6970 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6971 | + rm -f conftest.er1 | ||
6972 | + cat conftest.err >&5 | ||
6973 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6974 | + (exit $ac_status); } && | ||
6975 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6976 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6977 | + (eval $ac_try) 2>&5 | ||
6978 | + ac_status=$? | ||
6979 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6980 | + (exit $ac_status); }; } && | ||
6981 | + { ac_try='test -s conftest.$ac_objext' | ||
6982 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6983 | + (eval $ac_try) 2>&5 | ||
6984 | + ac_status=$? | ||
6985 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6986 | + (exit $ac_status); }; }; then | ||
6987 | + ac_cv_stat_timeval=yes | ||
6988 | +else | ||
6989 | + echo "$as_me: failed program was:" >&5 | ||
6990 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6991 | + | ||
6992 | +ac_cv_stat_timeval=no | ||
6993 | +fi | ||
6994 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6995 | + | ||
6996 | +fi | ||
6997 | +echo "$as_me:$LINENO: result: $ac_cv_stat_timeval" >&5 | ||
6998 | +echo "${ECHO_T}$ac_cv_stat_timeval" >&6 | ||
6999 | + if test $ac_cv_stat_timeval = yes; then | ||
7000 | + | ||
7001 | +cat >>confdefs.h <<\_ACEOF | ||
7002 | +#define HAVE_STAT_TIMEVAL 1 | ||
7003 | +_ACEOF | ||
7004 | + | ||
7005 | + fi | ||
7006 | + | ||
7007 | + | ||
7008 | + | ||
7009 | + | ||
7010 | + | ||
7011 | +for ac_func in pathconf | ||
7012 | +do | ||
7013 | +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
7014 | +echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
7015 | +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
7016 | +if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
7017 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7018 | +else | ||
7019 | + cat >conftest.$ac_ext <<_ACEOF | ||
7020 | +/* confdefs.h. */ | ||
7021 | +_ACEOF | ||
7022 | +cat confdefs.h >>conftest.$ac_ext | ||
7023 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7024 | +/* end confdefs.h. */ | ||
7025 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7026 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7027 | +#define $ac_func innocuous_$ac_func | ||
7028 | + | ||
7029 | +/* System header to define __stub macros and hopefully few prototypes, | ||
7030 | + which can conflict with char $ac_func (); below. | ||
7031 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7032 | + <limits.h> exists even on freestanding compilers. */ | ||
7033 | + | ||
7034 | +#ifdef __STDC__ | ||
7035 | +# include <limits.h> | ||
7036 | +#else | ||
7037 | +# include <assert.h> | ||
7038 | +#endif | ||
7039 | + | ||
7040 | +#undef $ac_func | ||
7041 | + | ||
7042 | +/* Override any gcc2 internal prototype to avoid an error. */ | ||
7043 | +#ifdef __cplusplus | ||
7044 | +extern "C" | ||
7045 | +{ | ||
7046 | +#endif | ||
7047 | +/* We use char because int might match the return type of a gcc2 | ||
7048 | + builtin and then its argument prototype would still apply. */ | ||
7049 | +char $ac_func (); | ||
7050 | +/* The GNU C library defines this for functions which it implements | ||
7051 | + to always fail with ENOSYS. Some functions are actually named | ||
7052 | + something starting with __ and the normal name is an alias. */ | ||
7053 | +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) | ||
7054 | +choke me | ||
7055 | +#else | ||
7056 | +char (*f) () = $ac_func; | ||
7057 | +#endif | ||
7058 | +#ifdef __cplusplus | ||
7059 | +} | ||
7060 | +#endif | ||
7061 | + | ||
7062 | +int | ||
7063 | +main () | ||
7064 | +{ | ||
7065 | +return f != $ac_func; | ||
7066 | + ; | ||
7067 | + return 0; | ||
7068 | +} | ||
7069 | +_ACEOF | ||
7070 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
7071 | +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7072 | + (eval $ac_link) 2>conftest.er1 | ||
7073 | + ac_status=$? | ||
7074 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7075 | + rm -f conftest.er1 | ||
7076 | + cat conftest.err >&5 | ||
7077 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7078 | + (exit $ac_status); } && | ||
7079 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7080 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7081 | + (eval $ac_try) 2>&5 | ||
7082 | + ac_status=$? | ||
7083 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7084 | + (exit $ac_status); }; } && | ||
7085 | + { ac_try='test -s conftest$ac_exeext' | ||
7086 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7087 | (eval $ac_try) 2>&5 | ||
7088 | ac_status=$? | ||
7089 | @@ -8423,7 +9428,8 @@ | ||
7090 | |||
7091 | eval "$as_ac_var=no" | ||
7092 | fi | ||
7093 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7094 | +rm -f conftest.err conftest.$ac_objext \ | ||
7095 | + conftest$ac_exeext conftest.$ac_ext | ||
7096 | fi | ||
7097 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
7098 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
7099 | @@ -8454,7 +9460,6 @@ | ||
7100 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
7101 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
7102 | cat >conftest.$ac_ext <<_ACEOF | ||
7103 | -#line $LINENO "configure" | ||
7104 | /* confdefs.h. */ | ||
7105 | _ACEOF | ||
7106 | cat confdefs.h >>conftest.$ac_ext | ||
7107 | @@ -8465,11 +9470,20 @@ | ||
7108 | _ACEOF | ||
7109 | rm -f conftest.$ac_objext | ||
7110 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7111 | - (eval $ac_compile) 2>&5 | ||
7112 | + (eval $ac_compile) 2>conftest.er1 | ||
7113 | ac_status=$? | ||
7114 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7115 | + rm -f conftest.er1 | ||
7116 | + cat conftest.err >&5 | ||
7117 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7118 | (exit $ac_status); } && | ||
7119 | - { ac_try='test -s conftest.$ac_objext' | ||
7120 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7121 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7122 | + (eval $ac_try) 2>&5 | ||
7123 | + ac_status=$? | ||
7124 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7125 | + (exit $ac_status); }; } && | ||
7126 | + { ac_try='test -s conftest.$ac_objext' | ||
7127 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7128 | (eval $ac_try) 2>&5 | ||
7129 | ac_status=$? | ||
7130 | @@ -8482,7 +9496,7 @@ | ||
7131 | |||
7132 | ac_header_compiler=no | ||
7133 | fi | ||
7134 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7135 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7136 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
7137 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
7138 | |||
7139 | @@ -8490,7 +9504,6 @@ | ||
7140 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
7141 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
7142 | cat >conftest.$ac_ext <<_ACEOF | ||
7143 | -#line $LINENO "configure" | ||
7144 | /* confdefs.h. */ | ||
7145 | _ACEOF | ||
7146 | cat confdefs.h >>conftest.$ac_ext | ||
7147 | @@ -8508,6 +9521,7 @@ | ||
7148 | (exit $ac_status); } >/dev/null; then | ||
7149 | if test -s conftest.err; then | ||
7150 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
7151 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
7152 | else | ||
7153 | ac_cpp_err= | ||
7154 | fi | ||
7155 | @@ -8527,33 +9541,32 @@ | ||
7156 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
7157 | |||
7158 | # So? What about this header? | ||
7159 | -case $ac_header_compiler:$ac_header_preproc in | ||
7160 | - yes:no ) | ||
7161 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
7162 | + yes:no: ) | ||
7163 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
7164 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
7165 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
7166 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
7167 | - ( | ||
7168 | - cat <<\_ASBOX | ||
7169 | -## ------------------------------------ ## | ||
7170 | -## Report this to bug-autoconf@gnu.org. ## | ||
7171 | -## ------------------------------------ ## | ||
7172 | -_ASBOX | ||
7173 | - ) | | ||
7174 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
7175 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
7176 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
7177 | + ac_header_preproc=yes | ||
7178 | ;; | ||
7179 | - no:yes ) | ||
7180 | + no:yes:* ) | ||
7181 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
7182 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
7183 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
7184 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
7188 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
7189 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
7190 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
7191 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
7192 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
7193 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
7194 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
7195 | ( | ||
7196 | cat <<\_ASBOX | ||
7197 | -## ------------------------------------ ## | ||
7198 | -## Report this to bug-autoconf@gnu.org. ## | ||
7199 | -## ------------------------------------ ## | ||
7200 | +## -------------------------------- ## | ||
7201 | +## Report this to bug-patch@gnu.org ## | ||
7202 | +## -------------------------------- ## | ||
7203 | _ASBOX | ||
7204 | ) | | ||
7205 | sed "s/^/$as_me: WARNING: /" >&2 | ||
7206 | @@ -8564,7 +9577,7 @@ | ||
7207 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
7208 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7209 | else | ||
7210 | - eval "$as_ac_Header=$ac_header_preproc" | ||
7211 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
7212 | fi | ||
7213 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7214 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
7215 | @@ -8587,7 +9600,6 @@ | ||
7216 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7217 | else | ||
7218 | cat >conftest.$ac_ext <<_ACEOF | ||
7219 | -#line $LINENO "configure" | ||
7220 | /* confdefs.h. */ | ||
7221 | _ACEOF | ||
7222 | cat confdefs.h >>conftest.$ac_ext | ||
7223 | @@ -8607,11 +9619,20 @@ | ||
7224 | _ACEOF | ||
7225 | rm -f conftest.$ac_objext | ||
7226 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7227 | - (eval $ac_compile) 2>&5 | ||
7228 | + (eval $ac_compile) 2>conftest.er1 | ||
7229 | ac_status=$? | ||
7230 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7231 | + rm -f conftest.er1 | ||
7232 | + cat conftest.err >&5 | ||
7233 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7234 | (exit $ac_status); } && | ||
7235 | - { ac_try='test -s conftest.$ac_objext' | ||
7236 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7237 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7238 | + (eval $ac_try) 2>&5 | ||
7239 | + ac_status=$? | ||
7240 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7241 | + (exit $ac_status); }; } && | ||
7242 | + { ac_try='test -s conftest.$ac_objext' | ||
7243 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7244 | (eval $ac_try) 2>&5 | ||
7245 | ac_status=$? | ||
7246 | @@ -8624,7 +9645,7 @@ | ||
7247 | |||
7248 | ac_cv_have_decl_free=no | ||
7249 | fi | ||
7250 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7251 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7252 | fi | ||
7253 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_free" >&5 | ||
7254 | echo "${ECHO_T}$ac_cv_have_decl_free" >&6 | ||
7255 | @@ -8648,7 +9669,6 @@ | ||
7256 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7257 | else | ||
7258 | cat >conftest.$ac_ext <<_ACEOF | ||
7259 | -#line $LINENO "configure" | ||
7260 | /* confdefs.h. */ | ||
7261 | _ACEOF | ||
7262 | cat confdefs.h >>conftest.$ac_ext | ||
7263 | @@ -8668,11 +9688,20 @@ | ||
7264 | _ACEOF | ||
7265 | rm -f conftest.$ac_objext | ||
7266 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7267 | - (eval $ac_compile) 2>&5 | ||
7268 | + (eval $ac_compile) 2>conftest.er1 | ||
7269 | ac_status=$? | ||
7270 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7271 | + rm -f conftest.er1 | ||
7272 | + cat conftest.err >&5 | ||
7273 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7274 | (exit $ac_status); } && | ||
7275 | - { ac_try='test -s conftest.$ac_objext' | ||
7276 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7277 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7278 | + (eval $ac_try) 2>&5 | ||
7279 | + ac_status=$? | ||
7280 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7281 | + (exit $ac_status); }; } && | ||
7282 | + { ac_try='test -s conftest.$ac_objext' | ||
7283 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7284 | (eval $ac_try) 2>&5 | ||
7285 | ac_status=$? | ||
7286 | @@ -8685,7 +9714,7 @@ | ||
7287 | |||
7288 | ac_cv_have_decl_getenv=no | ||
7289 | fi | ||
7290 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7291 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7292 | fi | ||
7293 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5 | ||
7294 | echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6 | ||
7295 | @@ -8709,7 +9738,6 @@ | ||
7296 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7297 | else | ||
7298 | cat >conftest.$ac_ext <<_ACEOF | ||
7299 | -#line $LINENO "configure" | ||
7300 | /* confdefs.h. */ | ||
7301 | _ACEOF | ||
7302 | cat confdefs.h >>conftest.$ac_ext | ||
7303 | @@ -8729,11 +9757,20 @@ | ||
7304 | _ACEOF | ||
7305 | rm -f conftest.$ac_objext | ||
7306 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7307 | - (eval $ac_compile) 2>&5 | ||
7308 | + (eval $ac_compile) 2>conftest.er1 | ||
7309 | ac_status=$? | ||
7310 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7311 | + rm -f conftest.er1 | ||
7312 | + cat conftest.err >&5 | ||
7313 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7314 | (exit $ac_status); } && | ||
7315 | - { ac_try='test -s conftest.$ac_objext' | ||
7316 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7317 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7318 | + (eval $ac_try) 2>&5 | ||
7319 | + ac_status=$? | ||
7320 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7321 | + (exit $ac_status); }; } && | ||
7322 | + { ac_try='test -s conftest.$ac_objext' | ||
7323 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7324 | (eval $ac_try) 2>&5 | ||
7325 | ac_status=$? | ||
7326 | @@ -8746,7 +9783,7 @@ | ||
7327 | |||
7328 | ac_cv_have_decl_malloc=no | ||
7329 | fi | ||
7330 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7331 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7332 | fi | ||
7333 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_malloc" >&5 | ||
7334 | echo "${ECHO_T}$ac_cv_have_decl_malloc" >&6 | ||
7335 | @@ -8770,7 +9807,6 @@ | ||
7336 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7337 | else | ||
7338 | cat >conftest.$ac_ext <<_ACEOF | ||
7339 | -#line $LINENO "configure" | ||
7340 | /* confdefs.h. */ | ||
7341 | _ACEOF | ||
7342 | cat confdefs.h >>conftest.$ac_ext | ||
7343 | @@ -8790,11 +9826,20 @@ | ||
7344 | _ACEOF | ||
7345 | rm -f conftest.$ac_objext | ||
7346 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7347 | - (eval $ac_compile) 2>&5 | ||
7348 | + (eval $ac_compile) 2>conftest.er1 | ||
7349 | ac_status=$? | ||
7350 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7351 | + rm -f conftest.er1 | ||
7352 | + cat conftest.err >&5 | ||
7353 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7354 | (exit $ac_status); } && | ||
7355 | - { ac_try='test -s conftest.$ac_objext' | ||
7356 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7357 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7358 | + (eval $ac_try) 2>&5 | ||
7359 | + ac_status=$? | ||
7360 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7361 | + (exit $ac_status); }; } && | ||
7362 | + { ac_try='test -s conftest.$ac_objext' | ||
7363 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7364 | (eval $ac_try) 2>&5 | ||
7365 | ac_status=$? | ||
7366 | @@ -8807,7 +9852,7 @@ | ||
7367 | |||
7368 | ac_cv_have_decl_mktemp=no | ||
7369 | fi | ||
7370 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7371 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7372 | fi | ||
7373 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_mktemp" >&5 | ||
7374 | echo "${ECHO_T}$ac_cv_have_decl_mktemp" >&6 | ||
7375 | @@ -8849,21 +9894,28 @@ | ||
7376 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7377 | else | ||
7378 | cat >conftest.$ac_ext <<_ACEOF | ||
7379 | -#line $LINENO "configure" | ||
7380 | /* confdefs.h. */ | ||
7381 | _ACEOF | ||
7382 | cat confdefs.h >>conftest.$ac_ext | ||
7383 | cat >>conftest.$ac_ext <<_ACEOF | ||
7384 | /* end confdefs.h. */ | ||
7385 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7386 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7387 | +#define $ac_func innocuous_$ac_func | ||
7388 | + | ||
7389 | /* System header to define __stub macros and hopefully few prototypes, | ||
7390 | which can conflict with char $ac_func (); below. | ||
7391 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7392 | <limits.h> exists even on freestanding compilers. */ | ||
7393 | + | ||
7394 | #ifdef __STDC__ | ||
7395 | # include <limits.h> | ||
7396 | #else | ||
7397 | # include <assert.h> | ||
7398 | #endif | ||
7399 | + | ||
7400 | +#undef $ac_func | ||
7401 | + | ||
7402 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7403 | #ifdef __cplusplus | ||
7404 | extern "C" | ||
7405 | @@ -8894,11 +9946,20 @@ | ||
7406 | _ACEOF | ||
7407 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7408 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7409 | - (eval $ac_link) 2>&5 | ||
7410 | + (eval $ac_link) 2>conftest.er1 | ||
7411 | ac_status=$? | ||
7412 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7413 | + rm -f conftest.er1 | ||
7414 | + cat conftest.err >&5 | ||
7415 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7416 | (exit $ac_status); } && | ||
7417 | - { ac_try='test -s conftest$ac_exeext' | ||
7418 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7419 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7420 | + (eval $ac_try) 2>&5 | ||
7421 | + ac_status=$? | ||
7422 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7423 | + (exit $ac_status); }; } && | ||
7424 | + { ac_try='test -s conftest$ac_exeext' | ||
7425 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7426 | (eval $ac_try) 2>&5 | ||
7427 | ac_status=$? | ||
7428 | @@ -8911,7 +9972,8 @@ | ||
7429 | |||
7430 | eval "$as_ac_var=no" | ||
7431 | fi | ||
7432 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7433 | +rm -f conftest.err conftest.$ac_objext \ | ||
7434 | + conftest$ac_exeext conftest.$ac_ext | ||
7435 | fi | ||
7436 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
7437 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
7438 | @@ -8934,21 +9996,28 @@ | ||
7439 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7440 | else | ||
7441 | cat >conftest.$ac_ext <<_ACEOF | ||
7442 | -#line $LINENO "configure" | ||
7443 | /* confdefs.h. */ | ||
7444 | _ACEOF | ||
7445 | cat confdefs.h >>conftest.$ac_ext | ||
7446 | cat >>conftest.$ac_ext <<_ACEOF | ||
7447 | /* end confdefs.h. */ | ||
7448 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7449 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7450 | +#define $ac_func innocuous_$ac_func | ||
7451 | + | ||
7452 | /* System header to define __stub macros and hopefully few prototypes, | ||
7453 | which can conflict with char $ac_func (); below. | ||
7454 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7455 | <limits.h> exists even on freestanding compilers. */ | ||
7456 | + | ||
7457 | #ifdef __STDC__ | ||
7458 | # include <limits.h> | ||
7459 | #else | ||
7460 | # include <assert.h> | ||
7461 | #endif | ||
7462 | + | ||
7463 | +#undef $ac_func | ||
7464 | + | ||
7465 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7466 | #ifdef __cplusplus | ||
7467 | extern "C" | ||
7468 | @@ -8979,11 +10048,20 @@ | ||
7469 | _ACEOF | ||
7470 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7471 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7472 | - (eval $ac_link) 2>&5 | ||
7473 | + (eval $ac_link) 2>conftest.er1 | ||
7474 | ac_status=$? | ||
7475 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7476 | + rm -f conftest.er1 | ||
7477 | + cat conftest.err >&5 | ||
7478 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7479 | (exit $ac_status); } && | ||
7480 | - { ac_try='test -s conftest$ac_exeext' | ||
7481 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7482 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7483 | + (eval $ac_try) 2>&5 | ||
7484 | + ac_status=$? | ||
7485 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7486 | + (exit $ac_status); }; } && | ||
7487 | + { ac_try='test -s conftest$ac_exeext' | ||
7488 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7489 | (eval $ac_try) 2>&5 | ||
7490 | ac_status=$? | ||
7491 | @@ -8996,7 +10074,8 @@ | ||
7492 | |||
7493 | eval "$as_ac_var=no" | ||
7494 | fi | ||
7495 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7496 | +rm -f conftest.err conftest.$ac_objext \ | ||
7497 | + conftest$ac_exeext conftest.$ac_ext | ||
7498 | fi | ||
7499 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
7500 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
7501 | @@ -9006,7 +10085,14 @@ | ||
7502 | _ACEOF | ||
7503 | |||
7504 | else | ||
7505 | - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" | ||
7506 | + case $LIBOBJS in | ||
7507 | + "$ac_func.$ac_objext" | \ | ||
7508 | + *" $ac_func.$ac_objext" | \ | ||
7509 | + "$ac_func.$ac_objext "* | \ | ||
7510 | + *" $ac_func.$ac_objext "* ) ;; | ||
7511 | + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; | ||
7512 | +esac | ||
7513 | + | ||
7514 | fi | ||
7515 | done | ||
7516 | |||
7517 | @@ -9019,7 +10105,6 @@ | ||
7518 | while :; do | ||
7519 | ac_cv_sys_largefile_source=no | ||
7520 | cat >conftest.$ac_ext <<_ACEOF | ||
7521 | -#line $LINENO "configure" | ||
7522 | /* confdefs.h. */ | ||
7523 | _ACEOF | ||
7524 | cat confdefs.h >>conftest.$ac_ext | ||
7525 | @@ -9036,11 +10121,20 @@ | ||
7526 | _ACEOF | ||
7527 | rm -f conftest.$ac_objext | ||
7528 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7529 | - (eval $ac_compile) 2>&5 | ||
7530 | + (eval $ac_compile) 2>conftest.er1 | ||
7531 | ac_status=$? | ||
7532 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7533 | + rm -f conftest.er1 | ||
7534 | + cat conftest.err >&5 | ||
7535 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7536 | (exit $ac_status); } && | ||
7537 | - { ac_try='test -s conftest.$ac_objext' | ||
7538 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7539 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7540 | + (eval $ac_try) 2>&5 | ||
7541 | + ac_status=$? | ||
7542 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7543 | + (exit $ac_status); }; } && | ||
7544 | + { ac_try='test -s conftest.$ac_objext' | ||
7545 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7546 | (eval $ac_try) 2>&5 | ||
7547 | ac_status=$? | ||
7548 | @@ -9052,9 +10146,8 @@ | ||
7549 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7550 | |||
7551 | fi | ||
7552 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7553 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7554 | cat >conftest.$ac_ext <<_ACEOF | ||
7555 | -#line $LINENO "configure" | ||
7556 | /* confdefs.h. */ | ||
7557 | _ACEOF | ||
7558 | cat confdefs.h >>conftest.$ac_ext | ||
7559 | @@ -9072,11 +10165,20 @@ | ||
7560 | _ACEOF | ||
7561 | rm -f conftest.$ac_objext | ||
7562 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7563 | - (eval $ac_compile) 2>&5 | ||
7564 | + (eval $ac_compile) 2>conftest.er1 | ||
7565 | ac_status=$? | ||
7566 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7567 | + rm -f conftest.er1 | ||
7568 | + cat conftest.err >&5 | ||
7569 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7570 | (exit $ac_status); } && | ||
7571 | - { ac_try='test -s conftest.$ac_objext' | ||
7572 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7573 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7574 | + (eval $ac_try) 2>&5 | ||
7575 | + ac_status=$? | ||
7576 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7577 | + (exit $ac_status); }; } && | ||
7578 | + { ac_try='test -s conftest.$ac_objext' | ||
7579 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7580 | (eval $ac_try) 2>&5 | ||
7581 | ac_status=$? | ||
7582 | @@ -9088,7 +10190,7 @@ | ||
7583 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7584 | |||
7585 | fi | ||
7586 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7587 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7588 | break | ||
7589 | done | ||
7590 | fi | ||
7591 | @@ -9112,7 +10214,6 @@ | ||
7592 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7593 | else | ||
7594 | cat >conftest.$ac_ext <<_ACEOF | ||
7595 | -#line $LINENO "configure" | ||
7596 | /* confdefs.h. */ | ||
7597 | _ACEOF | ||
7598 | cat confdefs.h >>conftest.$ac_ext | ||
7599 | @@ -9129,11 +10230,20 @@ | ||
7600 | _ACEOF | ||
7601 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7602 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7603 | - (eval $ac_link) 2>&5 | ||
7604 | + (eval $ac_link) 2>conftest.er1 | ||
7605 | ac_status=$? | ||
7606 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7607 | + rm -f conftest.er1 | ||
7608 | + cat conftest.err >&5 | ||
7609 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7610 | (exit $ac_status); } && | ||
7611 | - { ac_try='test -s conftest$ac_exeext' | ||
7612 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7613 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7614 | + (eval $ac_try) 2>&5 | ||
7615 | + ac_status=$? | ||
7616 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7617 | + (exit $ac_status); }; } && | ||
7618 | + { ac_try='test -s conftest$ac_exeext' | ||
7619 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7620 | (eval $ac_try) 2>&5 | ||
7621 | ac_status=$? | ||
7622 | @@ -9146,7 +10256,8 @@ | ||
7623 | |||
7624 | ac_cv_func_fseeko=no | ||
7625 | fi | ||
7626 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7627 | +rm -f conftest.err conftest.$ac_objext \ | ||
7628 | + conftest$ac_exeext conftest.$ac_ext | ||
7629 | fi | ||
7630 | echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5 | ||
7631 | echo "${ECHO_T}$ac_cv_func_fseeko" >&6 | ||
7632 | @@ -9165,7 +10276,6 @@ | ||
7633 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7634 | else | ||
7635 | cat >conftest.$ac_ext <<_ACEOF | ||
7636 | -#line $LINENO "configure" | ||
7637 | /* confdefs.h. */ | ||
7638 | _ACEOF | ||
7639 | cat confdefs.h >>conftest.$ac_ext | ||
7640 | @@ -9185,11 +10295,20 @@ | ||
7641 | _ACEOF | ||
7642 | rm -f conftest.$ac_objext | ||
7643 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7644 | - (eval $ac_compile) 2>&5 | ||
7645 | + (eval $ac_compile) 2>conftest.er1 | ||
7646 | ac_status=$? | ||
7647 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7648 | + rm -f conftest.er1 | ||
7649 | + cat conftest.err >&5 | ||
7650 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7651 | (exit $ac_status); } && | ||
7652 | - { ac_try='test -s conftest.$ac_objext' | ||
7653 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7654 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7655 | + (eval $ac_try) 2>&5 | ||
7656 | + ac_status=$? | ||
7657 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7658 | + (exit $ac_status); }; } && | ||
7659 | + { ac_try='test -s conftest.$ac_objext' | ||
7660 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7661 | (eval $ac_try) 2>&5 | ||
7662 | ac_status=$? | ||
7663 | @@ -9202,7 +10321,7 @@ | ||
7664 | |||
7665 | ac_cv_have_decl_clearerr_unlocked=no | ||
7666 | fi | ||
7667 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7668 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7669 | fi | ||
7670 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_clearerr_unlocked" >&5 | ||
7671 | echo "${ECHO_T}$ac_cv_have_decl_clearerr_unlocked" >&6 | ||
7672 | @@ -9230,7 +10349,6 @@ | ||
7673 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7674 | else | ||
7675 | cat >conftest.$ac_ext <<_ACEOF | ||
7676 | -#line $LINENO "configure" | ||
7677 | /* confdefs.h. */ | ||
7678 | _ACEOF | ||
7679 | cat confdefs.h >>conftest.$ac_ext | ||
7680 | @@ -9250,11 +10368,20 @@ | ||
7681 | _ACEOF | ||
7682 | rm -f conftest.$ac_objext | ||
7683 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7684 | - (eval $ac_compile) 2>&5 | ||
7685 | + (eval $ac_compile) 2>conftest.er1 | ||
7686 | ac_status=$? | ||
7687 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7688 | + rm -f conftest.er1 | ||
7689 | + cat conftest.err >&5 | ||
7690 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7691 | (exit $ac_status); } && | ||
7692 | - { ac_try='test -s conftest.$ac_objext' | ||
7693 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7694 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7695 | + (eval $ac_try) 2>&5 | ||
7696 | + ac_status=$? | ||
7697 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7698 | + (exit $ac_status); }; } && | ||
7699 | + { ac_try='test -s conftest.$ac_objext' | ||
7700 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7701 | (eval $ac_try) 2>&5 | ||
7702 | ac_status=$? | ||
7703 | @@ -9267,7 +10394,7 @@ | ||
7704 | |||
7705 | ac_cv_have_decl_feof_unlocked=no | ||
7706 | fi | ||
7707 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7708 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7709 | fi | ||
7710 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5 | ||
7711 | echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6 | ||
7712 | @@ -9295,7 +10422,6 @@ | ||
7713 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7714 | else | ||
7715 | cat >conftest.$ac_ext <<_ACEOF | ||
7716 | -#line $LINENO "configure" | ||
7717 | /* confdefs.h. */ | ||
7718 | _ACEOF | ||
7719 | cat confdefs.h >>conftest.$ac_ext | ||
7720 | @@ -9315,11 +10441,20 @@ | ||
7721 | _ACEOF | ||
7722 | rm -f conftest.$ac_objext | ||
7723 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7724 | - (eval $ac_compile) 2>&5 | ||
7725 | + (eval $ac_compile) 2>conftest.er1 | ||
7726 | ac_status=$? | ||
7727 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7728 | + rm -f conftest.er1 | ||
7729 | + cat conftest.err >&5 | ||
7730 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7731 | (exit $ac_status); } && | ||
7732 | - { ac_try='test -s conftest.$ac_objext' | ||
7733 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7734 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7735 | + (eval $ac_try) 2>&5 | ||
7736 | + ac_status=$? | ||
7737 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7738 | + (exit $ac_status); }; } && | ||
7739 | + { ac_try='test -s conftest.$ac_objext' | ||
7740 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7741 | (eval $ac_try) 2>&5 | ||
7742 | ac_status=$? | ||
7743 | @@ -9332,7 +10467,7 @@ | ||
7744 | |||
7745 | ac_cv_have_decl_ferror_unlocked=no | ||
7746 | fi | ||
7747 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7748 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7749 | fi | ||
7750 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_ferror_unlocked" >&5 | ||
7751 | echo "${ECHO_T}$ac_cv_have_decl_ferror_unlocked" >&6 | ||
7752 | @@ -9360,7 +10495,6 @@ | ||
7753 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7754 | else | ||
7755 | cat >conftest.$ac_ext <<_ACEOF | ||
7756 | -#line $LINENO "configure" | ||
7757 | /* confdefs.h. */ | ||
7758 | _ACEOF | ||
7759 | cat confdefs.h >>conftest.$ac_ext | ||
7760 | @@ -9380,11 +10514,20 @@ | ||
7761 | _ACEOF | ||
7762 | rm -f conftest.$ac_objext | ||
7763 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7764 | - (eval $ac_compile) 2>&5 | ||
7765 | + (eval $ac_compile) 2>conftest.er1 | ||
7766 | ac_status=$? | ||
7767 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7768 | + rm -f conftest.er1 | ||
7769 | + cat conftest.err >&5 | ||
7770 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7771 | (exit $ac_status); } && | ||
7772 | - { ac_try='test -s conftest.$ac_objext' | ||
7773 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7774 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7775 | + (eval $ac_try) 2>&5 | ||
7776 | + ac_status=$? | ||
7777 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7778 | + (exit $ac_status); }; } && | ||
7779 | + { ac_try='test -s conftest.$ac_objext' | ||
7780 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7781 | (eval $ac_try) 2>&5 | ||
7782 | ac_status=$? | ||
7783 | @@ -9397,7 +10540,7 @@ | ||
7784 | |||
7785 | ac_cv_have_decl_fflush_unlocked=no | ||
7786 | fi | ||
7787 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7788 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7789 | fi | ||
7790 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fflush_unlocked" >&5 | ||
7791 | echo "${ECHO_T}$ac_cv_have_decl_fflush_unlocked" >&6 | ||
7792 | @@ -9425,7 +10568,6 @@ | ||
7793 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7794 | else | ||
7795 | cat >conftest.$ac_ext <<_ACEOF | ||
7796 | -#line $LINENO "configure" | ||
7797 | /* confdefs.h. */ | ||
7798 | _ACEOF | ||
7799 | cat confdefs.h >>conftest.$ac_ext | ||
7800 | @@ -9445,11 +10587,20 @@ | ||
7801 | _ACEOF | ||
7802 | rm -f conftest.$ac_objext | ||
7803 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7804 | - (eval $ac_compile) 2>&5 | ||
7805 | + (eval $ac_compile) 2>conftest.er1 | ||
7806 | ac_status=$? | ||
7807 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7808 | + rm -f conftest.er1 | ||
7809 | + cat conftest.err >&5 | ||
7810 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7811 | (exit $ac_status); } && | ||
7812 | - { ac_try='test -s conftest.$ac_objext' | ||
7813 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7814 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7815 | + (eval $ac_try) 2>&5 | ||
7816 | + ac_status=$? | ||
7817 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7818 | + (exit $ac_status); }; } && | ||
7819 | + { ac_try='test -s conftest.$ac_objext' | ||
7820 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7821 | (eval $ac_try) 2>&5 | ||
7822 | ac_status=$? | ||
7823 | @@ -9462,7 +10613,7 @@ | ||
7824 | |||
7825 | ac_cv_have_decl_fgets_unlocked=no | ||
7826 | fi | ||
7827 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7828 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7829 | fi | ||
7830 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5 | ||
7831 | echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6 | ||
7832 | @@ -9490,7 +10641,6 @@ | ||
7833 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7834 | else | ||
7835 | cat >conftest.$ac_ext <<_ACEOF | ||
7836 | -#line $LINENO "configure" | ||
7837 | /* confdefs.h. */ | ||
7838 | _ACEOF | ||
7839 | cat confdefs.h >>conftest.$ac_ext | ||
7840 | @@ -9510,11 +10660,20 @@ | ||
7841 | _ACEOF | ||
7842 | rm -f conftest.$ac_objext | ||
7843 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7844 | - (eval $ac_compile) 2>&5 | ||
7845 | + (eval $ac_compile) 2>conftest.er1 | ||
7846 | ac_status=$? | ||
7847 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7848 | + rm -f conftest.er1 | ||
7849 | + cat conftest.err >&5 | ||
7850 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7851 | (exit $ac_status); } && | ||
7852 | - { ac_try='test -s conftest.$ac_objext' | ||
7853 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7854 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7855 | + (eval $ac_try) 2>&5 | ||
7856 | + ac_status=$? | ||
7857 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7858 | + (exit $ac_status); }; } && | ||
7859 | + { ac_try='test -s conftest.$ac_objext' | ||
7860 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7861 | (eval $ac_try) 2>&5 | ||
7862 | ac_status=$? | ||
7863 | @@ -9527,7 +10686,7 @@ | ||
7864 | |||
7865 | ac_cv_have_decl_fputc_unlocked=no | ||
7866 | fi | ||
7867 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7868 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7869 | fi | ||
7870 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputc_unlocked" >&5 | ||
7871 | echo "${ECHO_T}$ac_cv_have_decl_fputc_unlocked" >&6 | ||
7872 | @@ -9555,7 +10714,6 @@ | ||
7873 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7874 | else | ||
7875 | cat >conftest.$ac_ext <<_ACEOF | ||
7876 | -#line $LINENO "configure" | ||
7877 | /* confdefs.h. */ | ||
7878 | _ACEOF | ||
7879 | cat confdefs.h >>conftest.$ac_ext | ||
7880 | @@ -9575,11 +10733,20 @@ | ||
7881 | _ACEOF | ||
7882 | rm -f conftest.$ac_objext | ||
7883 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7884 | - (eval $ac_compile) 2>&5 | ||
7885 | + (eval $ac_compile) 2>conftest.er1 | ||
7886 | ac_status=$? | ||
7887 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7888 | + rm -f conftest.er1 | ||
7889 | + cat conftest.err >&5 | ||
7890 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7891 | (exit $ac_status); } && | ||
7892 | - { ac_try='test -s conftest.$ac_objext' | ||
7893 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7894 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7895 | + (eval $ac_try) 2>&5 | ||
7896 | + ac_status=$? | ||
7897 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7898 | + (exit $ac_status); }; } && | ||
7899 | + { ac_try='test -s conftest.$ac_objext' | ||
7900 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7901 | (eval $ac_try) 2>&5 | ||
7902 | ac_status=$? | ||
7903 | @@ -9592,7 +10759,7 @@ | ||
7904 | |||
7905 | ac_cv_have_decl_fputs_unlocked=no | ||
7906 | fi | ||
7907 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7908 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7909 | fi | ||
7910 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputs_unlocked" >&5 | ||
7911 | echo "${ECHO_T}$ac_cv_have_decl_fputs_unlocked" >&6 | ||
7912 | @@ -9620,7 +10787,6 @@ | ||
7913 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7914 | else | ||
7915 | cat >conftest.$ac_ext <<_ACEOF | ||
7916 | -#line $LINENO "configure" | ||
7917 | /* confdefs.h. */ | ||
7918 | _ACEOF | ||
7919 | cat confdefs.h >>conftest.$ac_ext | ||
7920 | @@ -9640,11 +10806,20 @@ | ||
7921 | _ACEOF | ||
7922 | rm -f conftest.$ac_objext | ||
7923 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7924 | - (eval $ac_compile) 2>&5 | ||
7925 | + (eval $ac_compile) 2>conftest.er1 | ||
7926 | ac_status=$? | ||
7927 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7928 | + rm -f conftest.er1 | ||
7929 | + cat conftest.err >&5 | ||
7930 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7931 | (exit $ac_status); } && | ||
7932 | - { ac_try='test -s conftest.$ac_objext' | ||
7933 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7934 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7935 | + (eval $ac_try) 2>&5 | ||
7936 | + ac_status=$? | ||
7937 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7938 | + (exit $ac_status); }; } && | ||
7939 | + { ac_try='test -s conftest.$ac_objext' | ||
7940 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7941 | (eval $ac_try) 2>&5 | ||
7942 | ac_status=$? | ||
7943 | @@ -9657,7 +10832,7 @@ | ||
7944 | |||
7945 | ac_cv_have_decl_fread_unlocked=no | ||
7946 | fi | ||
7947 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7948 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7949 | fi | ||
7950 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fread_unlocked" >&5 | ||
7951 | echo "${ECHO_T}$ac_cv_have_decl_fread_unlocked" >&6 | ||
7952 | @@ -9685,7 +10860,6 @@ | ||
7953 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7954 | else | ||
7955 | cat >conftest.$ac_ext <<_ACEOF | ||
7956 | -#line $LINENO "configure" | ||
7957 | /* confdefs.h. */ | ||
7958 | _ACEOF | ||
7959 | cat confdefs.h >>conftest.$ac_ext | ||
7960 | @@ -9705,11 +10879,20 @@ | ||
7961 | _ACEOF | ||
7962 | rm -f conftest.$ac_objext | ||
7963 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7964 | - (eval $ac_compile) 2>&5 | ||
7965 | + (eval $ac_compile) 2>conftest.er1 | ||
7966 | ac_status=$? | ||
7967 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7968 | + rm -f conftest.er1 | ||
7969 | + cat conftest.err >&5 | ||
7970 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7971 | (exit $ac_status); } && | ||
7972 | - { ac_try='test -s conftest.$ac_objext' | ||
7973 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7974 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7975 | + (eval $ac_try) 2>&5 | ||
7976 | + ac_status=$? | ||
7977 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7978 | + (exit $ac_status); }; } && | ||
7979 | + { ac_try='test -s conftest.$ac_objext' | ||
7980 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7981 | (eval $ac_try) 2>&5 | ||
7982 | ac_status=$? | ||
7983 | @@ -9722,7 +10905,7 @@ | ||
7984 | |||
7985 | ac_cv_have_decl_fwrite_unlocked=no | ||
7986 | fi | ||
7987 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
7988 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7989 | fi | ||
7990 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_fwrite_unlocked" >&5 | ||
7991 | echo "${ECHO_T}$ac_cv_have_decl_fwrite_unlocked" >&6 | ||
7992 | @@ -9750,7 +10933,6 @@ | ||
7993 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7994 | else | ||
7995 | cat >conftest.$ac_ext <<_ACEOF | ||
7996 | -#line $LINENO "configure" | ||
7997 | /* confdefs.h. */ | ||
7998 | _ACEOF | ||
7999 | cat confdefs.h >>conftest.$ac_ext | ||
8000 | @@ -9770,11 +10952,20 @@ | ||
8001 | _ACEOF | ||
8002 | rm -f conftest.$ac_objext | ||
8003 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8004 | - (eval $ac_compile) 2>&5 | ||
8005 | + (eval $ac_compile) 2>conftest.er1 | ||
8006 | ac_status=$? | ||
8007 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8008 | + rm -f conftest.er1 | ||
8009 | + cat conftest.err >&5 | ||
8010 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8011 | (exit $ac_status); } && | ||
8012 | - { ac_try='test -s conftest.$ac_objext' | ||
8013 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8014 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8015 | + (eval $ac_try) 2>&5 | ||
8016 | + ac_status=$? | ||
8017 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8018 | + (exit $ac_status); }; } && | ||
8019 | + { ac_try='test -s conftest.$ac_objext' | ||
8020 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8021 | (eval $ac_try) 2>&5 | ||
8022 | ac_status=$? | ||
8023 | @@ -9787,7 +10978,7 @@ | ||
8024 | |||
8025 | ac_cv_have_decl_getc_unlocked=no | ||
8026 | fi | ||
8027 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8028 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8029 | fi | ||
8030 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5 | ||
8031 | echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6 | ||
8032 | @@ -9815,7 +11006,6 @@ | ||
8033 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8034 | else | ||
8035 | cat >conftest.$ac_ext <<_ACEOF | ||
8036 | -#line $LINENO "configure" | ||
8037 | /* confdefs.h. */ | ||
8038 | _ACEOF | ||
8039 | cat confdefs.h >>conftest.$ac_ext | ||
8040 | @@ -9835,11 +11025,20 @@ | ||
8041 | _ACEOF | ||
8042 | rm -f conftest.$ac_objext | ||
8043 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8044 | - (eval $ac_compile) 2>&5 | ||
8045 | + (eval $ac_compile) 2>conftest.er1 | ||
8046 | ac_status=$? | ||
8047 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8048 | + rm -f conftest.er1 | ||
8049 | + cat conftest.err >&5 | ||
8050 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8051 | (exit $ac_status); } && | ||
8052 | - { ac_try='test -s conftest.$ac_objext' | ||
8053 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8054 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8055 | + (eval $ac_try) 2>&5 | ||
8056 | + ac_status=$? | ||
8057 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8058 | + (exit $ac_status); }; } && | ||
8059 | + { ac_try='test -s conftest.$ac_objext' | ||
8060 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8061 | (eval $ac_try) 2>&5 | ||
8062 | ac_status=$? | ||
8063 | @@ -9852,7 +11051,7 @@ | ||
8064 | |||
8065 | ac_cv_have_decl_getchar_unlocked=no | ||
8066 | fi | ||
8067 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8068 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8069 | fi | ||
8070 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getchar_unlocked" >&5 | ||
8071 | echo "${ECHO_T}$ac_cv_have_decl_getchar_unlocked" >&6 | ||
8072 | @@ -9880,7 +11079,6 @@ | ||
8073 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8074 | else | ||
8075 | cat >conftest.$ac_ext <<_ACEOF | ||
8076 | -#line $LINENO "configure" | ||
8077 | /* confdefs.h. */ | ||
8078 | _ACEOF | ||
8079 | cat confdefs.h >>conftest.$ac_ext | ||
8080 | @@ -9900,11 +11098,20 @@ | ||
8081 | _ACEOF | ||
8082 | rm -f conftest.$ac_objext | ||
8083 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8084 | - (eval $ac_compile) 2>&5 | ||
8085 | + (eval $ac_compile) 2>conftest.er1 | ||
8086 | ac_status=$? | ||
8087 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8088 | + rm -f conftest.er1 | ||
8089 | + cat conftest.err >&5 | ||
8090 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8091 | (exit $ac_status); } && | ||
8092 | - { ac_try='test -s conftest.$ac_objext' | ||
8093 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8094 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8095 | + (eval $ac_try) 2>&5 | ||
8096 | + ac_status=$? | ||
8097 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8098 | + (exit $ac_status); }; } && | ||
8099 | + { ac_try='test -s conftest.$ac_objext' | ||
8100 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8101 | (eval $ac_try) 2>&5 | ||
8102 | ac_status=$? | ||
8103 | @@ -9917,7 +11124,7 @@ | ||
8104 | |||
8105 | ac_cv_have_decl_putc_unlocked=no | ||
8106 | fi | ||
8107 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8108 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8109 | fi | ||
8110 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_putc_unlocked" >&5 | ||
8111 | echo "${ECHO_T}$ac_cv_have_decl_putc_unlocked" >&6 | ||
8112 | @@ -9945,7 +11152,6 @@ | ||
8113 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8114 | else | ||
8115 | cat >conftest.$ac_ext <<_ACEOF | ||
8116 | -#line $LINENO "configure" | ||
8117 | /* confdefs.h. */ | ||
8118 | _ACEOF | ||
8119 | cat confdefs.h >>conftest.$ac_ext | ||
8120 | @@ -9965,11 +11171,20 @@ | ||
8121 | _ACEOF | ||
8122 | rm -f conftest.$ac_objext | ||
8123 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8124 | - (eval $ac_compile) 2>&5 | ||
8125 | + (eval $ac_compile) 2>conftest.er1 | ||
8126 | ac_status=$? | ||
8127 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8128 | + rm -f conftest.er1 | ||
8129 | + cat conftest.err >&5 | ||
8130 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8131 | (exit $ac_status); } && | ||
8132 | - { ac_try='test -s conftest.$ac_objext' | ||
8133 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8134 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8135 | + (eval $ac_try) 2>&5 | ||
8136 | + ac_status=$? | ||
8137 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8138 | + (exit $ac_status); }; } && | ||
8139 | + { ac_try='test -s conftest.$ac_objext' | ||
8140 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8141 | (eval $ac_try) 2>&5 | ||
8142 | ac_status=$? | ||
8143 | @@ -9982,7 +11197,7 @@ | ||
8144 | |||
8145 | ac_cv_have_decl_putchar_unlocked=no | ||
8146 | fi | ||
8147 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8148 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8149 | fi | ||
8150 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_putchar_unlocked" >&5 | ||
8151 | echo "${ECHO_T}$ac_cv_have_decl_putchar_unlocked" >&6 | ||
8152 | @@ -10075,7 +11290,6 @@ | ||
8153 | ac_cv_func_closedir_void=yes | ||
8154 | else | ||
8155 | cat >conftest.$ac_ext <<_ACEOF | ||
8156 | -#line $LINENO "configure" | ||
8157 | /* confdefs.h. */ | ||
8158 | _ACEOF | ||
8159 | cat confdefs.h >>conftest.$ac_ext | ||
8160 | @@ -10115,7 +11329,7 @@ | ||
8161 | ( exit $ac_status ) | ||
8162 | ac_cv_func_closedir_void=yes | ||
8163 | fi | ||
8164 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8165 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8166 | fi | ||
8167 | fi | ||
8168 | echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 | ||
8169 | @@ -10146,7 +11360,6 @@ | ||
8170 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
8171 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
8172 | cat >conftest.$ac_ext <<_ACEOF | ||
8173 | -#line $LINENO "configure" | ||
8174 | /* confdefs.h. */ | ||
8175 | _ACEOF | ||
8176 | cat confdefs.h >>conftest.$ac_ext | ||
8177 | @@ -10157,11 +11370,20 @@ | ||
8178 | _ACEOF | ||
8179 | rm -f conftest.$ac_objext | ||
8180 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8181 | - (eval $ac_compile) 2>&5 | ||
8182 | + (eval $ac_compile) 2>conftest.er1 | ||
8183 | ac_status=$? | ||
8184 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8185 | + rm -f conftest.er1 | ||
8186 | + cat conftest.err >&5 | ||
8187 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8188 | (exit $ac_status); } && | ||
8189 | - { ac_try='test -s conftest.$ac_objext' | ||
8190 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8191 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8192 | + (eval $ac_try) 2>&5 | ||
8193 | + ac_status=$? | ||
8194 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8195 | + (exit $ac_status); }; } && | ||
8196 | + { ac_try='test -s conftest.$ac_objext' | ||
8197 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8198 | (eval $ac_try) 2>&5 | ||
8199 | ac_status=$? | ||
8200 | @@ -10174,7 +11396,7 @@ | ||
8201 | |||
8202 | ac_header_compiler=no | ||
8203 | fi | ||
8204 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8205 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8206 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
8207 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
8208 | |||
8209 | @@ -10182,7 +11404,6 @@ | ||
8210 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
8211 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
8212 | cat >conftest.$ac_ext <<_ACEOF | ||
8213 | -#line $LINENO "configure" | ||
8214 | /* confdefs.h. */ | ||
8215 | _ACEOF | ||
8216 | cat confdefs.h >>conftest.$ac_ext | ||
8217 | @@ -10200,6 +11421,7 @@ | ||
8218 | (exit $ac_status); } >/dev/null; then | ||
8219 | if test -s conftest.err; then | ||
8220 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
8221 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
8222 | else | ||
8223 | ac_cpp_err= | ||
8224 | fi | ||
8225 | @@ -10219,33 +11441,32 @@ | ||
8226 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
8227 | |||
8228 | # So? What about this header? | ||
8229 | -case $ac_header_compiler:$ac_header_preproc in | ||
8230 | - yes:no ) | ||
8231 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
8232 | + yes:no: ) | ||
8233 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
8234 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
8235 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
8236 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
8237 | - ( | ||
8238 | - cat <<\_ASBOX | ||
8239 | -## ------------------------------------ ## | ||
8240 | -## Report this to bug-autoconf@gnu.org. ## | ||
8241 | -## ------------------------------------ ## | ||
8242 | -_ASBOX | ||
8243 | - ) | | ||
8244 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
8245 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
8246 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
8247 | + ac_header_preproc=yes | ||
8248 | ;; | ||
8249 | - no:yes ) | ||
8250 | + no:yes:* ) | ||
8251 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
8252 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
8253 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
8254 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&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: see the Autoconf documentation" >&5 | ||
8258 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
8259 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
8260 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
8261 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
8262 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
8263 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
8264 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
8265 | ( | ||
8266 | cat <<\_ASBOX | ||
8267 | -## ------------------------------------ ## | ||
8268 | -## Report this to bug-autoconf@gnu.org. ## | ||
8269 | -## ------------------------------------ ## | ||
8270 | +## -------------------------------- ## | ||
8271 | +## Report this to bug-patch@gnu.org ## | ||
8272 | +## -------------------------------- ## | ||
8273 | _ASBOX | ||
8274 | ) | | ||
8275 | sed "s/^/$as_me: WARNING: /" >&2 | ||
8276 | @@ -10256,7 +11477,7 @@ | ||
8277 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
8278 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8279 | else | ||
8280 | - eval "$as_ac_Header=$ac_header_preproc" | ||
8281 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
8282 | fi | ||
8283 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
8284 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
8285 | @@ -10277,7 +11498,6 @@ | ||
8286 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8287 | else | ||
8288 | cat >conftest.$ac_ext <<_ACEOF | ||
8289 | -#line $LINENO "configure" | ||
8290 | /* confdefs.h. */ | ||
8291 | _ACEOF | ||
8292 | cat confdefs.h >>conftest.$ac_ext | ||
8293 | @@ -10300,11 +11520,20 @@ | ||
8294 | _ACEOF | ||
8295 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8296 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8297 | - (eval $ac_link) 2>&5 | ||
8298 | + (eval $ac_link) 2>conftest.er1 | ||
8299 | ac_status=$? | ||
8300 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8301 | + rm -f conftest.er1 | ||
8302 | + cat conftest.err >&5 | ||
8303 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8304 | (exit $ac_status); } && | ||
8305 | - { ac_try='test -s conftest$ac_exeext' | ||
8306 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8307 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8308 | + (eval $ac_try) 2>&5 | ||
8309 | + ac_status=$? | ||
8310 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8311 | + (exit $ac_status); }; } && | ||
8312 | + { ac_try='test -s conftest$ac_exeext' | ||
8313 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8314 | (eval $ac_try) 2>&5 | ||
8315 | ac_status=$? | ||
8316 | @@ -10317,7 +11546,8 @@ | ||
8317 | |||
8318 | ac_cv_func_setmode_dos=no | ||
8319 | fi | ||
8320 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8321 | +rm -f conftest.err conftest.$ac_objext \ | ||
8322 | + conftest$ac_exeext conftest.$ac_ext | ||
8323 | fi | ||
8324 | echo "$as_me:$LINENO: result: $ac_cv_func_setmode_dos" >&5 | ||
8325 | echo "${ECHO_T}$ac_cv_func_setmode_dos" >&6 | ||
8326 | @@ -10338,21 +11568,28 @@ | ||
8327 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8328 | else | ||
8329 | cat >conftest.$ac_ext <<_ACEOF | ||
8330 | -#line $LINENO "configure" | ||
8331 | /* confdefs.h. */ | ||
8332 | _ACEOF | ||
8333 | cat confdefs.h >>conftest.$ac_ext | ||
8334 | cat >>conftest.$ac_ext <<_ACEOF | ||
8335 | /* end confdefs.h. */ | ||
8336 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
8337 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8338 | +#define $ac_func innocuous_$ac_func | ||
8339 | + | ||
8340 | /* System header to define __stub macros and hopefully few prototypes, | ||
8341 | which can conflict with char $ac_func (); below. | ||
8342 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
8343 | <limits.h> exists even on freestanding compilers. */ | ||
8344 | + | ||
8345 | #ifdef __STDC__ | ||
8346 | # include <limits.h> | ||
8347 | #else | ||
8348 | # include <assert.h> | ||
8349 | #endif | ||
8350 | + | ||
8351 | +#undef $ac_func | ||
8352 | + | ||
8353 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
8354 | #ifdef __cplusplus | ||
8355 | extern "C" | ||
8356 | @@ -10383,11 +11620,20 @@ | ||
8357 | _ACEOF | ||
8358 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8359 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8360 | - (eval $ac_link) 2>&5 | ||
8361 | + (eval $ac_link) 2>conftest.er1 | ||
8362 | ac_status=$? | ||
8363 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8364 | + rm -f conftest.er1 | ||
8365 | + cat conftest.err >&5 | ||
8366 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8367 | (exit $ac_status); } && | ||
8368 | - { ac_try='test -s conftest$ac_exeext' | ||
8369 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8370 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8371 | + (eval $ac_try) 2>&5 | ||
8372 | + ac_status=$? | ||
8373 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8374 | + (exit $ac_status); }; } && | ||
8375 | + { ac_try='test -s conftest$ac_exeext' | ||
8376 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8377 | (eval $ac_try) 2>&5 | ||
8378 | ac_status=$? | ||
8379 | @@ -10400,7 +11646,8 @@ | ||
8380 | |||
8381 | eval "$as_ac_var=no" | ||
8382 | fi | ||
8383 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8384 | +rm -f conftest.err conftest.$ac_objext \ | ||
8385 | + conftest$ac_exeext conftest.$ac_ext | ||
8386 | fi | ||
8387 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
8388 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
8389 | @@ -10415,21 +11662,28 @@ | ||
8390 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8391 | else | ||
8392 | cat >conftest.$ac_ext <<_ACEOF | ||
8393 | -#line $LINENO "configure" | ||
8394 | /* confdefs.h. */ | ||
8395 | _ACEOF | ||
8396 | cat confdefs.h >>conftest.$ac_ext | ||
8397 | cat >>conftest.$ac_ext <<_ACEOF | ||
8398 | /* end confdefs.h. */ | ||
8399 | +/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. | ||
8400 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8401 | +#define _doprnt innocuous__doprnt | ||
8402 | + | ||
8403 | /* System header to define __stub macros and hopefully few prototypes, | ||
8404 | which can conflict with char _doprnt (); below. | ||
8405 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
8406 | <limits.h> exists even on freestanding compilers. */ | ||
8407 | + | ||
8408 | #ifdef __STDC__ | ||
8409 | # include <limits.h> | ||
8410 | #else | ||
8411 | # include <assert.h> | ||
8412 | #endif | ||
8413 | + | ||
8414 | +#undef _doprnt | ||
8415 | + | ||
8416 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
8417 | #ifdef __cplusplus | ||
8418 | extern "C" | ||
8419 | @@ -10460,11 +11714,20 @@ | ||
8420 | _ACEOF | ||
8421 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8422 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8423 | - (eval $ac_link) 2>&5 | ||
8424 | + (eval $ac_link) 2>conftest.er1 | ||
8425 | ac_status=$? | ||
8426 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8427 | + rm -f conftest.er1 | ||
8428 | + cat conftest.err >&5 | ||
8429 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8430 | (exit $ac_status); } && | ||
8431 | - { ac_try='test -s conftest$ac_exeext' | ||
8432 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8433 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8434 | + (eval $ac_try) 2>&5 | ||
8435 | + ac_status=$? | ||
8436 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8437 | + (exit $ac_status); }; } && | ||
8438 | + { ac_try='test -s conftest$ac_exeext' | ||
8439 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8440 | (eval $ac_try) 2>&5 | ||
8441 | ac_status=$? | ||
8442 | @@ -10477,7 +11740,8 @@ | ||
8443 | |||
8444 | ac_cv_func__doprnt=no | ||
8445 | fi | ||
8446 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8447 | +rm -f conftest.err conftest.$ac_objext \ | ||
8448 | + conftest$ac_exeext conftest.$ac_ext | ||
8449 | fi | ||
8450 | echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 | ||
8451 | echo "${ECHO_T}$ac_cv_func__doprnt" >&6 | ||
8452 | @@ -10503,21 +11767,28 @@ | ||
8453 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8454 | else | ||
8455 | cat >conftest.$ac_ext <<_ACEOF | ||
8456 | -#line $LINENO "configure" | ||
8457 | /* confdefs.h. */ | ||
8458 | _ACEOF | ||
8459 | cat confdefs.h >>conftest.$ac_ext | ||
8460 | cat >>conftest.$ac_ext <<_ACEOF | ||
8461 | /* end confdefs.h. */ | ||
8462 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
8463 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8464 | +#define $ac_func innocuous_$ac_func | ||
8465 | + | ||
8466 | /* System header to define __stub macros and hopefully few prototypes, | ||
8467 | which can conflict with char $ac_func (); below. | ||
8468 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
8469 | <limits.h> exists even on freestanding compilers. */ | ||
8470 | + | ||
8471 | #ifdef __STDC__ | ||
8472 | # include <limits.h> | ||
8473 | #else | ||
8474 | # include <assert.h> | ||
8475 | #endif | ||
8476 | + | ||
8477 | +#undef $ac_func | ||
8478 | + | ||
8479 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
8480 | #ifdef __cplusplus | ||
8481 | extern "C" | ||
8482 | @@ -10548,11 +11819,20 @@ | ||
8483 | _ACEOF | ||
8484 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8485 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8486 | - (eval $ac_link) 2>&5 | ||
8487 | + (eval $ac_link) 2>conftest.er1 | ||
8488 | ac_status=$? | ||
8489 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8490 | + rm -f conftest.er1 | ||
8491 | + cat conftest.err >&5 | ||
8492 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8493 | (exit $ac_status); } && | ||
8494 | - { ac_try='test -s conftest$ac_exeext' | ||
8495 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8496 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8497 | + (eval $ac_try) 2>&5 | ||
8498 | + ac_status=$? | ||
8499 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8500 | + (exit $ac_status); }; } && | ||
8501 | + { ac_try='test -s conftest$ac_exeext' | ||
8502 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8503 | (eval $ac_try) 2>&5 | ||
8504 | ac_status=$? | ||
8505 | @@ -10565,7 +11845,8 @@ | ||
8506 | |||
8507 | eval "$as_ac_var=no" | ||
8508 | fi | ||
8509 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8510 | +rm -f conftest.err conftest.$ac_objext \ | ||
8511 | + conftest$ac_exeext conftest.$ac_ext | ||
8512 | fi | ||
8513 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
8514 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
8515 | @@ -10585,7 +11866,6 @@ | ||
8516 | patch_cv_mkdir_takes_one_arg=no | ||
8517 | if test $ac_cv_func_mkdir = yes; then | ||
8518 | cat >conftest.$ac_ext <<_ACEOF | ||
8519 | -#line $LINENO "configure" | ||
8520 | /* confdefs.h. */ | ||
8521 | _ACEOF | ||
8522 | cat confdefs.h >>conftest.$ac_ext | ||
8523 | @@ -10605,11 +11885,20 @@ | ||
8524 | _ACEOF | ||
8525 | rm -f conftest.$ac_objext | ||
8526 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8527 | - (eval $ac_compile) 2>&5 | ||
8528 | + (eval $ac_compile) 2>conftest.er1 | ||
8529 | ac_status=$? | ||
8530 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8531 | + rm -f conftest.er1 | ||
8532 | + cat conftest.err >&5 | ||
8533 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8534 | (exit $ac_status); } && | ||
8535 | - { ac_try='test -s conftest.$ac_objext' | ||
8536 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8537 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8538 | + (eval $ac_try) 2>&5 | ||
8539 | + ac_status=$? | ||
8540 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8541 | + (exit $ac_status); }; } && | ||
8542 | + { ac_try='test -s conftest.$ac_objext' | ||
8543 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8544 | (eval $ac_try) 2>&5 | ||
8545 | ac_status=$? | ||
8546 | @@ -10621,7 +11910,6 @@ | ||
8547 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8548 | |||
8549 | cat >conftest.$ac_ext <<_ACEOF | ||
8550 | -#line $LINENO "configure" | ||
8551 | /* confdefs.h. */ | ||
8552 | _ACEOF | ||
8553 | cat confdefs.h >>conftest.$ac_ext | ||
8554 | @@ -10641,11 +11929,20 @@ | ||
8555 | _ACEOF | ||
8556 | rm -f conftest.$ac_objext | ||
8557 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8558 | - (eval $ac_compile) 2>&5 | ||
8559 | + (eval $ac_compile) 2>conftest.er1 | ||
8560 | ac_status=$? | ||
8561 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8562 | + rm -f conftest.er1 | ||
8563 | + cat conftest.err >&5 | ||
8564 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8565 | (exit $ac_status); } && | ||
8566 | - { ac_try='test -s conftest.$ac_objext' | ||
8567 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8568 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8569 | + (eval $ac_try) 2>&5 | ||
8570 | + ac_status=$? | ||
8571 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8572 | + (exit $ac_status); }; } && | ||
8573 | + { ac_try='test -s conftest.$ac_objext' | ||
8574 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8575 | (eval $ac_try) 2>&5 | ||
8576 | ac_status=$? | ||
8577 | @@ -10658,10 +11955,10 @@ | ||
8578 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8579 | |||
8580 | fi | ||
8581 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8582 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8583 | |||
8584 | fi | ||
8585 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8586 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8587 | fi | ||
8588 | |||
8589 | |||
8590 | @@ -10686,7 +11983,6 @@ | ||
8591 | else | ||
8592 | |||
8593 | cat >conftest.$ac_ext <<_ACEOF | ||
8594 | -#line $LINENO "configure" | ||
8595 | /* confdefs.h. */ | ||
8596 | _ACEOF | ||
8597 | cat confdefs.h >>conftest.$ac_ext | ||
8598 | @@ -10705,11 +12001,20 @@ | ||
8599 | _ACEOF | ||
8600 | rm -f conftest.$ac_objext | ||
8601 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8602 | - (eval $ac_compile) 2>&5 | ||
8603 | + (eval $ac_compile) 2>conftest.er1 | ||
8604 | ac_status=$? | ||
8605 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8606 | + rm -f conftest.er1 | ||
8607 | + cat conftest.err >&5 | ||
8608 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8609 | (exit $ac_status); } && | ||
8610 | - { ac_try='test -s conftest.$ac_objext' | ||
8611 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8612 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8613 | + (eval $ac_try) 2>&5 | ||
8614 | + ac_status=$? | ||
8615 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8616 | + (exit $ac_status); }; } && | ||
8617 | + { ac_try='test -s conftest.$ac_objext' | ||
8618 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8619 | (eval $ac_try) 2>&5 | ||
8620 | ac_status=$? | ||
8621 | @@ -10722,7 +12027,7 @@ | ||
8622 | |||
8623 | ac_cv_win_or_dos=no | ||
8624 | fi | ||
8625 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
8626 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8627 | |||
8628 | fi | ||
8629 | echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 | ||
8630 | @@ -10834,13 +12139,13 @@ | ||
8631 | # `set' does not quote correctly, so add quotes (double-quote | ||
8632 | # substitution turns \\\\ into \\, and sed turns \\ into \). | ||
8633 | sed -n \ | ||
8634 | - "s/'/'\\\\''/g; | ||
8635 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
8636 | + "s/'/'\\\\''/g; | ||
8637 | + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
8638 | ;; | ||
8639 | *) | ||
8640 | # `set' quotes correctly as required by POSIX, so do not add quotes. | ||
8641 | sed -n \ | ||
8642 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
8643 | + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
8644 | ;; | ||
8645 | esac; | ||
8646 | } | | ||
8647 | @@ -10870,13 +12175,13 @@ | ||
8648 | # trailing colons and then remove the whole line if VPATH becomes empty | ||
8649 | # (actually we leave an empty line to preserve line numbers). | ||
8650 | if test "x$srcdir" = x.; then | ||
8651 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
8652 | + ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
8653 | s/:*\$(srcdir):*/:/; | ||
8654 | s/:*\${srcdir}:*/:/; | ||
8655 | s/:*@srcdir@:*/:/; | ||
8656 | -s/^\([^=]*=[ ]*\):*/\1/; | ||
8657 | +s/^\([^=]*=[ ]*\):*/\1/; | ||
8658 | s/:*$//; | ||
8659 | -s/^[^=]*=[ ]*$//; | ||
8660 | +s/^[^=]*=[ ]*$//; | ||
8661 | }' | ||
8662 | fi | ||
8663 | |||
8664 | @@ -10887,7 +12192,7 @@ | ||
8665 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | ||
8666 | # 1. Remove the extension, and $U if already installed. | ||
8667 | ac_i=`echo "$ac_i" | | ||
8668 | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | ||
8669 | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | ||
8670 | # 2. Add them. | ||
8671 | ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" | ||
8672 | ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' | ||
8673 | @@ -10931,9 +12236,10 @@ | ||
8674 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
8675 | set -o posix | ||
8676 | fi | ||
8677 | +DUALCASE=1; export DUALCASE # for MKS sh | ||
8678 | |||
8679 | # Support unset when possible. | ||
8680 | -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
8681 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
8682 | as_unset=unset | ||
8683 | else | ||
8684 | as_unset=false | ||
8685 | @@ -10952,7 +12258,7 @@ | ||
8686 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
8687 | LC_TELEPHONE LC_TIME | ||
8688 | do | ||
8689 | - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
8690 | + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
8691 | eval $as_var=C; export $as_var | ||
8692 | else | ||
8693 | $as_unset $as_var | ||
8694 | @@ -11131,16 +12437,17 @@ | ||
8695 | if mkdir -p . 2>/dev/null; then | ||
8696 | as_mkdir_p=: | ||
8697 | else | ||
8698 | + test -d ./-p && rmdir ./-p | ||
8699 | as_mkdir_p=false | ||
8700 | fi | ||
8701 | |||
8702 | as_executable_p="test -f" | ||
8703 | |||
8704 | # Sed expression to map a string onto a valid CPP name. | ||
8705 | -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
8706 | +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
8707 | |||
8708 | # Sed expression to map a string onto a valid variable name. | ||
8709 | -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | ||
8710 | +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
8711 | |||
8712 | |||
8713 | # IFS | ||
8714 | @@ -11167,7 +12474,7 @@ | ||
8715 | cat >&5 <<_CSEOF | ||
8716 | |||
8717 | This file was extended by patch $as_me 2.5.9, which was | ||
8718 | -generated by GNU Autoconf 2.57. Invocation command line was | ||
8719 | +generated by GNU Autoconf 2.59. Invocation command line was | ||
8720 | |||
8721 | CONFIG_FILES = $CONFIG_FILES | ||
8722 | CONFIG_HEADERS = $CONFIG_HEADERS | ||
8723 | @@ -11211,9 +12518,9 @@ | ||
8724 | -d, --debug don't remove temporary files | ||
8725 | --recheck update $as_me by reconfiguring in the same conditions | ||
8726 | --file=FILE[:TEMPLATE] | ||
8727 | - instantiate the configuration file FILE | ||
8728 | + instantiate the configuration file FILE | ||
8729 | --header=FILE[:TEMPLATE] | ||
8730 | - instantiate the configuration header FILE | ||
8731 | + instantiate the configuration header FILE | ||
8732 | |||
8733 | Configuration files: | ||
8734 | $config_files | ||
8735 | @@ -11227,11 +12534,10 @@ | ||
8736 | cat >>$CONFIG_STATUS <<_ACEOF | ||
8737 | ac_cs_version="\\ | ||
8738 | patch config.status 2.5.9 | ||
8739 | -configured by $0, generated by GNU Autoconf 2.57, | ||
8740 | +configured by $0, generated by GNU Autoconf 2.59, | ||
8741 | with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" | ||
8742 | |||
8743 | -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 | ||
8744 | -Free Software Foundation, Inc. | ||
8745 | +Copyright (C) 2003 Free Software Foundation, Inc. | ||
8746 | This config.status script is free software; the Free Software Foundation | ||
8747 | gives unlimited permission to copy, distribute and modify it." | ||
8748 | srcdir=$srcdir | ||
8749 | @@ -11463,9 +12769,9 @@ | ||
8750 | (echo ':t | ||
8751 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed | ||
8752 | if test -z "$ac_sed_cmds"; then | ||
8753 | - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8754 | + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8755 | else | ||
8756 | - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8757 | + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | ||
8758 | fi | ||
8759 | ac_sed_frag=`expr $ac_sed_frag + 1` | ||
8760 | ac_beg=$ac_end | ||
8761 | @@ -11483,21 +12789,21 @@ | ||
8762 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
8763 | case $ac_file in | ||
8764 | - | *:- | *:-:* ) # input from stdin | ||
8765 | - cat >$tmp/stdin | ||
8766 | - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8767 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8768 | + cat >$tmp/stdin | ||
8769 | + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8770 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8771 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8772 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8773 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8774 | * ) ac_file_in=$ac_file.in ;; | ||
8775 | esac | ||
8776 | |||
8777 | # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. | ||
8778 | ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
8779 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
8780 | - X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
8781 | - X"$ac_file" : 'X\(//\)$' \| \ | ||
8782 | - X"$ac_file" : 'X\(/\)' \| \ | ||
8783 | - . : '\(.\)' 2>/dev/null || | ||
8784 | + X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
8785 | + X"$ac_file" : 'X\(//\)$' \| \ | ||
8786 | + X"$ac_file" : 'X\(/\)' \| \ | ||
8787 | + . : '\(.\)' 2>/dev/null || | ||
8788 | echo X"$ac_file" | | ||
8789 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
8790 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
8791 | @@ -11513,10 +12819,10 @@ | ||
8792 | as_dirs="$as_dir $as_dirs" | ||
8793 | as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
8794 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
8795 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
8796 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
8797 | - X"$as_dir" : 'X\(/\)' \| \ | ||
8798 | - . : '\(.\)' 2>/dev/null || | ||
8799 | + X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
8800 | + X"$as_dir" : 'X\(//\)$' \| \ | ||
8801 | + X"$as_dir" : 'X\(/\)' \| \ | ||
8802 | + . : '\(.\)' 2>/dev/null || | ||
8803 | echo X"$as_dir" | | ||
8804 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
8805 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
8806 | @@ -11554,12 +12860,45 @@ | ||
8807 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
8808 | ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
8809 | esac | ||
8810 | -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be | ||
8811 | -# absolute. | ||
8812 | -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` | ||
8813 | -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` | ||
8814 | -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` | ||
8815 | -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` | ||
8816 | + | ||
8817 | +# Do not use `cd foo && pwd` to compute absolute paths, because | ||
8818 | +# the directories may not exist. | ||
8819 | +case `pwd` in | ||
8820 | +.) ac_abs_builddir="$ac_dir";; | ||
8821 | +*) | ||
8822 | + case "$ac_dir" in | ||
8823 | + .) ac_abs_builddir=`pwd`;; | ||
8824 | + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
8825 | + *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
8826 | + esac;; | ||
8827 | +esac | ||
8828 | +case $ac_abs_builddir in | ||
8829 | +.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
8830 | +*) | ||
8831 | + case ${ac_top_builddir}. in | ||
8832 | + .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
8833 | + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
8834 | + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
8835 | + esac;; | ||
8836 | +esac | ||
8837 | +case $ac_abs_builddir in | ||
8838 | +.) ac_abs_srcdir=$ac_srcdir;; | ||
8839 | +*) | ||
8840 | + case $ac_srcdir in | ||
8841 | + .) ac_abs_srcdir=$ac_abs_builddir;; | ||
8842 | + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
8843 | + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
8844 | + esac;; | ||
8845 | +esac | ||
8846 | +case $ac_abs_builddir in | ||
8847 | +.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
8848 | +*) | ||
8849 | + case $ac_top_srcdir in | ||
8850 | + .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
8851 | + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
8852 | + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
8853 | + esac;; | ||
8854 | +esac | ||
8855 | |||
8856 | |||
8857 | case $INSTALL in | ||
8858 | @@ -11567,11 +12906,6 @@ | ||
8859 | *) ac_INSTALL=$ac_top_builddir$INSTALL ;; | ||
8860 | esac | ||
8861 | |||
8862 | - if test x"$ac_file" != x-; then | ||
8863 | - { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
8864 | -echo "$as_me: creating $ac_file" >&6;} | ||
8865 | - rm -f "$ac_file" | ||
8866 | - fi | ||
8867 | # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
8868 | # use $as_me), people would be surprised to read: | ||
8869 | # /* config.h. Generated by config.status. */ | ||
8870 | @@ -11581,7 +12915,7 @@ | ||
8871 | configure_input="$ac_file. " | ||
8872 | fi | ||
8873 | configure_input=$configure_input"Generated from `echo $ac_file_in | | ||
8874 | - sed 's,.*/,,'` by configure." | ||
8875 | + sed 's,.*/,,'` by configure." | ||
8876 | |||
8877 | # First look for the input files in the build tree, otherwise in the | ||
8878 | # src tree. | ||
8879 | @@ -11590,26 +12924,32 @@ | ||
8880 | case $f in | ||
8881 | -) echo $tmp/stdin ;; | ||
8882 | [\\/$]*) | ||
8883 | - # Absolute (can't be DOS-style, as IFS=:) | ||
8884 | - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
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 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8888 | { (exit 1); exit 1; }; } | ||
8889 | - echo $f;; | ||
8890 | + echo "$f";; | ||
8891 | *) # Relative | ||
8892 | - if test -f "$f"; then | ||
8893 | - # Build tree | ||
8894 | - echo $f | ||
8895 | - elif test -f "$srcdir/$f"; then | ||
8896 | - # Source tree | ||
8897 | - echo $srcdir/$f | ||
8898 | - else | ||
8899 | - # /dev/null tree | ||
8900 | - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8901 | + if test -f "$f"; then | ||
8902 | + # Build tree | ||
8903 | + echo "$f" | ||
8904 | + elif test -f "$srcdir/$f"; then | ||
8905 | + # Source tree | ||
8906 | + echo "$srcdir/$f" | ||
8907 | + else | ||
8908 | + # /dev/null tree | ||
8909 | + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8910 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8911 | { (exit 1); exit 1; }; } | ||
8912 | - fi;; | ||
8913 | + fi;; | ||
8914 | esac | ||
8915 | done` || { (exit 1); exit 1; } | ||
8916 | + | ||
8917 | + if test x"$ac_file" != x-; then | ||
8918 | + { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
8919 | +echo "$as_me: creating $ac_file" >&6;} | ||
8920 | + rm -f "$ac_file" | ||
8921 | + fi | ||
8922 | _ACEOF | ||
8923 | cat >>$CONFIG_STATUS <<_ACEOF | ||
8924 | sed "$ac_vpsub | ||
8925 | @@ -11649,12 +12989,12 @@ | ||
8926 | # NAME is the cpp macro being defined and VALUE is the value it is being given. | ||
8927 | # | ||
8928 | # ac_d sets the value in "#define NAME VALUE" lines. | ||
8929 | -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | ||
8930 | -ac_dB='[ ].*$,\1#\2' | ||
8931 | +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | ||
8932 | +ac_dB='[ ].*$,\1#\2' | ||
8933 | ac_dC=' ' | ||
8934 | ac_dD=',;t' | ||
8935 | # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". | ||
8936 | -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | ||
8937 | +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | ||
8938 | ac_uB='$,\1#\2define\3' | ||
8939 | ac_uC=' ' | ||
8940 | ac_uD=',;t' | ||
8941 | @@ -11663,11 +13003,11 @@ | ||
8942 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
8943 | case $ac_file in | ||
8944 | - | *:- | *:-:* ) # input from stdin | ||
8945 | - cat >$tmp/stdin | ||
8946 | - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8947 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8948 | + cat >$tmp/stdin | ||
8949 | + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8950 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8951 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
8952 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8953 | + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
8954 | * ) ac_file_in=$ac_file.in ;; | ||
8955 | esac | ||
8956 | |||
8957 | @@ -11681,28 +13021,29 @@ | ||
8958 | case $f in | ||
8959 | -) echo $tmp/stdin ;; | ||
8960 | [\\/$]*) | ||
8961 | - # Absolute (can't be DOS-style, as IFS=:) | ||
8962 | - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
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 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8966 | { (exit 1); exit 1; }; } | ||
8967 | - echo $f;; | ||
8968 | + # Do quote $f, to prevent DOS paths from being IFS'd. | ||
8969 | + echo "$f";; | ||
8970 | *) # Relative | ||
8971 | - if test -f "$f"; then | ||
8972 | - # Build tree | ||
8973 | - echo $f | ||
8974 | - elif test -f "$srcdir/$f"; then | ||
8975 | - # Source tree | ||
8976 | - echo $srcdir/$f | ||
8977 | - else | ||
8978 | - # /dev/null tree | ||
8979 | - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8980 | + if test -f "$f"; then | ||
8981 | + # Build tree | ||
8982 | + echo "$f" | ||
8983 | + elif test -f "$srcdir/$f"; then | ||
8984 | + # Source tree | ||
8985 | + echo "$srcdir/$f" | ||
8986 | + else | ||
8987 | + # /dev/null tree | ||
8988 | + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
8989 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
8990 | { (exit 1); exit 1; }; } | ||
8991 | - fi;; | ||
8992 | + fi;; | ||
8993 | esac | ||
8994 | done` || { (exit 1); exit 1; } | ||
8995 | # Remove the trailing spaces. | ||
8996 | - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | ||
8997 | + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | ||
8998 | |||
8999 | _ACEOF | ||
9000 | |||
9001 | @@ -11725,9 +13066,9 @@ | ||
9002 | s,[\\$`],\\&,g | ||
9003 | t clear | ||
9004 | : clear | ||
9005 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | ||
9006 | +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | ||
9007 | t end | ||
9008 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp | ||
9009 | +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp | ||
9010 | : end | ||
9011 | _ACEOF | ||
9012 | # If some macros were called several times there might be several times | ||
9013 | @@ -11741,13 +13082,13 @@ | ||
9014 | # example, in the case of _POSIX_SOURCE, which is predefined and required | ||
9015 | # on some systems where configure will not decide to define it. | ||
9016 | cat >>conftest.undefs <<\_ACEOF | ||
9017 | -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, | ||
9018 | +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, | ||
9019 | _ACEOF | ||
9020 | |||
9021 | # Break up conftest.defines because some shells have a limit on the size | ||
9022 | # of here documents, and old seds have small limits too (100 cmds). | ||
9023 | echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS | ||
9024 | -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | ||
9025 | +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | ||
9026 | echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS | ||
9027 | echo ' :' >>$CONFIG_STATUS | ||
9028 | rm -f conftest.tail | ||
9029 | @@ -11756,7 +13097,7 @@ | ||
9030 | # Write a limited-size here document to $tmp/defines.sed. | ||
9031 | echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS | ||
9032 | # Speed up: don't consider the non `#define' lines. | ||
9033 | - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | ||
9034 | + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | ||
9035 | # Work around the forget-to-reset-the-flag bug. | ||
9036 | echo 't clr' >>$CONFIG_STATUS | ||
9037 | echo ': clr' >>$CONFIG_STATUS | ||
9038 | @@ -11783,7 +13124,7 @@ | ||
9039 | # Write a limited-size here document to $tmp/undefs.sed. | ||
9040 | echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS | ||
9041 | # Speed up: don't consider the non `#undef' | ||
9042 | - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | ||
9043 | + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | ||
9044 | # Work around the forget-to-reset-the-flag bug. | ||
9045 | echo 't clr' >>$CONFIG_STATUS | ||
9046 | echo ': clr' >>$CONFIG_STATUS | ||
9047 | @@ -11817,10 +13158,10 @@ | ||
9048 | else | ||
9049 | ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
9050 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
9051 | - X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
9052 | - X"$ac_file" : 'X\(//\)$' \| \ | ||
9053 | - X"$ac_file" : 'X\(/\)' \| \ | ||
9054 | - . : '\(.\)' 2>/dev/null || | ||
9055 | + X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
9056 | + X"$ac_file" : 'X\(//\)$' \| \ | ||
9057 | + X"$ac_file" : 'X\(/\)' \| \ | ||
9058 | + . : '\(.\)' 2>/dev/null || | ||
9059 | echo X"$ac_file" | | ||
9060 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
9061 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
9062 | @@ -11836,10 +13177,10 @@ | ||
9063 | as_dirs="$as_dir $as_dirs" | ||
9064 | as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
9065 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
9066 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
9067 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
9068 | - X"$as_dir" : 'X\(/\)' \| \ | ||
9069 | - . : '\(.\)' 2>/dev/null || | ||
9070 | + X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
9071 | + X"$as_dir" : 'X\(//\)$' \| \ | ||
9072 | + X"$as_dir" : 'X\(/\)' \| \ | ||
9073 | + . : '\(.\)' 2>/dev/null || | ||
9074 | echo X"$as_dir" | | ||
9075 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
9076 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
9077 | --- patch-2.5.9.orig/configure.ac | ||
9078 | +++ patch-2.5.9/configure.ac | ||
9079 | @@ -64,6 +64,9 @@ | ||
9080 | gl_PREREQ_XMALLOC | ||
9081 | gl_QUOTE | ||
9082 | gl_QUOTEARG | ||
9083 | +gl_HASH | ||
9084 | + | ||
9085 | +ag_CHECK_NANOSECOND_STAT | ||
9086 | |||
9087 | dnl This should be in gnulib, but isn't for some reason. | ||
9088 | AC_DEFUN([jm_PREREQ_ADDEXT], | ||
9089 | --- patch-2.5.9.orig/pch.c | ||
9090 | +++ patch-2.5.9/pch.c | ||
9091 | @@ -1,6 +1,6 @@ | ||
9092 | /* reading patches */ | ||
9093 | |||
9094 | -/* $Id: pch.c,v 1.44 2003/05/20 14:03:17 eggert Exp $ */ | ||
9095 | +/* $Id: pch.c,v 1.45 2003/07/02 22:19:21 eggert Exp $ */ | ||
9096 | |||
9097 | /* Copyright (C) 1986, 1987, 1988 Larry Wall | ||
9098 | |||
9099 | @@ -366,10 +366,16 @@ | ||
9100 | if (!stars_last_line && strnEQ(s, "*** ", 4)) | ||
9101 | name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]); | ||
9102 | else if (strnEQ(s, "+++ ", 4)) | ||
9103 | + { | ||
9104 | /* Swap with NEW below. */ | ||
9105 | name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]); | ||
9106 | + p_strip_trailing_cr = strip_trailing_cr; | ||
9107 | + } | ||
9108 | else if (strnEQ(s, "Index:", 6)) | ||
9109 | + { | ||
9110 | name[INDEX] = fetchname (s+6, strippath, (time_t *) 0); | ||
9111 | + p_strip_trailing_cr = strip_trailing_cr; | ||
9112 | + } | ||
9113 | else if (strnEQ(s, "Prereq:", 7)) { | ||
9114 | for (t = s + 7; ISSPACE ((unsigned char) *t); t++) | ||
9115 | continue; | ||
9116 | @@ -409,6 +415,7 @@ | ||
9117 | p_timestamp[NEW] = timestamp; | ||
9118 | p_rfc934_nesting = (t - s) >> 1; | ||
9119 | } | ||
9120 | + p_strip_trailing_cr = strip_trailing_cr; | ||
9121 | } | ||
9122 | } | ||
9123 | if ((diff_type == NO_DIFF || diff_type == ED_DIFF) && | ||
9124 | --- patch-2.5.9.orig/util.c | ||
9125 | +++ patch-2.5.9/util.c | ||
9126 | @@ -45,9 +45,17 @@ | ||
9127 | # define raise(sig) kill (getpid (), sig) | ||
9128 | #endif | ||
9129 | |||
9130 | +#if defined(HAVE_STAT_TIMEVAL) | ||
9131 | +#include <time.h> | ||
9132 | +#endif | ||
9133 | + | ||
9134 | #include <stdarg.h> | ||
9135 | +#include <hash.h> | ||
9136 | |||
9137 | static void makedirs (char *); | ||
9138 | +static bool fid_search (const char *, const struct stat *, bool); | ||
9139 | +# define fid_exists(name, pst) fid_search (name, pst, false) | ||
9140 | +# define insert_fid(name) fid_search (name, NULL, true) | ||
9141 | |||
9142 | /* Move a file FROM (where *FROM_NEEDS_REMOVAL is nonzero if FROM | ||
9143 | needs removal when cleaning up at the end of execution) | ||
9144 | @@ -64,7 +72,7 @@ | ||
9145 | struct stat to_st; | ||
9146 | int to_errno = ! backup ? -1 : stat (to, &to_st) == 0 ? 0 : errno; | ||
9147 | |||
9148 | - if (backup) | ||
9149 | + if (backup && (to_errno || ! fid_exists (to, &to_st))) | ||
9150 | { | ||
9151 | int try_makedirs_errno = 0; | ||
9152 | char *bakname; | ||
9153 | @@ -165,6 +173,7 @@ | ||
9154 | if (! to_dir_known_to_exist) | ||
9155 | makedirs (to); | ||
9156 | copy_file (from, to, 0, mode); | ||
9157 | + insert_fid (to); | ||
9158 | return; | ||
9159 | } | ||
9160 | |||
9161 | @@ -173,6 +182,7 @@ | ||
9162 | } | ||
9163 | |||
9164 | rename_succeeded: | ||
9165 | + insert_fid (to); | ||
9166 | /* Do not clear *FROM_NEEDS_REMOVAL if it's possible that the | ||
9167 | rename returned zero because FROM and TO are hard links to | ||
9168 | the same file. */ | ||
9169 | @@ -1011,3 +1021,105 @@ | ||
9170 | if (file_seek (stream, offset, ptrname) != 0) | ||
9171 | pfatal ("fseek"); | ||
9172 | } | ||
9173 | + | ||
9174 | +typedef struct | ||
9175 | +{ | ||
9176 | + dev_t fid_dev; | ||
9177 | + ino_t fid_ino; | ||
9178 | + time_t fid_mtime; | ||
9179 | + unsigned long fid_mtimensec; | ||
9180 | +} file_id; | ||
9181 | + | ||
9182 | +unsigned | ||
9183 | +file_id_hasher (file_id *entry, unsigned table_size) | ||
9184 | +{ | ||
9185 | + return ((unsigned long) entry->fid_ino + | ||
9186 | + (unsigned long) entry->fid_dev + | ||
9187 | + (unsigned long) entry->fid_mtime + | ||
9188 | + (unsigned long) entry->fid_mtimensec) % table_size; | ||
9189 | +} | ||
9190 | + | ||
9191 | +bool | ||
9192 | +file_id_comparator (file_id *entry1, file_id *entry2) | ||
9193 | +{ | ||
9194 | + return (entry1->fid_dev == entry2->fid_dev && | ||
9195 | + entry1->fid_ino == entry2->fid_ino && | ||
9196 | + entry1->fid_mtime == entry2->fid_mtime && | ||
9197 | + entry1->fid_mtimensec == entry2->fid_mtimensec); | ||
9198 | +} | ||
9199 | + | ||
9200 | +void | ||
9201 | +file_id_freer (file_id *entry) | ||
9202 | +{ | ||
9203 | + free (entry); | ||
9204 | +} | ||
9205 | + | ||
9206 | +Hash_table *file_id_hash; | ||
9207 | + | ||
9208 | +/* Check if the file identified by FILENAME and PST was already seen. If the | ||
9209 | + file was already seen, returns TRUE. If the file has not yet been seen | ||
9210 | + and INSERT is TRUE, it is inserted. PST or FILENAME may be NULL (but not | ||
9211 | + both of them). */ | ||
9212 | + | ||
9213 | +static bool | ||
9214 | +fid_search (const char *filename, const struct stat *pst, bool insert) | ||
9215 | +{ | ||
9216 | + struct stat st; | ||
9217 | + | ||
9218 | + if (!file_id_hash) | ||
9219 | + { | ||
9220 | + file_id_hash = hash_initialize (0, NULL, (Hash_hasher) file_id_hasher, | ||
9221 | + (Hash_comparator) file_id_comparator, | ||
9222 | + (Hash_data_freer) file_id_freer); | ||
9223 | + if (!file_id_hash) | ||
9224 | + pfatal ("hash_initialize"); | ||
9225 | + } | ||
9226 | + | ||
9227 | + if (!pst) | ||
9228 | + { | ||
9229 | + if (stat (filename, &st) != 0) | ||
9230 | + pfatal ("%s", quotearg (filename)); | ||
9231 | + pst = &st; | ||
9232 | + } | ||
9233 | + | ||
9234 | + if (insert) | ||
9235 | + { | ||
9236 | + file_id *pfid = xmalloc (sizeof (file_id)), *old_pfid; | ||
9237 | + pfid->fid_dev = pst->st_dev; | ||
9238 | + pfid->fid_ino = pst->st_ino; | ||
9239 | + pfid->fid_mtime = pst->st_mtime; | ||
9240 | +#if defined(HAVE_STAT_NSEC) | ||
9241 | + pfid->fid_mtimensec = pst->st_mtimensec; | ||
9242 | +#elif defined(HAVE_STAT_TIMEVAL) | ||
9243 | + pfid->fid_mtimensec = pst->st_mtim.tv_nsec; | ||
9244 | +#else | ||
9245 | + pfid->fid_mtimensec = 0; | ||
9246 | +#endif | ||
9247 | + old_pfid = hash_insert (file_id_hash, pfid); | ||
9248 | + if (!old_pfid) | ||
9249 | + pfatal ("hash_insert"); | ||
9250 | + else if (old_pfid != pfid) | ||
9251 | + { | ||
9252 | + free (pfid); | ||
9253 | + return true; | ||
9254 | + } | ||
9255 | + else | ||
9256 | + return false; | ||
9257 | + } | ||
9258 | + else | ||
9259 | + { | ||
9260 | + file_id fid; | ||
9261 | + fid.fid_dev = pst->st_dev; | ||
9262 | + fid.fid_ino = pst->st_ino; | ||
9263 | + fid.fid_mtime = pst->st_mtime; | ||
9264 | +#if defined(HAVE_STAT_NSEC) | ||
9265 | + fid.fid_mtimensec = pst->st_mtimensec; | ||
9266 | +#elif defined(HAVE_STAT_TIMEVAL) | ||
9267 | + fid.fid_mtimensec = pst->st_mtim.tv_nsec; | ||
9268 | +#else | ||
9269 | + fid.fid_mtimensec = 0; | ||
9270 | +#endif | ||
9271 | + return hash_lookup (file_id_hash, &fid) != 0; | ||
9272 | + } | ||
9273 | +} | ||
9274 | + | ||
9275 | --- patch-2.5.9.orig/hash.c | ||
9276 | +++ patch-2.5.9/hash.c | ||
9277 | @@ -0,0 +1,1051 @@ | ||
9278 | +/* hash - hashing table processing. | ||
9279 | + | ||
9280 | + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software | ||
9281 | + Foundation, Inc. | ||
9282 | + | ||
9283 | + Written by Jim Meyering, 1992. | ||
9284 | + | ||
9285 | + This program is free software; you can redistribute it and/or modify | ||
9286 | + it under the terms of the GNU General Public License as published by | ||
9287 | + the Free Software Foundation; either version 2, or (at your option) | ||
9288 | + any later version. | ||
9289 | + | ||
9290 | + This program is distributed in the hope that it will be useful, | ||
9291 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9292 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
9293 | + GNU General Public License for more details. | ||
9294 | + | ||
9295 | + You should have received a copy of the GNU General Public License | ||
9296 | + along with this program; if not, write to the Free Software Foundation, | ||
9297 | + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||
9298 | + | ||
9299 | +/* A generic hash table package. */ | ||
9300 | + | ||
9301 | +/* Define USE_OBSTACK to 1 if you want the allocator to use obstacks instead | ||
9302 | + of malloc. If you change USE_OBSTACK, you have to recompile! */ | ||
9303 | + | ||
9304 | +#if HAVE_CONFIG_H | ||
9305 | +# include <config.h> | ||
9306 | +#endif | ||
9307 | +#if HAVE_STDLIB_H | ||
9308 | +# include <stdlib.h> | ||
9309 | +#endif | ||
9310 | + | ||
9311 | +#include <limits.h> | ||
9312 | +#include <stdbool.h> | ||
9313 | +#include <stdio.h> | ||
9314 | + | ||
9315 | +#ifndef HAVE_DECL_FREE | ||
9316 | +"this configure-time declaration test was not run" | ||
9317 | +#endif | ||
9318 | +#if !HAVE_DECL_FREE | ||
9319 | +void free (); | ||
9320 | +#endif | ||
9321 | + | ||
9322 | +#ifndef HAVE_DECL_MALLOC | ||
9323 | +"this configure-time declaration test was not run" | ||
9324 | +#endif | ||
9325 | +#if !HAVE_DECL_MALLOC | ||
9326 | +char *malloc (); | ||
9327 | +#endif | ||
9328 | + | ||
9329 | +#if USE_OBSTACK | ||
9330 | +# include "obstack.h" | ||
9331 | +# ifndef obstack_chunk_alloc | ||
9332 | +# define obstack_chunk_alloc malloc | ||
9333 | +# endif | ||
9334 | +# ifndef obstack_chunk_free | ||
9335 | +# define obstack_chunk_free free | ||
9336 | +# endif | ||
9337 | +#endif | ||
9338 | + | ||
9339 | +#include "hash.h" | ||
9340 | + | ||
9341 | +struct hash_table | ||
9342 | + { | ||
9343 | + /* The array of buckets starts at BUCKET and extends to BUCKET_LIMIT-1, | ||
9344 | + for a possibility of N_BUCKETS. Among those, N_BUCKETS_USED buckets | ||
9345 | + are not empty, there are N_ENTRIES active entries in the table. */ | ||
9346 | + struct hash_entry *bucket; | ||
9347 | + struct hash_entry *bucket_limit; | ||
9348 | + unsigned n_buckets; | ||
9349 | + unsigned n_buckets_used; | ||
9350 | + unsigned n_entries; | ||
9351 | + | ||
9352 | + /* Tuning arguments, kept in a physicaly separate structure. */ | ||
9353 | + const Hash_tuning *tuning; | ||
9354 | + | ||
9355 | + /* Three functions are given to `hash_initialize', see the documentation | ||
9356 | + block for this function. In a word, HASHER randomizes a user entry | ||
9357 | + into a number up from 0 up to some maximum minus 1; COMPARATOR returns | ||
9358 | + true if two user entries compare equally; and DATA_FREER is the cleanup | ||
9359 | + function for a user entry. */ | ||
9360 | + Hash_hasher hasher; | ||
9361 | + Hash_comparator comparator; | ||
9362 | + Hash_data_freer data_freer; | ||
9363 | + | ||
9364 | + /* A linked list of freed struct hash_entry structs. */ | ||
9365 | + struct hash_entry *free_entry_list; | ||
9366 | + | ||
9367 | +#if USE_OBSTACK | ||
9368 | + /* Whenever obstacks are used, it is possible to allocate all overflowed | ||
9369 | + entries into a single stack, so they all can be freed in a single | ||
9370 | + operation. It is not clear if the speedup is worth the trouble. */ | ||
9371 | + struct obstack entry_stack; | ||
9372 | +#endif | ||
9373 | + }; | ||
9374 | + | ||
9375 | +/* A hash table contains many internal entries, each holding a pointer to | ||
9376 | + some user provided data (also called a user entry). An entry indistinctly | ||
9377 | + refers to both the internal entry and its associated user entry. A user | ||
9378 | + entry contents may be hashed by a randomization function (the hashing | ||
9379 | + function, or just `hasher' for short) into a number (or `slot') between 0 | ||
9380 | + and the current table size. At each slot position in the hash table, | ||
9381 | + starts a linked chain of entries for which the user data all hash to this | ||
9382 | + slot. A bucket is the collection of all entries hashing to the same slot. | ||
9383 | + | ||
9384 | + A good `hasher' function will distribute entries rather evenly in buckets. | ||
9385 | + In the ideal case, the length of each bucket is roughly the number of | ||
9386 | + entries divided by the table size. Finding the slot for a data is usually | ||
9387 | + done in constant time by the `hasher', and the later finding of a precise | ||
9388 | + entry is linear in time with the size of the bucket. Consequently, a | ||
9389 | + larger hash table size (that is, a larger number of buckets) is prone to | ||
9390 | + yielding shorter chains, *given* the `hasher' function behaves properly. | ||
9391 | + | ||
9392 | + Long buckets slow down the lookup algorithm. One might use big hash table | ||
9393 | + sizes in hope to reduce the average length of buckets, but this might | ||
9394 | + become inordinate, as unused slots in the hash table take some space. The | ||
9395 | + best bet is to make sure you are using a good `hasher' function (beware | ||
9396 | + that those are not that easy to write! :-), and to use a table size | ||
9397 | + larger than the actual number of entries. */ | ||
9398 | + | ||
9399 | +/* If an insertion makes the ratio of nonempty buckets to table size larger | ||
9400 | + than the growth threshold (a number between 0.0 and 1.0), then increase | ||
9401 | + the table size by multiplying by the growth factor (a number greater than | ||
9402 | + 1.0). The growth threshold defaults to 0.8, and the growth factor | ||
9403 | + defaults to 1.414, meaning that the table will have doubled its size | ||
9404 | + every second time 80% of the buckets get used. */ | ||
9405 | +#define DEFAULT_GROWTH_THRESHOLD 0.8 | ||
9406 | +#define DEFAULT_GROWTH_FACTOR 1.414 | ||
9407 | + | ||
9408 | +/* If a deletion empties a bucket and causes the ratio of used buckets to | ||
9409 | + table size to become smaller than the shrink threshold (a number between | ||
9410 | + 0.0 and 1.0), then shrink the table by multiplying by the shrink factor (a | ||
9411 | + number greater than the shrink threshold but smaller than 1.0). The shrink | ||
9412 | + threshold and factor default to 0.0 and 1.0, meaning that the table never | ||
9413 | + shrinks. */ | ||
9414 | +#define DEFAULT_SHRINK_THRESHOLD 0.0 | ||
9415 | +#define DEFAULT_SHRINK_FACTOR 1.0 | ||
9416 | + | ||
9417 | +/* Use this to initialize or reset a TUNING structure to | ||
9418 | + some sensible values. */ | ||
9419 | +static const Hash_tuning default_tuning = | ||
9420 | + { | ||
9421 | + DEFAULT_SHRINK_THRESHOLD, | ||
9422 | + DEFAULT_SHRINK_FACTOR, | ||
9423 | + DEFAULT_GROWTH_THRESHOLD, | ||
9424 | + DEFAULT_GROWTH_FACTOR, | ||
9425 | + false | ||
9426 | + }; | ||
9427 | + | ||
9428 | +/* Information and lookup. */ | ||
9429 | + | ||
9430 | +/* The following few functions provide information about the overall hash | ||
9431 | + table organization: the number of entries, number of buckets and maximum | ||
9432 | + length of buckets. */ | ||
9433 | + | ||
9434 | +/* Return the number of buckets in the hash table. The table size, the total | ||
9435 | + number of buckets (used plus unused), or the maximum number of slots, are | ||
9436 | + the same quantity. */ | ||
9437 | + | ||
9438 | +unsigned | ||
9439 | +hash_get_n_buckets (const Hash_table *table) | ||
9440 | +{ | ||
9441 | + return table->n_buckets; | ||
9442 | +} | ||
9443 | + | ||
9444 | +/* Return the number of slots in use (non-empty buckets). */ | ||
9445 | + | ||
9446 | +unsigned | ||
9447 | +hash_get_n_buckets_used (const Hash_table *table) | ||
9448 | +{ | ||
9449 | + return table->n_buckets_used; | ||
9450 | +} | ||
9451 | + | ||
9452 | +/* Return the number of active entries. */ | ||
9453 | + | ||
9454 | +unsigned | ||
9455 | +hash_get_n_entries (const Hash_table *table) | ||
9456 | +{ | ||
9457 | + return table->n_entries; | ||
9458 | +} | ||
9459 | + | ||
9460 | +/* Return the length of the longest chain (bucket). */ | ||
9461 | + | ||
9462 | +unsigned | ||
9463 | +hash_get_max_bucket_length (const Hash_table *table) | ||
9464 | +{ | ||
9465 | + struct hash_entry *bucket; | ||
9466 | + unsigned max_bucket_length = 0; | ||
9467 | + | ||
9468 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9469 | + { | ||
9470 | + if (bucket->data) | ||
9471 | + { | ||
9472 | + struct hash_entry *cursor = bucket; | ||
9473 | + unsigned bucket_length = 1; | ||
9474 | + | ||
9475 | + while (cursor = cursor->next, cursor) | ||
9476 | + bucket_length++; | ||
9477 | + | ||
9478 | + if (bucket_length > max_bucket_length) | ||
9479 | + max_bucket_length = bucket_length; | ||
9480 | + } | ||
9481 | + } | ||
9482 | + | ||
9483 | + return max_bucket_length; | ||
9484 | +} | ||
9485 | + | ||
9486 | +/* Do a mild validation of a hash table, by traversing it and checking two | ||
9487 | + statistics. */ | ||
9488 | + | ||
9489 | +bool | ||
9490 | +hash_table_ok (const Hash_table *table) | ||
9491 | +{ | ||
9492 | + struct hash_entry *bucket; | ||
9493 | + unsigned n_buckets_used = 0; | ||
9494 | + unsigned n_entries = 0; | ||
9495 | + | ||
9496 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9497 | + { | ||
9498 | + if (bucket->data) | ||
9499 | + { | ||
9500 | + struct hash_entry *cursor = bucket; | ||
9501 | + | ||
9502 | + /* Count bucket head. */ | ||
9503 | + n_buckets_used++; | ||
9504 | + n_entries++; | ||
9505 | + | ||
9506 | + /* Count bucket overflow. */ | ||
9507 | + while (cursor = cursor->next, cursor) | ||
9508 | + n_entries++; | ||
9509 | + } | ||
9510 | + } | ||
9511 | + | ||
9512 | + if (n_buckets_used == table->n_buckets_used && n_entries == table->n_entries) | ||
9513 | + return true; | ||
9514 | + | ||
9515 | + return false; | ||
9516 | +} | ||
9517 | + | ||
9518 | +void | ||
9519 | +hash_print_statistics (const Hash_table *table, FILE *stream) | ||
9520 | +{ | ||
9521 | + unsigned n_entries = hash_get_n_entries (table); | ||
9522 | + unsigned n_buckets = hash_get_n_buckets (table); | ||
9523 | + unsigned n_buckets_used = hash_get_n_buckets_used (table); | ||
9524 | + unsigned max_bucket_length = hash_get_max_bucket_length (table); | ||
9525 | + | ||
9526 | + fprintf (stream, "# entries: %u\n", n_entries); | ||
9527 | + fprintf (stream, "# buckets: %u\n", n_buckets); | ||
9528 | + fprintf (stream, "# buckets used: %u (%.2f%%)\n", n_buckets_used, | ||
9529 | + (100.0 * n_buckets_used) / n_buckets); | ||
9530 | + fprintf (stream, "max bucket length: %u\n", max_bucket_length); | ||
9531 | +} | ||
9532 | + | ||
9533 | +/* If ENTRY matches an entry already in the hash table, return the | ||
9534 | + entry from the table. Otherwise, return NULL. */ | ||
9535 | + | ||
9536 | +void * | ||
9537 | +hash_lookup (const Hash_table *table, const void *entry) | ||
9538 | +{ | ||
9539 | + struct hash_entry *bucket | ||
9540 | + = table->bucket + table->hasher (entry, table->n_buckets); | ||
9541 | + struct hash_entry *cursor; | ||
9542 | + | ||
9543 | + if (! (bucket < table->bucket_limit)) | ||
9544 | + abort (); | ||
9545 | + | ||
9546 | + if (bucket->data == NULL) | ||
9547 | + return NULL; | ||
9548 | + | ||
9549 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9550 | + if (table->comparator (entry, cursor->data)) | ||
9551 | + return cursor->data; | ||
9552 | + | ||
9553 | + return NULL; | ||
9554 | +} | ||
9555 | + | ||
9556 | +/* Walking. */ | ||
9557 | + | ||
9558 | +/* The functions in this page traverse the hash table and process the | ||
9559 | + contained entries. For the traversal to work properly, the hash table | ||
9560 | + should not be resized nor modified while any particular entry is being | ||
9561 | + processed. In particular, entries should not be added or removed. */ | ||
9562 | + | ||
9563 | +/* Return the first data in the table, or NULL if the table is empty. */ | ||
9564 | + | ||
9565 | +void * | ||
9566 | +hash_get_first (const Hash_table *table) | ||
9567 | +{ | ||
9568 | + struct hash_entry *bucket; | ||
9569 | + | ||
9570 | + if (table->n_entries == 0) | ||
9571 | + return NULL; | ||
9572 | + | ||
9573 | + for (bucket = table->bucket; ; bucket++) | ||
9574 | + if (! (bucket < table->bucket_limit)) | ||
9575 | + abort (); | ||
9576 | + else if (bucket->data) | ||
9577 | + return bucket->data; | ||
9578 | +} | ||
9579 | + | ||
9580 | +/* Return the user data for the entry following ENTRY, where ENTRY has been | ||
9581 | + returned by a previous call to either `hash_get_first' or `hash_get_next'. | ||
9582 | + Return NULL if there are no more entries. */ | ||
9583 | + | ||
9584 | +void * | ||
9585 | +hash_get_next (const Hash_table *table, const void *entry) | ||
9586 | +{ | ||
9587 | + struct hash_entry *bucket | ||
9588 | + = table->bucket + table->hasher (entry, table->n_buckets); | ||
9589 | + struct hash_entry *cursor; | ||
9590 | + | ||
9591 | + if (! (bucket < table->bucket_limit)) | ||
9592 | + abort (); | ||
9593 | + | ||
9594 | + /* Find next entry in the same bucket. */ | ||
9595 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9596 | + if (cursor->data == entry && cursor->next) | ||
9597 | + return cursor->next->data; | ||
9598 | + | ||
9599 | + /* Find first entry in any subsequent bucket. */ | ||
9600 | + while (++bucket < table->bucket_limit) | ||
9601 | + if (bucket->data) | ||
9602 | + return bucket->data; | ||
9603 | + | ||
9604 | + /* None found. */ | ||
9605 | + return NULL; | ||
9606 | +} | ||
9607 | + | ||
9608 | +/* Fill BUFFER with pointers to active user entries in the hash table, then | ||
9609 | + return the number of pointers copied. Do not copy more than BUFFER_SIZE | ||
9610 | + pointers. */ | ||
9611 | + | ||
9612 | +unsigned | ||
9613 | +hash_get_entries (const Hash_table *table, void **buffer, | ||
9614 | + unsigned buffer_size) | ||
9615 | +{ | ||
9616 | + unsigned counter = 0; | ||
9617 | + struct hash_entry *bucket; | ||
9618 | + struct hash_entry *cursor; | ||
9619 | + | ||
9620 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9621 | + { | ||
9622 | + if (bucket->data) | ||
9623 | + { | ||
9624 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9625 | + { | ||
9626 | + if (counter >= buffer_size) | ||
9627 | + return counter; | ||
9628 | + buffer[counter++] = cursor->data; | ||
9629 | + } | ||
9630 | + } | ||
9631 | + } | ||
9632 | + | ||
9633 | + return counter; | ||
9634 | +} | ||
9635 | + | ||
9636 | +/* Call a PROCESSOR function for each entry of a hash table, and return the | ||
9637 | + number of entries for which the processor function returned success. A | ||
9638 | + pointer to some PROCESSOR_DATA which will be made available to each call to | ||
9639 | + the processor function. The PROCESSOR accepts two arguments: the first is | ||
9640 | + the user entry being walked into, the second is the value of PROCESSOR_DATA | ||
9641 | + as received. The walking continue for as long as the PROCESSOR function | ||
9642 | + returns nonzero. When it returns zero, the walking is interrupted. */ | ||
9643 | + | ||
9644 | +unsigned | ||
9645 | +hash_do_for_each (const Hash_table *table, Hash_processor processor, | ||
9646 | + void *processor_data) | ||
9647 | +{ | ||
9648 | + unsigned counter = 0; | ||
9649 | + struct hash_entry *bucket; | ||
9650 | + struct hash_entry *cursor; | ||
9651 | + | ||
9652 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9653 | + { | ||
9654 | + if (bucket->data) | ||
9655 | + { | ||
9656 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9657 | + { | ||
9658 | + if (!(*processor) (cursor->data, processor_data)) | ||
9659 | + return counter; | ||
9660 | + counter++; | ||
9661 | + } | ||
9662 | + } | ||
9663 | + } | ||
9664 | + | ||
9665 | + return counter; | ||
9666 | +} | ||
9667 | + | ||
9668 | +/* Allocation and clean-up. */ | ||
9669 | + | ||
9670 | +/* Return a hash index for a NUL-terminated STRING between 0 and N_BUCKETS-1. | ||
9671 | + This is a convenience routine for constructing other hashing functions. */ | ||
9672 | + | ||
9673 | +#if USE_DIFF_HASH | ||
9674 | + | ||
9675 | +/* About hashings, Paul Eggert writes to me (FP), on 1994-01-01: "Please see | ||
9676 | + B. J. McKenzie, R. Harries & T. Bell, Selecting a hashing algorithm, | ||
9677 | + Software--practice & experience 20, 2 (Feb 1990), 209-224. Good hash | ||
9678 | + algorithms tend to be domain-specific, so what's good for [diffutils'] io.c | ||
9679 | + may not be good for your application." */ | ||
9680 | + | ||
9681 | +unsigned | ||
9682 | +hash_string (const char *string, unsigned n_buckets) | ||
9683 | +{ | ||
9684 | +# define ROTATE_LEFT(Value, Shift) \ | ||
9685 | + ((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift))) | ||
9686 | +# define HASH_ONE_CHAR(Value, Byte) \ | ||
9687 | + ((Byte) + ROTATE_LEFT (Value, 7)) | ||
9688 | + | ||
9689 | + unsigned value = 0; | ||
9690 | + | ||
9691 | + for (; *string; string++) | ||
9692 | + value = HASH_ONE_CHAR (value, *(const unsigned char *) string); | ||
9693 | + return value % n_buckets; | ||
9694 | + | ||
9695 | +# undef ROTATE_LEFT | ||
9696 | +# undef HASH_ONE_CHAR | ||
9697 | +} | ||
9698 | + | ||
9699 | +#else /* not USE_DIFF_HASH */ | ||
9700 | + | ||
9701 | +/* This one comes from `recode', and performs a bit better than the above as | ||
9702 | + per a few experiments. It is inspired from a hashing routine found in the | ||
9703 | + very old Cyber `snoop', itself written in typical Greg Mansfield style. | ||
9704 | + (By the way, what happened to this excellent man? Is he still alive?) */ | ||
9705 | + | ||
9706 | +unsigned | ||
9707 | +hash_string (const char *string, unsigned n_buckets) | ||
9708 | +{ | ||
9709 | + unsigned value = 0; | ||
9710 | + | ||
9711 | + while (*string) | ||
9712 | + value = ((value * 31 + (int) *(const unsigned char *) string++) | ||
9713 | + % n_buckets); | ||
9714 | + return value; | ||
9715 | +} | ||
9716 | + | ||
9717 | +#endif /* not USE_DIFF_HASH */ | ||
9718 | + | ||
9719 | +/* Return true if CANDIDATE is a prime number. CANDIDATE should be an odd | ||
9720 | + number at least equal to 11. */ | ||
9721 | + | ||
9722 | +static bool | ||
9723 | +is_prime (unsigned long candidate) | ||
9724 | +{ | ||
9725 | + unsigned long divisor = 3; | ||
9726 | + unsigned long square = divisor * divisor; | ||
9727 | + | ||
9728 | + while (square < candidate && (candidate % divisor)) | ||
9729 | + { | ||
9730 | + divisor++; | ||
9731 | + square += 4 * divisor; | ||
9732 | + divisor++; | ||
9733 | + } | ||
9734 | + | ||
9735 | + return (candidate % divisor ? true : false); | ||
9736 | +} | ||
9737 | + | ||
9738 | +/* Round a given CANDIDATE number up to the nearest prime, and return that | ||
9739 | + prime. Primes lower than 10 are merely skipped. */ | ||
9740 | + | ||
9741 | +static unsigned long | ||
9742 | +next_prime (unsigned long candidate) | ||
9743 | +{ | ||
9744 | + /* Skip small primes. */ | ||
9745 | + if (candidate < 10) | ||
9746 | + candidate = 10; | ||
9747 | + | ||
9748 | + /* Make it definitely odd. */ | ||
9749 | + candidate |= 1; | ||
9750 | + | ||
9751 | + while (!is_prime (candidate)) | ||
9752 | + candidate += 2; | ||
9753 | + | ||
9754 | + return candidate; | ||
9755 | +} | ||
9756 | + | ||
9757 | +void | ||
9758 | +hash_reset_tuning (Hash_tuning *tuning) | ||
9759 | +{ | ||
9760 | + *tuning = default_tuning; | ||
9761 | +} | ||
9762 | + | ||
9763 | +/* For the given hash TABLE, check the user supplied tuning structure for | ||
9764 | + reasonable values, and return true if there is no gross error with it. | ||
9765 | + Otherwise, definitively reset the TUNING field to some acceptable default | ||
9766 | + in the hash table (that is, the user loses the right of further modifying | ||
9767 | + tuning arguments), and return false. */ | ||
9768 | + | ||
9769 | +static bool | ||
9770 | +check_tuning (Hash_table *table) | ||
9771 | +{ | ||
9772 | + const Hash_tuning *tuning = table->tuning; | ||
9773 | + | ||
9774 | + if (tuning->growth_threshold > 0.0 | ||
9775 | + && tuning->growth_threshold < 1.0 | ||
9776 | + && tuning->growth_factor > 1.0 | ||
9777 | + && tuning->shrink_threshold >= 0.0 | ||
9778 | + && tuning->shrink_threshold < 1.0 | ||
9779 | + && tuning->shrink_factor > tuning->shrink_threshold | ||
9780 | + && tuning->shrink_factor <= 1.0 | ||
9781 | + && tuning->shrink_threshold < tuning->growth_threshold) | ||
9782 | + return true; | ||
9783 | + | ||
9784 | + table->tuning = &default_tuning; | ||
9785 | + return false; | ||
9786 | +} | ||
9787 | + | ||
9788 | +/* Allocate and return a new hash table, or NULL upon failure. The initial | ||
9789 | + number of buckets is automatically selected so as to _guarantee_ that you | ||
9790 | + may insert at least CANDIDATE different user entries before any growth of | ||
9791 | + the hash table size occurs. So, if have a reasonably tight a-priori upper | ||
9792 | + bound on the number of entries you intend to insert in the hash table, you | ||
9793 | + may save some table memory and insertion time, by specifying it here. If | ||
9794 | + the IS_N_BUCKETS field of the TUNING structure is true, the CANDIDATE | ||
9795 | + argument has its meaning changed to the wanted number of buckets. | ||
9796 | + | ||
9797 | + TUNING points to a structure of user-supplied values, in case some fine | ||
9798 | + tuning is wanted over the default behavior of the hasher. If TUNING is | ||
9799 | + NULL, the default tuning parameters are used instead. | ||
9800 | + | ||
9801 | + The user-supplied HASHER function should be provided. It accepts two | ||
9802 | + arguments ENTRY and TABLE_SIZE. It computes, by hashing ENTRY contents, a | ||
9803 | + slot number for that entry which should be in the range 0..TABLE_SIZE-1. | ||
9804 | + This slot number is then returned. | ||
9805 | + | ||
9806 | + The user-supplied COMPARATOR function should be provided. It accepts two | ||
9807 | + arguments pointing to user data, it then returns true for a pair of entries | ||
9808 | + that compare equal, or false otherwise. This function is internally called | ||
9809 | + on entries which are already known to hash to the same bucket index. | ||
9810 | + | ||
9811 | + The user-supplied DATA_FREER function, when not NULL, may be later called | ||
9812 | + with the user data as an argument, just before the entry containing the | ||
9813 | + data gets freed. This happens from within `hash_free' or `hash_clear'. | ||
9814 | + You should specify this function only if you want these functions to free | ||
9815 | + all of your `data' data. This is typically the case when your data is | ||
9816 | + simply an auxiliary struct that you have malloc'd to aggregate several | ||
9817 | + values. */ | ||
9818 | + | ||
9819 | +Hash_table * | ||
9820 | +hash_initialize (unsigned candidate, const Hash_tuning *tuning, | ||
9821 | + Hash_hasher hasher, Hash_comparator comparator, | ||
9822 | + Hash_data_freer data_freer) | ||
9823 | +{ | ||
9824 | + Hash_table *table; | ||
9825 | + struct hash_entry *bucket; | ||
9826 | + | ||
9827 | + if (hasher == NULL || comparator == NULL) | ||
9828 | + return NULL; | ||
9829 | + | ||
9830 | + table = (Hash_table *) malloc (sizeof (Hash_table)); | ||
9831 | + if (table == NULL) | ||
9832 | + return NULL; | ||
9833 | + | ||
9834 | + if (!tuning) | ||
9835 | + tuning = &default_tuning; | ||
9836 | + table->tuning = tuning; | ||
9837 | + if (!check_tuning (table)) | ||
9838 | + { | ||
9839 | + /* Fail if the tuning options are invalid. This is the only occasion | ||
9840 | + when the user gets some feedback about it. Once the table is created, | ||
9841 | + if the user provides invalid tuning options, we silently revert to | ||
9842 | + using the defaults, and ignore further request to change the tuning | ||
9843 | + options. */ | ||
9844 | + free (table); | ||
9845 | + return NULL; | ||
9846 | + } | ||
9847 | + | ||
9848 | + table->n_buckets | ||
9849 | + = next_prime (tuning->is_n_buckets ? candidate | ||
9850 | + : (unsigned) (candidate / tuning->growth_threshold)); | ||
9851 | + | ||
9852 | + table->bucket = (struct hash_entry *) | ||
9853 | + malloc (table->n_buckets * sizeof (struct hash_entry)); | ||
9854 | + if (table->bucket == NULL) | ||
9855 | + { | ||
9856 | + free (table); | ||
9857 | + return NULL; | ||
9858 | + } | ||
9859 | + table->bucket_limit = table->bucket + table->n_buckets; | ||
9860 | + | ||
9861 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9862 | + { | ||
9863 | + bucket->data = NULL; | ||
9864 | + bucket->next = NULL; | ||
9865 | + } | ||
9866 | + table->n_buckets_used = 0; | ||
9867 | + table->n_entries = 0; | ||
9868 | + | ||
9869 | + table->hasher = hasher; | ||
9870 | + table->comparator = comparator; | ||
9871 | + table->data_freer = data_freer; | ||
9872 | + | ||
9873 | + table->free_entry_list = NULL; | ||
9874 | +#if USE_OBSTACK | ||
9875 | + obstack_init (&table->entry_stack); | ||
9876 | +#endif | ||
9877 | + return table; | ||
9878 | +} | ||
9879 | + | ||
9880 | +/* Make all buckets empty, placing any chained entries on the free list. | ||
9881 | + Apply the user-specified function data_freer (if any) to the datas of any | ||
9882 | + affected entries. */ | ||
9883 | + | ||
9884 | +void | ||
9885 | +hash_clear (Hash_table *table) | ||
9886 | +{ | ||
9887 | + struct hash_entry *bucket; | ||
9888 | + | ||
9889 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9890 | + { | ||
9891 | + if (bucket->data) | ||
9892 | + { | ||
9893 | + struct hash_entry *cursor; | ||
9894 | + struct hash_entry *next; | ||
9895 | + | ||
9896 | + /* Free the bucket overflow. */ | ||
9897 | + for (cursor = bucket->next; cursor; cursor = next) | ||
9898 | + { | ||
9899 | + if (table->data_freer) | ||
9900 | + (*table->data_freer) (cursor->data); | ||
9901 | + cursor->data = NULL; | ||
9902 | + | ||
9903 | + next = cursor->next; | ||
9904 | + /* Relinking is done one entry at a time, as it is to be expected | ||
9905 | + that overflows are either rare or short. */ | ||
9906 | + cursor->next = table->free_entry_list; | ||
9907 | + table->free_entry_list = cursor; | ||
9908 | + } | ||
9909 | + | ||
9910 | + /* Free the bucket head. */ | ||
9911 | + if (table->data_freer) | ||
9912 | + (*table->data_freer) (bucket->data); | ||
9913 | + bucket->data = NULL; | ||
9914 | + bucket->next = NULL; | ||
9915 | + } | ||
9916 | + } | ||
9917 | + | ||
9918 | + table->n_buckets_used = 0; | ||
9919 | + table->n_entries = 0; | ||
9920 | +} | ||
9921 | + | ||
9922 | +/* Reclaim all storage associated with a hash table. If a data_freer | ||
9923 | + function has been supplied by the user when the hash table was created, | ||
9924 | + this function applies it to the data of each entry before freeing that | ||
9925 | + entry. */ | ||
9926 | + | ||
9927 | +void | ||
9928 | +hash_free (Hash_table *table) | ||
9929 | +{ | ||
9930 | + struct hash_entry *bucket; | ||
9931 | + struct hash_entry *cursor; | ||
9932 | + struct hash_entry *next; | ||
9933 | + | ||
9934 | + /* Call the user data_freer function. */ | ||
9935 | + if (table->data_freer && table->n_entries) | ||
9936 | + { | ||
9937 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9938 | + { | ||
9939 | + if (bucket->data) | ||
9940 | + { | ||
9941 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
9942 | + { | ||
9943 | + (*table->data_freer) (cursor->data); | ||
9944 | + } | ||
9945 | + } | ||
9946 | + } | ||
9947 | + } | ||
9948 | + | ||
9949 | +#if USE_OBSTACK | ||
9950 | + | ||
9951 | + obstack_free (&table->entry_stack, NULL); | ||
9952 | + | ||
9953 | +#else | ||
9954 | + | ||
9955 | + /* Free all bucket overflowed entries. */ | ||
9956 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
9957 | + { | ||
9958 | + for (cursor = bucket->next; cursor; cursor = next) | ||
9959 | + { | ||
9960 | + next = cursor->next; | ||
9961 | + free (cursor); | ||
9962 | + } | ||
9963 | + } | ||
9964 | + | ||
9965 | + /* Also reclaim the internal list of previously freed entries. */ | ||
9966 | + for (cursor = table->free_entry_list; cursor; cursor = next) | ||
9967 | + { | ||
9968 | + next = cursor->next; | ||
9969 | + free (cursor); | ||
9970 | + } | ||
9971 | + | ||
9972 | +#endif | ||
9973 | + | ||
9974 | + /* Free the remainder of the hash table structure. */ | ||
9975 | + free (table->bucket); | ||
9976 | + free (table); | ||
9977 | +} | ||
9978 | + | ||
9979 | +/* Insertion and deletion. */ | ||
9980 | + | ||
9981 | +/* Get a new hash entry for a bucket overflow, possibly by reclying a | ||
9982 | + previously freed one. If this is not possible, allocate a new one. */ | ||
9983 | + | ||
9984 | +static struct hash_entry * | ||
9985 | +allocate_entry (Hash_table *table) | ||
9986 | +{ | ||
9987 | + struct hash_entry *new; | ||
9988 | + | ||
9989 | + if (table->free_entry_list) | ||
9990 | + { | ||
9991 | + new = table->free_entry_list; | ||
9992 | + table->free_entry_list = new->next; | ||
9993 | + } | ||
9994 | + else | ||
9995 | + { | ||
9996 | +#if USE_OBSTACK | ||
9997 | + new = (struct hash_entry *) | ||
9998 | + obstack_alloc (&table->entry_stack, sizeof (struct hash_entry)); | ||
9999 | +#else | ||
10000 | + new = (struct hash_entry *) malloc (sizeof (struct hash_entry)); | ||
10001 | +#endif | ||
10002 | + } | ||
10003 | + | ||
10004 | + return new; | ||
10005 | +} | ||
10006 | + | ||
10007 | +/* Free a hash entry which was part of some bucket overflow, | ||
10008 | + saving it for later recycling. */ | ||
10009 | + | ||
10010 | +static void | ||
10011 | +free_entry (Hash_table *table, struct hash_entry *entry) | ||
10012 | +{ | ||
10013 | + entry->data = NULL; | ||
10014 | + entry->next = table->free_entry_list; | ||
10015 | + table->free_entry_list = entry; | ||
10016 | +} | ||
10017 | + | ||
10018 | +/* This private function is used to help with insertion and deletion. When | ||
10019 | + ENTRY matches an entry in the table, return a pointer to the corresponding | ||
10020 | + user data and set *BUCKET_HEAD to the head of the selected bucket. | ||
10021 | + Otherwise, return NULL. When DELETE is true and ENTRY matches an entry in | ||
10022 | + the table, unlink the matching entry. */ | ||
10023 | + | ||
10024 | +static void * | ||
10025 | +hash_find_entry (Hash_table *table, const void *entry, | ||
10026 | + struct hash_entry **bucket_head, bool delete) | ||
10027 | +{ | ||
10028 | + struct hash_entry *bucket | ||
10029 | + = table->bucket + table->hasher (entry, table->n_buckets); | ||
10030 | + struct hash_entry *cursor; | ||
10031 | + | ||
10032 | + if (! (bucket < table->bucket_limit)) | ||
10033 | + abort (); | ||
10034 | + | ||
10035 | + *bucket_head = bucket; | ||
10036 | + | ||
10037 | + /* Test for empty bucket. */ | ||
10038 | + if (bucket->data == NULL) | ||
10039 | + return NULL; | ||
10040 | + | ||
10041 | + /* See if the entry is the first in the bucket. */ | ||
10042 | + if ((*table->comparator) (entry, bucket->data)) | ||
10043 | + { | ||
10044 | + void *data = bucket->data; | ||
10045 | + | ||
10046 | + if (delete) | ||
10047 | + { | ||
10048 | + if (bucket->next) | ||
10049 | + { | ||
10050 | + struct hash_entry *next = bucket->next; | ||
10051 | + | ||
10052 | + /* Bump the first overflow entry into the bucket head, then save | ||
10053 | + the previous first overflow entry for later recycling. */ | ||
10054 | + *bucket = *next; | ||
10055 | + free_entry (table, next); | ||
10056 | + } | ||
10057 | + else | ||
10058 | + { | ||
10059 | + bucket->data = NULL; | ||
10060 | + } | ||
10061 | + } | ||
10062 | + | ||
10063 | + return data; | ||
10064 | + } | ||
10065 | + | ||
10066 | + /* Scan the bucket overflow. */ | ||
10067 | + for (cursor = bucket; cursor->next; cursor = cursor->next) | ||
10068 | + { | ||
10069 | + if ((*table->comparator) (entry, cursor->next->data)) | ||
10070 | + { | ||
10071 | + void *data = cursor->next->data; | ||
10072 | + | ||
10073 | + if (delete) | ||
10074 | + { | ||
10075 | + struct hash_entry *next = cursor->next; | ||
10076 | + | ||
10077 | + /* Unlink the entry to delete, then save the freed entry for later | ||
10078 | + recycling. */ | ||
10079 | + cursor->next = next->next; | ||
10080 | + free_entry (table, next); | ||
10081 | + } | ||
10082 | + | ||
10083 | + return data; | ||
10084 | + } | ||
10085 | + } | ||
10086 | + | ||
10087 | + /* No entry found. */ | ||
10088 | + return NULL; | ||
10089 | +} | ||
10090 | + | ||
10091 | +/* For an already existing hash table, change the number of buckets through | ||
10092 | + specifying CANDIDATE. The contents of the hash table are preserved. The | ||
10093 | + new number of buckets is automatically selected so as to _guarantee_ that | ||
10094 | + the table may receive at least CANDIDATE different user entries, including | ||
10095 | + those already in the table, before any other growth of the hash table size | ||
10096 | + occurs. If TUNING->IS_N_BUCKETS is true, then CANDIDATE specifies the | ||
10097 | + exact number of buckets desired. */ | ||
10098 | + | ||
10099 | +bool | ||
10100 | +hash_rehash (Hash_table *table, unsigned candidate) | ||
10101 | +{ | ||
10102 | + Hash_table *new_table; | ||
10103 | + struct hash_entry *bucket; | ||
10104 | + struct hash_entry *cursor; | ||
10105 | + struct hash_entry *next; | ||
10106 | + | ||
10107 | + new_table = hash_initialize (candidate, table->tuning, table->hasher, | ||
10108 | + table->comparator, table->data_freer); | ||
10109 | + if (new_table == NULL) | ||
10110 | + return false; | ||
10111 | + | ||
10112 | + /* Merely reuse the extra old space into the new table. */ | ||
10113 | +#if USE_OBSTACK | ||
10114 | + obstack_free (&new_table->entry_stack, NULL); | ||
10115 | + new_table->entry_stack = table->entry_stack; | ||
10116 | +#endif | ||
10117 | + new_table->free_entry_list = table->free_entry_list; | ||
10118 | + | ||
10119 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
10120 | + if (bucket->data) | ||
10121 | + for (cursor = bucket; cursor; cursor = next) | ||
10122 | + { | ||
10123 | + void *data = cursor->data; | ||
10124 | + struct hash_entry *new_bucket | ||
10125 | + = (new_table->bucket | ||
10126 | + + new_table->hasher (data, new_table->n_buckets)); | ||
10127 | + | ||
10128 | + if (! (new_bucket < new_table->bucket_limit)) | ||
10129 | + abort (); | ||
10130 | + | ||
10131 | + next = cursor->next; | ||
10132 | + | ||
10133 | + if (new_bucket->data) | ||
10134 | + { | ||
10135 | + if (cursor == bucket) | ||
10136 | + { | ||
10137 | + /* Allocate or recycle an entry, when moving from a bucket | ||
10138 | + header into a bucket overflow. */ | ||
10139 | + struct hash_entry *new_entry = allocate_entry (new_table); | ||
10140 | + | ||
10141 | + if (new_entry == NULL) | ||
10142 | + return false; | ||
10143 | + | ||
10144 | + new_entry->data = data; | ||
10145 | + new_entry->next = new_bucket->next; | ||
10146 | + new_bucket->next = new_entry; | ||
10147 | + } | ||
10148 | + else | ||
10149 | + { | ||
10150 | + /* Merely relink an existing entry, when moving from a | ||
10151 | + bucket overflow into a bucket overflow. */ | ||
10152 | + cursor->next = new_bucket->next; | ||
10153 | + new_bucket->next = cursor; | ||
10154 | + } | ||
10155 | + } | ||
10156 | + else | ||
10157 | + { | ||
10158 | + /* Free an existing entry, when moving from a bucket | ||
10159 | + overflow into a bucket header. Also take care of the | ||
10160 | + simple case of moving from a bucket header into a bucket | ||
10161 | + header. */ | ||
10162 | + new_bucket->data = data; | ||
10163 | + new_table->n_buckets_used++; | ||
10164 | + if (cursor != bucket) | ||
10165 | + free_entry (new_table, cursor); | ||
10166 | + } | ||
10167 | + } | ||
10168 | + | ||
10169 | + free (table->bucket); | ||
10170 | + table->bucket = new_table->bucket; | ||
10171 | + table->bucket_limit = new_table->bucket_limit; | ||
10172 | + table->n_buckets = new_table->n_buckets; | ||
10173 | + table->n_buckets_used = new_table->n_buckets_used; | ||
10174 | + table->free_entry_list = new_table->free_entry_list; | ||
10175 | + /* table->n_entries already holds its value. */ | ||
10176 | +#if USE_OBSTACK | ||
10177 | + table->entry_stack = new_table->entry_stack; | ||
10178 | +#endif | ||
10179 | + free (new_table); | ||
10180 | + | ||
10181 | + return true; | ||
10182 | +} | ||
10183 | + | ||
10184 | +/* If ENTRY matches an entry already in the hash table, return the pointer | ||
10185 | + to the entry from the table. Otherwise, insert ENTRY and return ENTRY. | ||
10186 | + Return NULL if the storage required for insertion cannot be allocated. */ | ||
10187 | + | ||
10188 | +void * | ||
10189 | +hash_insert (Hash_table *table, const void *entry) | ||
10190 | +{ | ||
10191 | + void *data; | ||
10192 | + struct hash_entry *bucket; | ||
10193 | + | ||
10194 | + /* The caller cannot insert a NULL entry. */ | ||
10195 | + if (! entry) | ||
10196 | + abort (); | ||
10197 | + | ||
10198 | + /* If there's a matching entry already in the table, return that. */ | ||
10199 | + if ((data = hash_find_entry (table, entry, &bucket, false)) != NULL) | ||
10200 | + return data; | ||
10201 | + | ||
10202 | + /* ENTRY is not matched, it should be inserted. */ | ||
10203 | + | ||
10204 | + if (bucket->data) | ||
10205 | + { | ||
10206 | + struct hash_entry *new_entry = allocate_entry (table); | ||
10207 | + | ||
10208 | + if (new_entry == NULL) | ||
10209 | + return NULL; | ||
10210 | + | ||
10211 | + /* Add ENTRY in the overflow of the bucket. */ | ||
10212 | + | ||
10213 | + new_entry->data = (void *) entry; | ||
10214 | + new_entry->next = bucket->next; | ||
10215 | + bucket->next = new_entry; | ||
10216 | + table->n_entries++; | ||
10217 | + return (void *) entry; | ||
10218 | + } | ||
10219 | + | ||
10220 | + /* Add ENTRY right in the bucket head. */ | ||
10221 | + | ||
10222 | + bucket->data = (void *) entry; | ||
10223 | + table->n_entries++; | ||
10224 | + table->n_buckets_used++; | ||
10225 | + | ||
10226 | + /* If the growth threshold of the buckets in use has been reached, increase | ||
10227 | + the table size and rehash. There's no point in checking the number of | ||
10228 | + entries: if the hashing function is ill-conditioned, rehashing is not | ||
10229 | + likely to improve it. */ | ||
10230 | + | ||
10231 | + if (table->n_buckets_used | ||
10232 | + > table->tuning->growth_threshold * table->n_buckets) | ||
10233 | + { | ||
10234 | + /* Check more fully, before starting real work. If tuning arguments | ||
10235 | + became invalid, the second check will rely on proper defaults. */ | ||
10236 | + check_tuning (table); | ||
10237 | + if (table->n_buckets_used | ||
10238 | + > table->tuning->growth_threshold * table->n_buckets) | ||
10239 | + { | ||
10240 | + const Hash_tuning *tuning = table->tuning; | ||
10241 | + unsigned candidate | ||
10242 | + = (unsigned) (tuning->is_n_buckets | ||
10243 | + ? (table->n_buckets * tuning->growth_factor) | ||
10244 | + : (table->n_buckets * tuning->growth_factor | ||
10245 | + * tuning->growth_threshold)); | ||
10246 | + | ||
10247 | + /* If the rehash fails, arrange to return NULL. */ | ||
10248 | + if (!hash_rehash (table, candidate)) | ||
10249 | + entry = NULL; | ||
10250 | + } | ||
10251 | + } | ||
10252 | + | ||
10253 | + return (void *) entry; | ||
10254 | +} | ||
10255 | + | ||
10256 | +/* If ENTRY is already in the table, remove it and return the just-deleted | ||
10257 | + data (the user may want to deallocate its storage). If ENTRY is not in the | ||
10258 | + table, don't modify the table and return NULL. */ | ||
10259 | + | ||
10260 | +void * | ||
10261 | +hash_delete (Hash_table *table, const void *entry) | ||
10262 | +{ | ||
10263 | + void *data; | ||
10264 | + struct hash_entry *bucket; | ||
10265 | + | ||
10266 | + data = hash_find_entry (table, entry, &bucket, true); | ||
10267 | + if (!data) | ||
10268 | + return NULL; | ||
10269 | + | ||
10270 | + table->n_entries--; | ||
10271 | + if (!bucket->data) | ||
10272 | + { | ||
10273 | + table->n_buckets_used--; | ||
10274 | + | ||
10275 | + /* If the shrink threshold of the buckets in use has been reached, | ||
10276 | + rehash into a smaller table. */ | ||
10277 | + | ||
10278 | + if (table->n_buckets_used | ||
10279 | + < table->tuning->shrink_threshold * table->n_buckets) | ||
10280 | + { | ||
10281 | + /* Check more fully, before starting real work. If tuning arguments | ||
10282 | + became invalid, the second check will rely on proper defaults. */ | ||
10283 | + check_tuning (table); | ||
10284 | + if (table->n_buckets_used | ||
10285 | + < table->tuning->shrink_threshold * table->n_buckets) | ||
10286 | + { | ||
10287 | + const Hash_tuning *tuning = table->tuning; | ||
10288 | + unsigned candidate | ||
10289 | + = (unsigned) (tuning->is_n_buckets | ||
10290 | + ? table->n_buckets * tuning->shrink_factor | ||
10291 | + : (table->n_buckets * tuning->shrink_factor | ||
10292 | + * tuning->growth_threshold)); | ||
10293 | + | ||
10294 | + hash_rehash (table, candidate); | ||
10295 | + } | ||
10296 | + } | ||
10297 | + } | ||
10298 | + | ||
10299 | + return data; | ||
10300 | +} | ||
10301 | + | ||
10302 | +/* Testing. */ | ||
10303 | + | ||
10304 | +#if TESTING | ||
10305 | + | ||
10306 | +void | ||
10307 | +hash_print (const Hash_table *table) | ||
10308 | +{ | ||
10309 | + struct hash_entry *bucket; | ||
10310 | + | ||
10311 | + for (bucket = table->bucket; bucket < table->bucket_limit; bucket++) | ||
10312 | + { | ||
10313 | + struct hash_entry *cursor; | ||
10314 | + | ||
10315 | + if (bucket) | ||
10316 | + printf ("%d:\n", bucket - table->bucket); | ||
10317 | + | ||
10318 | + for (cursor = bucket; cursor; cursor = cursor->next) | ||
10319 | + { | ||
10320 | + char *s = (char *) cursor->data; | ||
10321 | + /* FIXME */ | ||
10322 | + if (s) | ||
10323 | + printf (" %s\n", s); | ||
10324 | + } | ||
10325 | + } | ||
10326 | +} | ||
10327 | + | ||
10328 | +#endif /* TESTING */ | ||
10329 | --- patch-2.5.9.orig/hash.h | ||
10330 | +++ patch-2.5.9/hash.h | ||
10331 | @@ -0,0 +1,93 @@ | ||
10332 | +/* hash - hashing table processing. | ||
10333 | + Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. | ||
10334 | + Written by Jim Meyering <meyering@ascend.com>, 1998. | ||
10335 | + | ||
10336 | + This program is free software; you can redistribute it and/or modify | ||
10337 | + it under the terms of the GNU General Public License as published by | ||
10338 | + the Free Software Foundation; either version 2, or (at your option) | ||
10339 | + any later version. | ||
10340 | + | ||
10341 | + This program is distributed in the hope that it will be useful, | ||
10342 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10343 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
10344 | + GNU General Public License for more details. | ||
10345 | + | ||
10346 | + You should have received a copy of the GNU General Public License | ||
10347 | + along with this program; if not, write to the Free Software Foundation, | ||
10348 | + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||
10349 | + | ||
10350 | +/* A generic hash table package. */ | ||
10351 | + | ||
10352 | +/* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use | ||
10353 | + obstacks instead of malloc, and recompile `hash.c' with same setting. */ | ||
10354 | + | ||
10355 | +#ifndef HASH_H_ | ||
10356 | +# define HASH_H_ | ||
10357 | + | ||
10358 | +# ifndef PARAMS | ||
10359 | +# if PROTOTYPES || __STDC__ | ||
10360 | +# define PARAMS(Args) Args | ||
10361 | +# else | ||
10362 | +# define PARAMS(Args) () | ||
10363 | +# endif | ||
10364 | +# endif | ||
10365 | + | ||
10366 | +typedef unsigned (*Hash_hasher) PARAMS ((const void *, unsigned)); | ||
10367 | +typedef bool (*Hash_comparator) PARAMS ((const void *, const void *)); | ||
10368 | +typedef void (*Hash_data_freer) PARAMS ((void *)); | ||
10369 | +typedef bool (*Hash_processor) PARAMS ((void *, void *)); | ||
10370 | + | ||
10371 | +struct hash_entry | ||
10372 | + { | ||
10373 | + void *data; | ||
10374 | + struct hash_entry *next; | ||
10375 | + }; | ||
10376 | + | ||
10377 | +struct hash_tuning | ||
10378 | + { | ||
10379 | + /* This structure is mainly used for `hash_initialize', see the block | ||
10380 | + documentation of `hash_reset_tuning' for more complete comments. */ | ||
10381 | + | ||
10382 | + float shrink_threshold; /* ratio of used buckets to trigger a shrink */ | ||
10383 | + float shrink_factor; /* ratio of new smaller size to original size */ | ||
10384 | + float growth_threshold; /* ratio of used buckets to trigger a growth */ | ||
10385 | + float growth_factor; /* ratio of new bigger size to original size */ | ||
10386 | + bool is_n_buckets; /* if CANDIDATE really means table size */ | ||
10387 | + }; | ||
10388 | + | ||
10389 | +typedef struct hash_tuning Hash_tuning; | ||
10390 | + | ||
10391 | +struct hash_table; | ||
10392 | + | ||
10393 | +typedef struct hash_table Hash_table; | ||
10394 | + | ||
10395 | +/* Information and lookup. */ | ||
10396 | +unsigned hash_get_n_buckets PARAMS ((const Hash_table *)); | ||
10397 | +unsigned hash_get_n_buckets_used PARAMS ((const Hash_table *)); | ||
10398 | +unsigned hash_get_n_entries PARAMS ((const Hash_table *)); | ||
10399 | +unsigned hash_get_max_bucket_length PARAMS ((const Hash_table *)); | ||
10400 | +bool hash_table_ok PARAMS ((const Hash_table *)); | ||
10401 | +void hash_print_statistics PARAMS ((const Hash_table *, FILE *)); | ||
10402 | +void *hash_lookup PARAMS ((const Hash_table *, const void *)); | ||
10403 | + | ||
10404 | +/* Walking. */ | ||
10405 | +void *hash_get_first PARAMS ((const Hash_table *)); | ||
10406 | +void *hash_get_next PARAMS ((const Hash_table *, const void *)); | ||
10407 | +unsigned hash_get_entries PARAMS ((const Hash_table *, void **, unsigned)); | ||
10408 | +unsigned hash_do_for_each PARAMS ((const Hash_table *, Hash_processor, void *)); | ||
10409 | + | ||
10410 | +/* Allocation and clean-up. */ | ||
10411 | +unsigned hash_string PARAMS ((const char *, unsigned)); | ||
10412 | +void hash_reset_tuning PARAMS ((Hash_tuning *)); | ||
10413 | +Hash_table *hash_initialize PARAMS ((unsigned, const Hash_tuning *, | ||
10414 | + Hash_hasher, Hash_comparator, | ||
10415 | + Hash_data_freer)); | ||
10416 | +void hash_clear PARAMS ((Hash_table *)); | ||
10417 | +void hash_free PARAMS ((Hash_table *)); | ||
10418 | + | ||
10419 | +/* Insertion and deletion. */ | ||
10420 | +bool hash_rehash PARAMS ((Hash_table *, unsigned)); | ||
10421 | +void *hash_insert PARAMS ((Hash_table *, const void *)); | ||
10422 | +void *hash_delete PARAMS ((Hash_table *, const void *)); | ||
10423 | + | ||
10424 | +#endif | ||