diff options
Diffstat (limited to 'meta/recipes-devtools/patch/patch/debian.patch')
-rw-r--r-- | meta/recipes-devtools/patch/patch/debian.patch | 10426 |
1 files changed, 10426 insertions, 0 deletions
diff --git a/meta/recipes-devtools/patch/patch/debian.patch b/meta/recipes-devtools/patch/patch/debian.patch new file mode 100644 index 0000000..1a07646 --- /dev/null +++ b/meta/recipes-devtools/patch/patch/debian.patch | |||
@@ -0,0 +1,10426 @@ | |||
1 | Upstream-Status: Inappropriate [debian patch] | ||
2 | |||
3 | --- patch-2.5.9.orig/m4/hash.m4 | ||
4 | +++ patch-2.5.9/m4/hash.m4 | ||
5 | @@ -0,0 +1,15 @@ | ||
6 | +# hash.m4 serial 1 | ||
7 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
8 | +dnl This file is free software, distributed under the terms of the GNU | ||
9 | +dnl General Public License. As a special exception to the GNU General | ||
10 | +dnl Public License, this file may be distributed as part of a program | ||
11 | +dnl that contains a configuration script generated by Autoconf, under | ||
12 | +dnl the same distribution terms as the rest of that program. | ||
13 | + | ||
14 | +AC_DEFUN([gl_HASH], | ||
15 | +[ | ||
16 | + dnl Prerequisites of lib/hash.c. | ||
17 | + AC_CHECK_HEADERS_ONCE(stdlib.h) | ||
18 | + AC_HEADER_STDBOOL | ||
19 | + AC_CHECK_DECLS_ONCE(free malloc) | ||
20 | +]) | ||
21 | --- patch-2.5.9.orig/m4/nanosecond_stat.m4 | ||
22 | +++ patch-2.5.9/m4/nanosecond_stat.m4 | ||
23 | @@ -0,0 +1,35 @@ | ||
24 | +AC_DEFUN([ag_CHECK_NANOSECOND_STAT], | ||
25 | + [AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
26 | + [ac_cv_stat_nsec], | ||
27 | + [AC_TRY_COMPILE( | ||
28 | + [ | ||
29 | + #include <sys/types.h> | ||
30 | + #include <sys/stat.h> | ||
31 | + #include <unistd.h> | ||
32 | + struct stat st; | ||
33 | + ], | ||
34 | + [ return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; ], | ||
35 | + [ac_cv_stat_nsec=yes], | ||
36 | + [ac_cv_stat_nsec=no]) | ||
37 | + ]) | ||
38 | + if test $ac_cv_stat_nsec = yes; then | ||
39 | + AC_DEFINE(HAVE_STAT_NSEC, 1, [Define to 1 if struct stat has nanosecond timestamps.]) | ||
40 | + fi | ||
41 | + | ||
42 | + AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
43 | + [ac_cv_stat_timeval], | ||
44 | + [AC_TRY_COMPILE( | ||
45 | + [ | ||
46 | + #include <time.h> | ||
47 | + #include <sys/types.h> | ||
48 | + #include <sys/stat.h> | ||
49 | + #include <unistd.h> | ||
50 | + struct stat st; | ||
51 | + ], | ||
52 | + [ return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; ], | ||
53 | + [ac_cv_stat_timeval=yes], | ||
54 | + [ac_cv_stat_timeval=no]) | ||
55 | + ]) | ||
56 | + if test $ac_cv_stat_timeval = yes; then | ||
57 | + AC_DEFINE(HAVE_STAT_TIMEVAL, 1, [Define to 1 if struct stat comtains struct timeval's.]) | ||
58 | + fi]) | ||
59 | --- patch-2.5.9.orig/Makefile.in | ||
60 | +++ patch-2.5.9/Makefile.in | ||
61 | @@ -62,7 +62,7 @@ | ||
62 | SHELL = /bin/sh | ||
63 | |||
64 | LIBSRCS = error.c malloc.c memchr.c mkdir.c \ | ||
65 | - realloc.c rmdir.c strcasecmp.c strncasecmp.c | ||
66 | + realloc.c rmdir.c strcasecmp.c strncasecmp.c hash.c | ||
67 | SRCS = $(LIBSRCS) \ | ||
68 | addext.c argmatch.c backupfile.c \ | ||
69 | basename.c dirname.c \ | ||
70 | @@ -78,12 +78,12 @@ | ||
71 | maketime.$(OBJEXT) partime.$(OBJEXT) \ | ||
72 | patch.$(OBJEXT) pch.$(OBJEXT) \ | ||
73 | quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \ | ||
74 | - util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) | ||
75 | + util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) hash.$(OBJEXT) | ||
76 | HDRS = argmatch.h backupfile.h common.h dirname.h \ | ||
77 | error.h getopt.h gettext.h \ | ||
78 | inp.h maketime.h partime.h pch.h \ | ||
79 | quote.h quotearg.h quotesys.h \ | ||
80 | - unlocked-io.h util.h version.h xalloc.h | ||
81 | + unlocked-io.h util.h version.h xalloc.h hash.h | ||
82 | MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \ | ||
83 | aclocal.m4 \ | ||
84 | config.hin configure configure.ac \ | ||
85 | --- patch-2.5.9.orig/aclocal.m4 | ||
86 | +++ patch-2.5.9/aclocal.m4 | ||
87 | @@ -1,3 +1,1058 @@ | ||
88 | +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 | ||
89 | + | ||
90 | +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. | ||
91 | +dnl This file is free software; the Free Software Foundation | ||
92 | +dnl gives unlimited permission to copy and/or distribute it, | ||
93 | +dnl with or without modifications, as long as this notice is preserved. | ||
94 | + | ||
95 | +dnl This program is distributed in the hope that it will be useful, | ||
96 | +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
97 | +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
98 | +dnl PARTICULAR PURPOSE. | ||
99 | + | ||
100 | +# lib-prefix.m4 serial 3 (gettext-0.13) | ||
101 | +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
102 | +dnl This file is free software, distributed under the terms of the GNU | ||
103 | +dnl General Public License. As a special exception to the GNU General | ||
104 | +dnl Public License, this file may be distributed as part of a program | ||
105 | +dnl that contains a configuration script generated by Autoconf, under | ||
106 | +dnl the same distribution terms as the rest of that program. | ||
107 | + | ||
108 | +dnl From Bruno Haible. | ||
109 | + | ||
110 | +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and | ||
111 | +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't | ||
112 | +dnl require excessive bracketing. | ||
113 | +ifdef([AC_HELP_STRING], | ||
114 | +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], | ||
115 | +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) | ||
116 | + | ||
117 | +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed | ||
118 | +dnl to access previously installed libraries. The basic assumption is that | ||
119 | +dnl a user will want packages to use other packages he previously installed | ||
120 | +dnl with the same --prefix option. | ||
121 | +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate | ||
122 | +dnl libraries, but is otherwise very convenient. | ||
123 | +AC_DEFUN([AC_LIB_PREFIX], | ||
124 | +[ | ||
125 | + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) | ||
126 | + AC_REQUIRE([AC_PROG_CC]) | ||
127 | + AC_REQUIRE([AC_CANONICAL_HOST]) | ||
128 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
129 | + dnl By default, look in $includedir and $libdir. | ||
130 | + use_additional=yes | ||
131 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
132 | + eval additional_includedir=\"$includedir\" | ||
133 | + eval additional_libdir=\"$libdir\" | ||
134 | + ]) | ||
135 | + AC_LIB_ARG_WITH([lib-prefix], | ||
136 | +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib | ||
137 | + --without-lib-prefix don't search for libraries in includedir and libdir], | ||
138 | +[ | ||
139 | + if test "X$withval" = "Xno"; then | ||
140 | + use_additional=no | ||
141 | + else | ||
142 | + if test "X$withval" = "X"; then | ||
143 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
144 | + eval additional_includedir=\"$includedir\" | ||
145 | + eval additional_libdir=\"$libdir\" | ||
146 | + ]) | ||
147 | + else | ||
148 | + additional_includedir="$withval/include" | ||
149 | + additional_libdir="$withval/lib" | ||
150 | + fi | ||
151 | + fi | ||
152 | +]) | ||
153 | + if test $use_additional = yes; then | ||
154 | + dnl Potentially add $additional_includedir to $CPPFLAGS. | ||
155 | + dnl But don't add it | ||
156 | + dnl 1. if it's the standard /usr/include, | ||
157 | + dnl 2. if it's already present in $CPPFLAGS, | ||
158 | + dnl 3. if it's /usr/local/include and we are using GCC on Linux, | ||
159 | + dnl 4. if it doesn't exist as a directory. | ||
160 | + if test "X$additional_includedir" != "X/usr/include"; then | ||
161 | + haveit= | ||
162 | + for x in $CPPFLAGS; do | ||
163 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
164 | + if test "X$x" = "X-I$additional_includedir"; then | ||
165 | + haveit=yes | ||
166 | + break | ||
167 | + fi | ||
168 | + done | ||
169 | + if test -z "$haveit"; then | ||
170 | + if test "X$additional_includedir" = "X/usr/local/include"; then | ||
171 | + if test -n "$GCC"; then | ||
172 | + case $host_os in | ||
173 | + linux*) haveit=yes;; | ||
174 | + esac | ||
175 | + fi | ||
176 | + fi | ||
177 | + if test -z "$haveit"; then | ||
178 | + if test -d "$additional_includedir"; then | ||
179 | + dnl Really add $additional_includedir to $CPPFLAGS. | ||
180 | + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" | ||
181 | + fi | ||
182 | + fi | ||
183 | + fi | ||
184 | + fi | ||
185 | + dnl Potentially add $additional_libdir to $LDFLAGS. | ||
186 | + dnl But don't add it | ||
187 | + dnl 1. if it's the standard /usr/lib, | ||
188 | + dnl 2. if it's already present in $LDFLAGS, | ||
189 | + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, | ||
190 | + dnl 4. if it doesn't exist as a directory. | ||
191 | + if test "X$additional_libdir" != "X/usr/lib"; then | ||
192 | + haveit= | ||
193 | + for x in $LDFLAGS; do | ||
194 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
195 | + if test "X$x" = "X-L$additional_libdir"; then | ||
196 | + haveit=yes | ||
197 | + break | ||
198 | + fi | ||
199 | + done | ||
200 | + if test -z "$haveit"; then | ||
201 | + if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
202 | + if test -n "$GCC"; then | ||
203 | + case $host_os in | ||
204 | + linux*) haveit=yes;; | ||
205 | + esac | ||
206 | + fi | ||
207 | + fi | ||
208 | + if test -z "$haveit"; then | ||
209 | + if test -d "$additional_libdir"; then | ||
210 | + dnl Really add $additional_libdir to $LDFLAGS. | ||
211 | + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" | ||
212 | + fi | ||
213 | + fi | ||
214 | + fi | ||
215 | + fi | ||
216 | + fi | ||
217 | +]) | ||
218 | + | ||
219 | +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, | ||
220 | +dnl acl_final_exec_prefix, containing the values to which $prefix and | ||
221 | +dnl $exec_prefix will expand at the end of the configure script. | ||
222 | +AC_DEFUN([AC_LIB_PREPARE_PREFIX], | ||
223 | +[ | ||
224 | + dnl Unfortunately, prefix and exec_prefix get only finally determined | ||
225 | + dnl at the end of configure. | ||
226 | + if test "X$prefix" = "XNONE"; then | ||
227 | + acl_final_prefix="$ac_default_prefix" | ||
228 | + else | ||
229 | + acl_final_prefix="$prefix" | ||
230 | + fi | ||
231 | + if test "X$exec_prefix" = "XNONE"; then | ||
232 | + acl_final_exec_prefix='${prefix}' | ||
233 | + else | ||
234 | + acl_final_exec_prefix="$exec_prefix" | ||
235 | + fi | ||
236 | + acl_save_prefix="$prefix" | ||
237 | + prefix="$acl_final_prefix" | ||
238 | + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" | ||
239 | + prefix="$acl_save_prefix" | ||
240 | +]) | ||
241 | + | ||
242 | +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the | ||
243 | +dnl variables prefix and exec_prefix bound to the values they will have | ||
244 | +dnl at the end of the configure script. | ||
245 | +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], | ||
246 | +[ | ||
247 | + acl_save_prefix="$prefix" | ||
248 | + prefix="$acl_final_prefix" | ||
249 | + acl_save_exec_prefix="$exec_prefix" | ||
250 | + exec_prefix="$acl_final_exec_prefix" | ||
251 | + $1 | ||
252 | + exec_prefix="$acl_save_exec_prefix" | ||
253 | + prefix="$acl_save_prefix" | ||
254 | +]) | ||
255 | + | ||
256 | +# lib-link.m4 serial 4 (gettext-0.12) | ||
257 | +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
258 | +dnl This file is free software, distributed under the terms of the GNU | ||
259 | +dnl General Public License. As a special exception to the GNU General | ||
260 | +dnl Public License, this file may be distributed as part of a program | ||
261 | +dnl that contains a configuration script generated by Autoconf, under | ||
262 | +dnl the same distribution terms as the rest of that program. | ||
263 | + | ||
264 | +dnl From Bruno Haible. | ||
265 | + | ||
266 | +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | ||
267 | +dnl the libraries corresponding to explicit and implicit dependencies. | ||
268 | +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | ||
269 | +dnl augments the CPPFLAGS variable. | ||
270 | +AC_DEFUN([AC_LIB_LINKFLAGS], | ||
271 | +[ | ||
272 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
273 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
274 | + define([Name],[translit([$1],[./-], [___])]) | ||
275 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
276 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
277 | + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ | ||
278 | + AC_LIB_LINKFLAGS_BODY([$1], [$2]) | ||
279 | + ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ||
280 | + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" | ||
281 | + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" | ||
282 | + ]) | ||
283 | + LIB[]NAME="$ac_cv_lib[]Name[]_libs" | ||
284 | + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" | ||
285 | + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" | ||
286 | + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
287 | + AC_SUBST([LIB]NAME) | ||
288 | + AC_SUBST([LTLIB]NAME) | ||
289 | + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the | ||
290 | + dnl results of this search when this library appears as a dependency. | ||
291 | + HAVE_LIB[]NAME=yes | ||
292 | + undefine([Name]) | ||
293 | + undefine([NAME]) | ||
294 | +]) | ||
295 | + | ||
296 | +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) | ||
297 | +dnl searches for libname and the libraries corresponding to explicit and | ||
298 | +dnl implicit dependencies, together with the specified include files and | ||
299 | +dnl the ability to compile and link the specified testcode. If found, it | ||
300 | +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and | ||
301 | +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and | ||
302 | +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs | ||
303 | +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. | ||
304 | +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | ||
305 | +[ | ||
306 | + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
307 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
308 | + define([Name],[translit([$1],[./-], [___])]) | ||
309 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
310 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
311 | + | ||
312 | + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME | ||
313 | + dnl accordingly. | ||
314 | + AC_LIB_LINKFLAGS_BODY([$1], [$2]) | ||
315 | + | ||
316 | + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, | ||
317 | + dnl because if the user has installed lib[]Name and not disabled its use | ||
318 | + dnl via --without-lib[]Name-prefix, he wants to use it. | ||
319 | + ac_save_CPPFLAGS="$CPPFLAGS" | ||
320 | + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
321 | + | ||
322 | + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ | ||
323 | + ac_save_LIBS="$LIBS" | ||
324 | + LIBS="$LIBS $LIB[]NAME" | ||
325 | + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) | ||
326 | + LIBS="$ac_save_LIBS" | ||
327 | + ]) | ||
328 | + if test "$ac_cv_lib[]Name" = yes; then | ||
329 | + HAVE_LIB[]NAME=yes | ||
330 | + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) | ||
331 | + AC_MSG_CHECKING([how to link with lib[]$1]) | ||
332 | + AC_MSG_RESULT([$LIB[]NAME]) | ||
333 | + else | ||
334 | + HAVE_LIB[]NAME=no | ||
335 | + dnl If $LIB[]NAME didn't lead to a usable library, we don't need | ||
336 | + dnl $INC[]NAME either. | ||
337 | + CPPFLAGS="$ac_save_CPPFLAGS" | ||
338 | + LIB[]NAME= | ||
339 | + LTLIB[]NAME= | ||
340 | + fi | ||
341 | + AC_SUBST([HAVE_LIB]NAME) | ||
342 | + AC_SUBST([LIB]NAME) | ||
343 | + AC_SUBST([LTLIB]NAME) | ||
344 | + undefine([Name]) | ||
345 | + undefine([NAME]) | ||
346 | +]) | ||
347 | + | ||
348 | +dnl Determine the platform dependent parameters needed to use rpath: | ||
349 | +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | ||
350 | +dnl hardcode_direct, hardcode_minus_L. | ||
351 | +AC_DEFUN([AC_LIB_RPATH], | ||
352 | +[ | ||
353 | + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS | ||
354 | + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld | ||
355 | + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host | ||
356 | + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir | ||
357 | + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ | ||
358 | + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ | ||
359 | + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh | ||
360 | + . ./conftest.sh | ||
361 | + rm -f ./conftest.sh | ||
362 | + acl_cv_rpath=done | ||
363 | + ]) | ||
364 | + wl="$acl_cv_wl" | ||
365 | + libext="$acl_cv_libext" | ||
366 | + shlibext="$acl_cv_shlibext" | ||
367 | + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
368 | + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
369 | + hardcode_direct="$acl_cv_hardcode_direct" | ||
370 | + hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
371 | + dnl Determine whether the user wants rpath handling at all. | ||
372 | + AC_ARG_ENABLE(rpath, | ||
373 | + [ --disable-rpath do not hardcode runtime library paths], | ||
374 | + :, enable_rpath=yes) | ||
375 | +]) | ||
376 | + | ||
377 | +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and | ||
378 | +dnl the libraries corresponding to explicit and implicit dependencies. | ||
379 | +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. | ||
380 | +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | ||
381 | +[ | ||
382 | + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
383 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
384 | + dnl By default, look in $includedir and $libdir. | ||
385 | + use_additional=yes | ||
386 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
387 | + eval additional_includedir=\"$includedir\" | ||
388 | + eval additional_libdir=\"$libdir\" | ||
389 | + ]) | ||
390 | + AC_LIB_ARG_WITH([lib$1-prefix], | ||
391 | +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
392 | + --without-lib$1-prefix don't search for lib$1 in includedir and libdir], | ||
393 | +[ | ||
394 | + if test "X$withval" = "Xno"; then | ||
395 | + use_additional=no | ||
396 | + else | ||
397 | + if test "X$withval" = "X"; then | ||
398 | + AC_LIB_WITH_FINAL_PREFIX([ | ||
399 | + eval additional_includedir=\"$includedir\" | ||
400 | + eval additional_libdir=\"$libdir\" | ||
401 | + ]) | ||
402 | + else | ||
403 | + additional_includedir="$withval/include" | ||
404 | + additional_libdir="$withval/lib" | ||
405 | + fi | ||
406 | + fi | ||
407 | +]) | ||
408 | + dnl Search the library and its dependencies in $additional_libdir and | ||
409 | + dnl $LDFLAGS. Using breadth-first-seach. | ||
410 | + LIB[]NAME= | ||
411 | + LTLIB[]NAME= | ||
412 | + INC[]NAME= | ||
413 | + rpathdirs= | ||
414 | + ltrpathdirs= | ||
415 | + names_already_handled= | ||
416 | + names_next_round='$1 $2' | ||
417 | + while test -n "$names_next_round"; do | ||
418 | + names_this_round="$names_next_round" | ||
419 | + names_next_round= | ||
420 | + for name in $names_this_round; do | ||
421 | + already_handled= | ||
422 | + for n in $names_already_handled; do | ||
423 | + if test "$n" = "$name"; then | ||
424 | + already_handled=yes | ||
425 | + break | ||
426 | + fi | ||
427 | + done | ||
428 | + if test -z "$already_handled"; then | ||
429 | + names_already_handled="$names_already_handled $name" | ||
430 | + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS | ||
431 | + dnl or AC_LIB_HAVE_LINKFLAGS call. | ||
432 | + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` | ||
433 | + eval value=\"\$HAVE_LIB$uppername\" | ||
434 | + if test -n "$value"; then | ||
435 | + if test "$value" = yes; then | ||
436 | + eval value=\"\$LIB$uppername\" | ||
437 | + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" | ||
438 | + eval value=\"\$LTLIB$uppername\" | ||
439 | + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" | ||
440 | + else | ||
441 | + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined | ||
442 | + dnl that this library doesn't exist. So just drop it. | ||
443 | + : | ||
444 | + fi | ||
445 | + else | ||
446 | + dnl Search the library lib$name in $additional_libdir and $LDFLAGS | ||
447 | + dnl and the already constructed $LIBNAME/$LTLIBNAME. | ||
448 | + found_dir= | ||
449 | + found_la= | ||
450 | + found_so= | ||
451 | + found_a= | ||
452 | + if test $use_additional = yes; then | ||
453 | + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then | ||
454 | + found_dir="$additional_libdir" | ||
455 | + found_so="$additional_libdir/lib$name.$shlibext" | ||
456 | + if test -f "$additional_libdir/lib$name.la"; then | ||
457 | + found_la="$additional_libdir/lib$name.la" | ||
458 | + fi | ||
459 | + else | ||
460 | + if test -f "$additional_libdir/lib$name.$libext"; then | ||
461 | + found_dir="$additional_libdir" | ||
462 | + found_a="$additional_libdir/lib$name.$libext" | ||
463 | + if test -f "$additional_libdir/lib$name.la"; then | ||
464 | + found_la="$additional_libdir/lib$name.la" | ||
465 | + fi | ||
466 | + fi | ||
467 | + fi | ||
468 | + fi | ||
469 | + if test "X$found_dir" = "X"; then | ||
470 | + for x in $LDFLAGS $LTLIB[]NAME; do | ||
471 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
472 | + case "$x" in | ||
473 | + -L*) | ||
474 | + dir=`echo "X$x" | sed -e 's/^X-L//'` | ||
475 | + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then | ||
476 | + found_dir="$dir" | ||
477 | + found_so="$dir/lib$name.$shlibext" | ||
478 | + if test -f "$dir/lib$name.la"; then | ||
479 | + found_la="$dir/lib$name.la" | ||
480 | + fi | ||
481 | + else | ||
482 | + if test -f "$dir/lib$name.$libext"; then | ||
483 | + found_dir="$dir" | ||
484 | + found_a="$dir/lib$name.$libext" | ||
485 | + if test -f "$dir/lib$name.la"; then | ||
486 | + found_la="$dir/lib$name.la" | ||
487 | + fi | ||
488 | + fi | ||
489 | + fi | ||
490 | + ;; | ||
491 | + esac | ||
492 | + if test "X$found_dir" != "X"; then | ||
493 | + break | ||
494 | + fi | ||
495 | + done | ||
496 | + fi | ||
497 | + if test "X$found_dir" != "X"; then | ||
498 | + dnl Found the library. | ||
499 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" | ||
500 | + if test "X$found_so" != "X"; then | ||
501 | + dnl Linking with a shared library. We attempt to hardcode its | ||
502 | + dnl directory into the executable's runpath, unless it's the | ||
503 | + dnl standard /usr/lib. | ||
504 | + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then | ||
505 | + dnl No hardcoding is needed. | ||
506 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
507 | + else | ||
508 | + dnl Use an explicit option to hardcode DIR into the resulting | ||
509 | + dnl binary. | ||
510 | + dnl Potentially add DIR to ltrpathdirs. | ||
511 | + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. | ||
512 | + haveit= | ||
513 | + for x in $ltrpathdirs; do | ||
514 | + if test "X$x" = "X$found_dir"; then | ||
515 | + haveit=yes | ||
516 | + break | ||
517 | + fi | ||
518 | + done | ||
519 | + if test -z "$haveit"; then | ||
520 | + ltrpathdirs="$ltrpathdirs $found_dir" | ||
521 | + fi | ||
522 | + dnl The hardcoding into $LIBNAME is system dependent. | ||
523 | + if test "$hardcode_direct" = yes; then | ||
524 | + dnl Using DIR/libNAME.so during linking hardcodes DIR into the | ||
525 | + dnl resulting binary. | ||
526 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
527 | + else | ||
528 | + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | ||
529 | + dnl Use an explicit option to hardcode DIR into the resulting | ||
530 | + dnl binary. | ||
531 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
532 | + dnl Potentially add DIR to rpathdirs. | ||
533 | + dnl The rpathdirs will be appended to $LIBNAME at the end. | ||
534 | + haveit= | ||
535 | + for x in $rpathdirs; do | ||
536 | + if test "X$x" = "X$found_dir"; then | ||
537 | + haveit=yes | ||
538 | + break | ||
539 | + fi | ||
540 | + done | ||
541 | + if test -z "$haveit"; then | ||
542 | + rpathdirs="$rpathdirs $found_dir" | ||
543 | + fi | ||
544 | + else | ||
545 | + dnl Rely on "-L$found_dir". | ||
546 | + dnl But don't add it if it's already contained in the LDFLAGS | ||
547 | + dnl or the already constructed $LIBNAME | ||
548 | + haveit= | ||
549 | + for x in $LDFLAGS $LIB[]NAME; do | ||
550 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
551 | + if test "X$x" = "X-L$found_dir"; then | ||
552 | + haveit=yes | ||
553 | + break | ||
554 | + fi | ||
555 | + done | ||
556 | + if test -z "$haveit"; then | ||
557 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" | ||
558 | + fi | ||
559 | + if test "$hardcode_minus_L" != no; then | ||
560 | + dnl FIXME: Not sure whether we should use | ||
561 | + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
562 | + dnl here. | ||
563 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
564 | + else | ||
565 | + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH | ||
566 | + dnl here, because this doesn't fit in flags passed to the | ||
567 | + dnl compiler. So give up. No hardcoding. This affects only | ||
568 | + dnl very old systems. | ||
569 | + dnl FIXME: Not sure whether we should use | ||
570 | + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
571 | + dnl here. | ||
572 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" | ||
573 | + fi | ||
574 | + fi | ||
575 | + fi | ||
576 | + fi | ||
577 | + else | ||
578 | + if test "X$found_a" != "X"; then | ||
579 | + dnl Linking with a static library. | ||
580 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" | ||
581 | + else | ||
582 | + dnl We shouldn't come here, but anyway it's good to have a | ||
583 | + dnl fallback. | ||
584 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" | ||
585 | + fi | ||
586 | + fi | ||
587 | + dnl Assume the include files are nearby. | ||
588 | + additional_includedir= | ||
589 | + case "$found_dir" in | ||
590 | + */lib | */lib/) | ||
591 | + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` | ||
592 | + additional_includedir="$basedir/include" | ||
593 | + ;; | ||
594 | + esac | ||
595 | + if test "X$additional_includedir" != "X"; then | ||
596 | + dnl Potentially add $additional_includedir to $INCNAME. | ||
597 | + dnl But don't add it | ||
598 | + dnl 1. if it's the standard /usr/include, | ||
599 | + dnl 2. if it's /usr/local/include and we are using GCC on Linux, | ||
600 | + dnl 3. if it's already present in $CPPFLAGS or the already | ||
601 | + dnl constructed $INCNAME, | ||
602 | + dnl 4. if it doesn't exist as a directory. | ||
603 | + if test "X$additional_includedir" != "X/usr/include"; then | ||
604 | + haveit= | ||
605 | + if test "X$additional_includedir" = "X/usr/local/include"; then | ||
606 | + if test -n "$GCC"; then | ||
607 | + case $host_os in | ||
608 | + linux*) haveit=yes;; | ||
609 | + esac | ||
610 | + fi | ||
611 | + fi | ||
612 | + if test -z "$haveit"; then | ||
613 | + for x in $CPPFLAGS $INC[]NAME; do | ||
614 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
615 | + if test "X$x" = "X-I$additional_includedir"; then | ||
616 | + haveit=yes | ||
617 | + break | ||
618 | + fi | ||
619 | + done | ||
620 | + if test -z "$haveit"; then | ||
621 | + if test -d "$additional_includedir"; then | ||
622 | + dnl Really add $additional_includedir to $INCNAME. | ||
623 | + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" | ||
624 | + fi | ||
625 | + fi | ||
626 | + fi | ||
627 | + fi | ||
628 | + fi | ||
629 | + dnl Look for dependencies. | ||
630 | + if test -n "$found_la"; then | ||
631 | + dnl Read the .la file. It defines the variables | ||
632 | + dnl dlname, library_names, old_library, dependency_libs, current, | ||
633 | + dnl age, revision, installed, dlopen, dlpreopen, libdir. | ||
634 | + save_libdir="$libdir" | ||
635 | + case "$found_la" in | ||
636 | + */* | *\\*) . "$found_la" ;; | ||
637 | + *) . "./$found_la" ;; | ||
638 | + esac | ||
639 | + libdir="$save_libdir" | ||
640 | + dnl We use only dependency_libs. | ||
641 | + for dep in $dependency_libs; do | ||
642 | + case "$dep" in | ||
643 | + -L*) | ||
644 | + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` | ||
645 | + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. | ||
646 | + dnl But don't add it | ||
647 | + dnl 1. if it's the standard /usr/lib, | ||
648 | + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, | ||
649 | + dnl 3. if it's already present in $LDFLAGS or the already | ||
650 | + dnl constructed $LIBNAME, | ||
651 | + dnl 4. if it doesn't exist as a directory. | ||
652 | + if test "X$additional_libdir" != "X/usr/lib"; then | ||
653 | + haveit= | ||
654 | + if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
655 | + if test -n "$GCC"; then | ||
656 | + case $host_os in | ||
657 | + linux*) haveit=yes;; | ||
658 | + esac | ||
659 | + fi | ||
660 | + fi | ||
661 | + if test -z "$haveit"; then | ||
662 | + haveit= | ||
663 | + for x in $LDFLAGS $LIB[]NAME; do | ||
664 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
665 | + if test "X$x" = "X-L$additional_libdir"; then | ||
666 | + haveit=yes | ||
667 | + break | ||
668 | + fi | ||
669 | + done | ||
670 | + if test -z "$haveit"; then | ||
671 | + if test -d "$additional_libdir"; then | ||
672 | + dnl Really add $additional_libdir to $LIBNAME. | ||
673 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" | ||
674 | + fi | ||
675 | + fi | ||
676 | + haveit= | ||
677 | + for x in $LDFLAGS $LTLIB[]NAME; do | ||
678 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
679 | + if test "X$x" = "X-L$additional_libdir"; then | ||
680 | + haveit=yes | ||
681 | + break | ||
682 | + fi | ||
683 | + done | ||
684 | + if test -z "$haveit"; then | ||
685 | + if test -d "$additional_libdir"; then | ||
686 | + dnl Really add $additional_libdir to $LTLIBNAME. | ||
687 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" | ||
688 | + fi | ||
689 | + fi | ||
690 | + fi | ||
691 | + fi | ||
692 | + ;; | ||
693 | + -R*) | ||
694 | + dir=`echo "X$dep" | sed -e 's/^X-R//'` | ||
695 | + if test "$enable_rpath" != no; then | ||
696 | + dnl Potentially add DIR to rpathdirs. | ||
697 | + dnl The rpathdirs will be appended to $LIBNAME at the end. | ||
698 | + haveit= | ||
699 | + for x in $rpathdirs; do | ||
700 | + if test "X$x" = "X$dir"; then | ||
701 | + haveit=yes | ||
702 | + break | ||
703 | + fi | ||
704 | + done | ||
705 | + if test -z "$haveit"; then | ||
706 | + rpathdirs="$rpathdirs $dir" | ||
707 | + fi | ||
708 | + dnl Potentially add DIR to ltrpathdirs. | ||
709 | + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. | ||
710 | + haveit= | ||
711 | + for x in $ltrpathdirs; do | ||
712 | + if test "X$x" = "X$dir"; then | ||
713 | + haveit=yes | ||
714 | + break | ||
715 | + fi | ||
716 | + done | ||
717 | + if test -z "$haveit"; then | ||
718 | + ltrpathdirs="$ltrpathdirs $dir" | ||
719 | + fi | ||
720 | + fi | ||
721 | + ;; | ||
722 | + -l*) | ||
723 | + dnl Handle this in the next round. | ||
724 | + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` | ||
725 | + ;; | ||
726 | + *.la) | ||
727 | + dnl Handle this in the next round. Throw away the .la's | ||
728 | + dnl directory; it is already contained in a preceding -L | ||
729 | + dnl option. | ||
730 | + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` | ||
731 | + ;; | ||
732 | + *) | ||
733 | + dnl Most likely an immediate library name. | ||
734 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" | ||
735 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" | ||
736 | + ;; | ||
737 | + esac | ||
738 | + done | ||
739 | + fi | ||
740 | + else | ||
741 | + dnl Didn't find the library; assume it is in the system directories | ||
742 | + dnl known to the linker and runtime loader. (All the system | ||
743 | + dnl directories known to the linker should also be known to the | ||
744 | + dnl runtime loader, otherwise the system is severely misconfigured.) | ||
745 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" | ||
746 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" | ||
747 | + fi | ||
748 | + fi | ||
749 | + fi | ||
750 | + done | ||
751 | + done | ||
752 | + if test "X$rpathdirs" != "X"; then | ||
753 | + if test -n "$hardcode_libdir_separator"; then | ||
754 | + dnl Weird platform: only the last -rpath option counts, the user must | ||
755 | + dnl pass all path elements in one option. We can arrange that for a | ||
756 | + dnl single library, but not when more than one $LIBNAMEs are used. | ||
757 | + alldirs= | ||
758 | + for found_dir in $rpathdirs; do | ||
759 | + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" | ||
760 | + done | ||
761 | + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. | ||
762 | + acl_save_libdir="$libdir" | ||
763 | + libdir="$alldirs" | ||
764 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
765 | + libdir="$acl_save_libdir" | ||
766 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
767 | + else | ||
768 | + dnl The -rpath options are cumulative. | ||
769 | + for found_dir in $rpathdirs; do | ||
770 | + acl_save_libdir="$libdir" | ||
771 | + libdir="$found_dir" | ||
772 | + eval flag=\"$hardcode_libdir_flag_spec\" | ||
773 | + libdir="$acl_save_libdir" | ||
774 | + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
775 | + done | ||
776 | + fi | ||
777 | + fi | ||
778 | + if test "X$ltrpathdirs" != "X"; then | ||
779 | + dnl When using libtool, the option that works for both libraries and | ||
780 | + dnl executables is -R. The -R options are cumulative. | ||
781 | + for found_dir in $ltrpathdirs; do | ||
782 | + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" | ||
783 | + done | ||
784 | + fi | ||
785 | +]) | ||
786 | + | ||
787 | +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, | ||
788 | +dnl unless already present in VAR. | ||
789 | +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes | ||
790 | +dnl contains two or three consecutive elements that belong together. | ||
791 | +AC_DEFUN([AC_LIB_APPENDTOVAR], | ||
792 | +[ | ||
793 | + for element in [$2]; do | ||
794 | + haveit= | ||
795 | + for x in $[$1]; do | ||
796 | + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
797 | + if test "X$x" = "X$element"; then | ||
798 | + haveit=yes | ||
799 | + break | ||
800 | + fi | ||
801 | + done | ||
802 | + if test -z "$haveit"; then | ||
803 | + [$1]="${[$1]}${[$1]:+ }$element" | ||
804 | + fi | ||
805 | + done | ||
806 | +]) | ||
807 | + | ||
808 | +# lib-ld.m4 serial 3 (gettext-0.13) | ||
809 | +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. | ||
810 | +dnl This file is free software, distributed under the terms of the GNU | ||
811 | +dnl General Public License. As a special exception to the GNU General | ||
812 | +dnl Public License, this file may be distributed as part of a program | ||
813 | +dnl that contains a configuration script generated by Autoconf, under | ||
814 | +dnl the same distribution terms as the rest of that program. | ||
815 | + | ||
816 | +dnl Subroutines of libtool.m4, | ||
817 | +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision | ||
818 | +dnl with libtool.m4. | ||
819 | + | ||
820 | +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. | ||
821 | +AC_DEFUN([AC_LIB_PROG_LD_GNU], | ||
822 | +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, | ||
823 | +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. | ||
824 | +case `$LD -v 2>&1 </dev/null` in | ||
825 | +*GNU* | *'with BFD'*) | ||
826 | + acl_cv_prog_gnu_ld=yes ;; | ||
827 | +*) | ||
828 | + acl_cv_prog_gnu_ld=no ;; | ||
829 | +esac]) | ||
830 | +with_gnu_ld=$acl_cv_prog_gnu_ld | ||
831 | +]) | ||
832 | + | ||
833 | +dnl From libtool-1.4. Sets the variable LD. | ||
834 | +AC_DEFUN([AC_LIB_PROG_LD], | ||
835 | +[AC_ARG_WITH(gnu-ld, | ||
836 | +[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], | ||
837 | +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) | ||
838 | +AC_REQUIRE([AC_PROG_CC])dnl | ||
839 | +AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||
840 | +# Prepare PATH_SEPARATOR. | ||
841 | +# The user is always right. | ||
842 | +if test "${PATH_SEPARATOR+set}" != set; then | ||
843 | + echo "#! /bin/sh" >conf$$.sh | ||
844 | + echo "exit 0" >>conf$$.sh | ||
845 | + chmod +x conf$$.sh | ||
846 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
847 | + PATH_SEPARATOR=';' | ||
848 | + else | ||
849 | + PATH_SEPARATOR=: | ||
850 | + fi | ||
851 | + rm -f conf$$.sh | ||
852 | +fi | ||
853 | +ac_prog=ld | ||
854 | +if test "$GCC" = yes; then | ||
855 | + # Check if gcc -print-prog-name=ld gives a path. | ||
856 | + AC_MSG_CHECKING([for ld used by GCC]) | ||
857 | + case $host in | ||
858 | + *-*-mingw*) | ||
859 | + # gcc leaves a trailing carriage return which upsets mingw | ||
860 | + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; | ||
861 | + *) | ||
862 | + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; | ||
863 | + esac | ||
864 | + case $ac_prog in | ||
865 | + # Accept absolute paths. | ||
866 | + [[\\/]* | [A-Za-z]:[\\/]*)] | ||
867 | + [re_direlt='/[^/][^/]*/\.\./'] | ||
868 | + # Canonicalize the path of ld | ||
869 | + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` | ||
870 | + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do | ||
871 | + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` | ||
872 | + done | ||
873 | + test -z "$LD" && LD="$ac_prog" | ||
874 | + ;; | ||
875 | + "") | ||
876 | + # If it fails, then pretend we aren't using GCC. | ||
877 | + ac_prog=ld | ||
878 | + ;; | ||
879 | + *) | ||
880 | + # If it is relative, then search for the first ld in PATH. | ||
881 | + with_gnu_ld=unknown | ||
882 | + ;; | ||
883 | + esac | ||
884 | +elif test "$with_gnu_ld" = yes; then | ||
885 | + AC_MSG_CHECKING([for GNU ld]) | ||
886 | +else | ||
887 | + AC_MSG_CHECKING([for non-GNU ld]) | ||
888 | +fi | ||
889 | +AC_CACHE_VAL(acl_cv_path_LD, | ||
890 | +[if test -z "$LD"; then | ||
891 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" | ||
892 | + for ac_dir in $PATH; do | ||
893 | + test -z "$ac_dir" && ac_dir=. | ||
894 | + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then | ||
895 | + acl_cv_path_LD="$ac_dir/$ac_prog" | ||
896 | + # Check to see if the program is GNU ld. I'd rather use --version, | ||
897 | + # but apparently some GNU ld's only accept -v. | ||
898 | + # Break only if it was the GNU/non-GNU ld that we prefer. | ||
899 | + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in | ||
900 | + *GNU* | *'with BFD'*) | ||
901 | + test "$with_gnu_ld" != no && break ;; | ||
902 | + *) | ||
903 | + test "$with_gnu_ld" != yes && break ;; | ||
904 | + esac | ||
905 | + fi | ||
906 | + done | ||
907 | + IFS="$ac_save_ifs" | ||
908 | +else | ||
909 | + acl_cv_path_LD="$LD" # Let the user override the test with a path. | ||
910 | +fi]) | ||
911 | +LD="$acl_cv_path_LD" | ||
912 | +if test -n "$LD"; then | ||
913 | + AC_MSG_RESULT($LD) | ||
914 | +else | ||
915 | + AC_MSG_RESULT(no) | ||
916 | +fi | ||
917 | +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) | ||
918 | +AC_LIB_PROG_LD_GNU | ||
919 | +]) | ||
920 | + | ||
921 | +# isc-posix.m4 serial 2 (gettext-0.11.2) | ||
922 | +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. | ||
923 | +dnl This file is free software, distributed under the terms of the GNU | ||
924 | +dnl General Public License. As a special exception to the GNU General | ||
925 | +dnl Public License, this file may be distributed as part of a program | ||
926 | +dnl that contains a configuration script generated by Autoconf, under | ||
927 | +dnl the same distribution terms as the rest of that program. | ||
928 | + | ||
929 | +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. | ||
930 | + | ||
931 | +# This test replaces the one in autoconf. | ||
932 | +# Currently this macro should have the same name as the autoconf macro | ||
933 | +# because gettext's gettext.m4 (distributed in the automake package) | ||
934 | +# still uses it. Otherwise, the use in gettext.m4 makes autoheader | ||
935 | +# give these diagnostics: | ||
936 | +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX | ||
937 | +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX | ||
938 | + | ||
939 | +undefine([AC_ISC_POSIX]) | ||
940 | + | ||
941 | +AC_DEFUN([AC_ISC_POSIX], | ||
942 | + [ | ||
943 | + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. | ||
944 | + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) | ||
945 | + ] | ||
946 | +) | ||
947 | + | ||
948 | +# Check for stdbool.h that conforms to C99. | ||
949 | + | ||
950 | +# Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
951 | + | ||
952 | +# This program is free software; you can redistribute it and/or modify | ||
953 | +# it under the terms of the GNU General Public License as published by | ||
954 | +# the Free Software Foundation; either version 2, or (at your option) | ||
955 | +# any later version. | ||
956 | + | ||
957 | +# This program is distributed in the hope that it will be useful, | ||
958 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
959 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
960 | +# GNU General Public License for more details. | ||
961 | + | ||
962 | +# You should have received a copy of the GNU General Public License | ||
963 | +# along with this program; if not, write to the Free Software | ||
964 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
965 | +# 02111-1307, USA. | ||
966 | + | ||
967 | +# Prepare for substituting <stdbool.h> if it is not supported. | ||
968 | + | ||
969 | +AC_DEFUN([AM_STDBOOL_H], | ||
970 | +[ | ||
971 | + AC_REQUIRE([AC_HEADER_STDBOOL]) | ||
972 | + | ||
973 | + # Define two additional variables used in the Makefile substitution. | ||
974 | + | ||
975 | + if test "$ac_cv_header_stdbool_h" = yes; then | ||
976 | + STDBOOL_H='' | ||
977 | + else | ||
978 | + STDBOOL_H='stdbool.h' | ||
979 | + fi | ||
980 | + AC_SUBST([STDBOOL_H]) | ||
981 | + | ||
982 | + if test "$ac_cv_type__Bool" = yes; then | ||
983 | + HAVE__BOOL=1 | ||
984 | + else | ||
985 | + HAVE__BOOL=0 | ||
986 | + fi | ||
987 | + AC_SUBST([HAVE__BOOL]) | ||
988 | +]) | ||
989 | + | ||
990 | +# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf | ||
991 | +# have this macro built-in. | ||
992 | + | ||
993 | +AC_DEFUN([AC_HEADER_STDBOOL], | ||
994 | + [AC_CACHE_CHECK([for stdbool.h that conforms to C99], | ||
995 | + [ac_cv_header_stdbool_h], | ||
996 | + [AC_TRY_COMPILE( | ||
997 | + [ | ||
998 | + #include <stdbool.h> | ||
999 | + #ifndef bool | ||
1000 | + "error: bool is not defined" | ||
1001 | + #endif | ||
1002 | + #ifndef false | ||
1003 | + "error: false is not defined" | ||
1004 | + #endif | ||
1005 | + #if false | ||
1006 | + "error: false is not 0" | ||
1007 | + #endif | ||
1008 | + #ifndef true | ||
1009 | + "error: false is not defined" | ||
1010 | + #endif | ||
1011 | + #if true != 1 | ||
1012 | + "error: true is not 1" | ||
1013 | + #endif | ||
1014 | + #ifndef __bool_true_false_are_defined | ||
1015 | + "error: __bool_true_false_are_defined is not defined" | ||
1016 | + #endif | ||
1017 | + | ||
1018 | + struct s { _Bool s: 1; _Bool t; } s; | ||
1019 | + | ||
1020 | + char a[true == 1 ? 1 : -1]; | ||
1021 | + char b[false == 0 ? 1 : -1]; | ||
1022 | + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
1023 | + char d[(bool) -0.5 == true ? 1 : -1]; | ||
1024 | + bool e = &s; | ||
1025 | + char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
1026 | + char g[true]; | ||
1027 | + char h[sizeof (_Bool)]; | ||
1028 | + char i[sizeof s.t]; | ||
1029 | + ], | ||
1030 | + [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ], | ||
1031 | + [ac_cv_header_stdbool_h=yes], | ||
1032 | + [ac_cv_header_stdbool_h=no])]) | ||
1033 | + AC_CHECK_TYPES([_Bool]) | ||
1034 | + if test $ac_cv_header_stdbool_h = yes; then | ||
1035 | + AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) | ||
1036 | + fi]) | ||
1037 | + | ||
1038 | +#serial 5 | ||
1039 | + | ||
1040 | +dnl From Jim Meyering | ||
1041 | + | ||
1042 | +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- | ||
1043 | +dnl usually in <utime.h>. | ||
1044 | +dnl Some systems have utime.h but don't declare the struct anywhere. | ||
1045 | + | ||
1046 | +AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF], | ||
1047 | +[ | ||
1048 | + AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) | ||
1049 | + AC_REQUIRE([AC_HEADER_TIME]) | ||
1050 | + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, | ||
1051 | + [AC_TRY_COMPILE( | ||
1052 | + [ | ||
1053 | +#ifdef TIME_WITH_SYS_TIME | ||
1054 | +# include <sys/time.h> | ||
1055 | +# include <time.h> | ||
1056 | +#else | ||
1057 | +# ifdef HAVE_SYS_TIME_H | ||
1058 | +# include <sys/time.h> | ||
1059 | +# else | ||
1060 | +# include <time.h> | ||
1061 | +# endif | ||
1062 | +#endif | ||
1063 | +#ifdef HAVE_UTIME_H | ||
1064 | +# include <utime.h> | ||
1065 | +#endif | ||
1066 | + ], | ||
1067 | + [static struct utimbuf x; x.actime = x.modtime;], | ||
1068 | + fu_cv_sys_struct_utimbuf=yes, | ||
1069 | + fu_cv_sys_struct_utimbuf=no) | ||
1070 | + ]) | ||
1071 | + | ||
1072 | + if test $fu_cv_sys_struct_utimbuf = yes; then | ||
1073 | + AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, | ||
1074 | + [Define if struct utimbuf is declared -- usually in <utime.h>. | ||
1075 | + Some systems have utime.h but don't declare the struct anywhere. ]) | ||
1076 | + fi | ||
1077 | +]) | ||
1078 | + | ||
1079 | +# onceonly.m4 serial 3 | ||
1080 | +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. | ||
1081 | +dnl This file is free software, distributed under the terms of the GNU | ||
1082 | +dnl General Public License. As a special exception to the GNU General | ||
1083 | +dnl Public License, this file may be distributed as part of a program | ||
1084 | +dnl that contains a configuration script generated by Autoconf, under | ||
1085 | +dnl the same distribution terms as the rest of that program. | ||
1086 | + | ||
1087 | +dnl This file defines some "once only" variants of standard autoconf macros. | ||
1088 | +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS | ||
1089 | +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS | ||
1090 | +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS | ||
1091 | +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC | ||
1092 | +dnl The advantage is that the check for each of the headers/functions/decls | ||
1093 | +dnl will be put only once into the 'configure' file. It keeps the size of | ||
1094 | +dnl the 'configure' file down, and avoids redundant output when 'configure' | ||
1095 | +dnl is run. | ||
1096 | +dnl The drawback is that the checks cannot be conditionalized. If you write | ||
1097 | +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi | ||
1098 | +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to | ||
1099 | +dnl empty, and the check will be inserted before the body of the AC_DEFUNed | ||
1100 | +dnl function. | ||
1101 | + | ||
1102 | +dnl Autoconf version 2.57 or newer is recommended. | ||
1103 | +AC_PREREQ(2.54) | ||
1104 | + | ||
1105 | +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of | ||
1106 | +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). | ||
1107 | +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ | ||
1108 | + : | ||
1109 | + AC_FOREACH([gl_HEADER_NAME], [$1], [ | ||
1110 | + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]), | ||
1111 | + [-./], [___])), [ | ||
1112 | + AC_CHECK_HEADERS(gl_HEADER_NAME) | ||
1113 | + ]) | ||
1114 | + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, | ||
1115 | + [-./], [___]))) | ||
1116 | + ]) | ||
1117 | +]) | ||
1118 | + | ||
1119 | +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of | ||
1120 | +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). | ||
1121 | +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ | ||
1122 | + : | ||
1123 | + AC_FOREACH([gl_FUNC_NAME], [$1], [ | ||
1124 | + AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [ | ||
1125 | + AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME])) | ||
1126 | + ]) | ||
1127 | + AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME])) | ||
1128 | + ]) | ||
1129 | +]) | ||
1130 | + | ||
1131 | +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of | ||
1132 | +# AC_CHECK_DECLS(DECL1, DECL2, ...). | ||
1133 | +AC_DEFUN([AC_CHECK_DECLS_ONCE], [ | ||
1134 | + : | ||
1135 | + AC_FOREACH([gl_DECL_NAME], [$1], [ | ||
1136 | + AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [ | ||
1137 | + AC_CHECK_DECLS(m4_defn([gl_DECL_NAME])) | ||
1138 | + ]) | ||
1139 | + AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME])) | ||
1140 | + ]) | ||
1141 | +]) | ||
1142 | + | ||
1143 | # backupfile.m4 serial 1 | ||
1144 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1145 | dnl This file is free software, distributed under the terms of the GNU | ||
1146 | @@ -21,6 +1076,7 @@ | ||
1147 | AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h) | ||
1148 | AC_CHECK_FUNCS(pathconf) | ||
1149 | ]) | ||
1150 | + | ||
1151 | #serial 5 | ||
1152 | |||
1153 | dnl From Jim Meyering. | ||
1154 | @@ -63,31 +1119,7 @@ | ||
1155 | fi | ||
1156 | ] | ||
1157 | ) | ||
1158 | -# dirname.m4 serial 1 | ||
1159 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1160 | -dnl This file is free software, distributed under the terms of the GNU | ||
1161 | -dnl General Public License. As a special exception to the GNU General | ||
1162 | -dnl Public License, this file may be distributed as part of a program | ||
1163 | -dnl that contains a configuration script generated by Autoconf, under | ||
1164 | -dnl the same distribution terms as the rest of that program. | ||
1165 | |||
1166 | -AC_DEFUN([gl_DIRNAME], | ||
1167 | -[ | ||
1168 | - dnl Prerequisites of lib/dirname.h. | ||
1169 | - AC_REQUIRE([jm_AC_DOS]) | ||
1170 | - | ||
1171 | - dnl Prerequisites of lib/dirname.c. | ||
1172 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1173 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1174 | - | ||
1175 | - dnl Prerequisites of lib/basename.c. | ||
1176 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1177 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1178 | - | ||
1179 | - dnl Prerequisites of lib/stripslash.c. | ||
1180 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1181 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1182 | -]) | ||
1183 | #serial 5 | ||
1184 | |||
1185 | # Define some macros required for proper operation of code in lib/*.c | ||
1186 | @@ -141,6 +1173,33 @@ | ||
1187 | [Define if the backslash character may also serve as a file name | ||
1188 | component separator.]) | ||
1189 | ]) | ||
1190 | + | ||
1191 | +# dirname.m4 serial 1 | ||
1192 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1193 | +dnl This file is free software, distributed under the terms of the GNU | ||
1194 | +dnl General Public License. As a special exception to the GNU General | ||
1195 | +dnl Public License, this file may be distributed as part of a program | ||
1196 | +dnl that contains a configuration script generated by Autoconf, under | ||
1197 | +dnl the same distribution terms as the rest of that program. | ||
1198 | + | ||
1199 | +AC_DEFUN([gl_DIRNAME], | ||
1200 | +[ | ||
1201 | + dnl Prerequisites of lib/dirname.h. | ||
1202 | + AC_REQUIRE([jm_AC_DOS]) | ||
1203 | + | ||
1204 | + dnl Prerequisites of lib/dirname.c. | ||
1205 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1206 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1207 | + | ||
1208 | + dnl Prerequisites of lib/basename.c. | ||
1209 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1210 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1211 | + | ||
1212 | + dnl Prerequisites of lib/stripslash.c. | ||
1213 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1214 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1215 | +]) | ||
1216 | + | ||
1217 | #serial 7 | ||
1218 | |||
1219 | AC_DEFUN([gl_ERROR], | ||
1220 | @@ -159,7 +1218,67 @@ | ||
1221 | AC_CHECK_DECLS([strerror]) | ||
1222 | AC_FUNC_STRERROR_R | ||
1223 | ]) | ||
1224 | -# getopt.m4 serial 1 | ||
1225 | + | ||
1226 | +# memchr.m4 serial 1 | ||
1227 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1228 | +dnl This file is free software, distributed under the terms of the GNU | ||
1229 | +dnl General Public License. As a special exception to the GNU General | ||
1230 | +dnl Public License, this file may be distributed as part of a program | ||
1231 | +dnl that contains a configuration script generated by Autoconf, under | ||
1232 | +dnl the same distribution terms as the rest of that program. | ||
1233 | + | ||
1234 | +AC_DEFUN([gl_FUNC_MEMCHR], | ||
1235 | +[ | ||
1236 | + AC_REPLACE_FUNCS(memchr) | ||
1237 | + if test $ac_cv_func_memchr = no; then | ||
1238 | + jm_PREREQ_MEMCHR | ||
1239 | + fi | ||
1240 | +]) | ||
1241 | + | ||
1242 | +# Prerequisites of lib/memchr.c. | ||
1243 | +AC_DEFUN([jm_PREREQ_MEMCHR], [ | ||
1244 | + AC_CHECK_HEADERS_ONCE(limits.h stdlib.h) | ||
1245 | + AC_CHECK_HEADERS(bp-sym.h) | ||
1246 | +]) | ||
1247 | + | ||
1248 | +# rmdir.m4 serial 1 | ||
1249 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1250 | +dnl This file is free software, distributed under the terms of the GNU | ||
1251 | +dnl General Public License. As a special exception to the GNU General | ||
1252 | +dnl Public License, this file may be distributed as part of a program | ||
1253 | +dnl that contains a configuration script generated by Autoconf, under | ||
1254 | +dnl the same distribution terms as the rest of that program. | ||
1255 | + | ||
1256 | +AC_DEFUN([gl_FUNC_RMDIR], | ||
1257 | +[ | ||
1258 | + AC_REPLACE_FUNCS(rmdir) | ||
1259 | + if test $ac_cv_func_rmdir = no; then | ||
1260 | + gl_PREREQ_RMDIR | ||
1261 | + fi | ||
1262 | +]) | ||
1263 | + | ||
1264 | +# Prerequisites of lib/rmdir.c. | ||
1265 | +AC_DEFUN([gl_PREREQ_RMDIR], [ | ||
1266 | + AC_REQUIRE([AC_HEADER_STAT]) | ||
1267 | + : | ||
1268 | +]) | ||
1269 | + | ||
1270 | + | ||
1271 | +# getopt.m4 serial 1 | ||
1272 | +dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1273 | +dnl This file is free software, distributed under the terms of the GNU | ||
1274 | +dnl General Public License. As a special exception to the GNU General | ||
1275 | +dnl Public License, this file may be distributed as part of a program | ||
1276 | +dnl that contains a configuration script generated by Autoconf, under | ||
1277 | +dnl the same distribution terms as the rest of that program. | ||
1278 | + | ||
1279 | +AC_DEFUN([gl_GETOPT], | ||
1280 | +[ | ||
1281 | + dnl Prerequisites of lib/getopt.c. | ||
1282 | + AC_CHECK_HEADERS_ONCE(string.h) | ||
1283 | +]) | ||
1284 | + | ||
1285 | +# xalloc.m4 serial 1 | ||
1286 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1287 | dnl This file is free software, distributed under the terms of the GNU | ||
1288 | dnl General Public License. As a special exception to the GNU General | ||
1289 | @@ -167,11 +1286,25 @@ | ||
1290 | dnl that contains a configuration script generated by Autoconf, under | ||
1291 | dnl the same distribution terms as the rest of that program. | ||
1292 | |||
1293 | -AC_DEFUN([gl_GETOPT], | ||
1294 | +AC_DEFUN([gl_XALLOC], | ||
1295 | [ | ||
1296 | - dnl Prerequisites of lib/getopt.c. | ||
1297 | + gl_PREREQ_XMALLOC | ||
1298 | + gl_PREREQ_XSTRDUP | ||
1299 | +]) | ||
1300 | + | ||
1301 | +# Prerequisites of lib/xmalloc.c. | ||
1302 | +AC_DEFUN([gl_PREREQ_XMALLOC], [ | ||
1303 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1304 | + AC_REQUIRE([jm_FUNC_MALLOC]) | ||
1305 | + AC_REQUIRE([jm_FUNC_REALLOC]) | ||
1306 | +]) | ||
1307 | + | ||
1308 | +# Prerequisites of lib/xstrdup.c. | ||
1309 | +AC_DEFUN([gl_PREREQ_XSTRDUP], [ | ||
1310 | + AC_REQUIRE([AC_HEADER_STDC]) | ||
1311 | AC_CHECK_HEADERS_ONCE(string.h) | ||
1312 | ]) | ||
1313 | + | ||
1314 | # malloc.m4 serial 7 | ||
1315 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1316 | dnl This file is free software, distributed under the terms of the GNU | ||
1317 | @@ -197,66 +1330,8 @@ | ||
1318 | AC_DEFUN([gl_PREREQ_MALLOC], [ | ||
1319 | : | ||
1320 | ]) | ||
1321 | -# mbrtowc.m4 serial 5 | ||
1322 | -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. | ||
1323 | -dnl This file is free software, distributed under the terms of the GNU | ||
1324 | -dnl General Public License. As a special exception to the GNU General | ||
1325 | -dnl Public License, this file may be distributed as part of a program | ||
1326 | -dnl that contains a configuration script generated by Autoconf, under | ||
1327 | -dnl the same distribution terms as the rest of that program. | ||
1328 | - | ||
1329 | -dnl From Paul Eggert | ||
1330 | - | ||
1331 | -dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with | ||
1332 | -dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere. | ||
1333 | - | ||
1334 | -AC_DEFUN([jm_FUNC_MBRTOWC], | ||
1335 | -[ | ||
1336 | - AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], | ||
1337 | - jm_cv_func_mbrtowc, | ||
1338 | - [AC_TRY_LINK( | ||
1339 | - [#include <wchar.h>], | ||
1340 | - [mbstate_t state; return ! (sizeof state && mbrtowc);], | ||
1341 | - jm_cv_func_mbrtowc=yes, | ||
1342 | - jm_cv_func_mbrtowc=no)]) | ||
1343 | - if test $jm_cv_func_mbrtowc = yes; then | ||
1344 | - AC_DEFINE(HAVE_MBRTOWC, 1, | ||
1345 | - [Define to 1 if mbrtowc and mbstate_t are properly declared.]) | ||
1346 | - fi | ||
1347 | -]) | ||
1348 | -# mbstate_t.m4 serial 9 | ||
1349 | -dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. | ||
1350 | -dnl This file is free software, distributed under the terms of the GNU | ||
1351 | -dnl General Public License. As a special exception to the GNU General | ||
1352 | -dnl Public License, this file may be distributed as part of a program | ||
1353 | -dnl that contains a configuration script generated by Autoconf, under | ||
1354 | -dnl the same distribution terms as the rest of that program. | ||
1355 | - | ||
1356 | -# From Paul Eggert. | ||
1357 | - | ||
1358 | -# BeOS 5 has <wchar.h> but does not define mbstate_t, | ||
1359 | -# so you can't declare an object of that type. | ||
1360 | -# Check for this incompatibility with Standard C. | ||
1361 | |||
1362 | -# AC_TYPE_MBSTATE_T | ||
1363 | -# ----------------- | ||
1364 | -AC_DEFUN([AC_TYPE_MBSTATE_T], | ||
1365 | - [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, | ||
1366 | - [AC_COMPILE_IFELSE( | ||
1367 | - [AC_LANG_PROGRAM( | ||
1368 | - [AC_INCLUDES_DEFAULT | ||
1369 | -# include <wchar.h>], | ||
1370 | - [mbstate_t x; return sizeof x;])], | ||
1371 | - [ac_cv_type_mbstate_t=yes], | ||
1372 | - [ac_cv_type_mbstate_t=no])]) | ||
1373 | - if test $ac_cv_type_mbstate_t = yes; then | ||
1374 | - AC_DEFINE([HAVE_MBSTATE_T], 1, | ||
1375 | - [Define to 1 if <wchar.h> declares mbstate_t.]) | ||
1376 | - else | ||
1377 | - AC_DEFINE([mbstate_t], int, | ||
1378 | - [Define to a type if <wchar.h> does not define.]) | ||
1379 | - fi]) | ||
1380 | -# memchr.m4 serial 1 | ||
1381 | +# realloc.m4 serial 7 | ||
1382 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1383 | dnl This file is free software, distributed under the terms of the GNU | ||
1384 | dnl General Public License. As a special exception to the GNU General | ||
1385 | @@ -264,116 +1339,24 @@ | ||
1386 | dnl that contains a configuration script generated by Autoconf, under | ||
1387 | dnl the same distribution terms as the rest of that program. | ||
1388 | |||
1389 | -AC_DEFUN([gl_FUNC_MEMCHR], | ||
1390 | +dnl From Jim Meyering. | ||
1391 | +dnl Determine whether realloc works when both arguments are 0. | ||
1392 | +dnl If it doesn't, arrange to use the replacement function. | ||
1393 | + | ||
1394 | +AC_DEFUN([jm_FUNC_REALLOC], | ||
1395 | [ | ||
1396 | - AC_REPLACE_FUNCS(memchr) | ||
1397 | - if test $ac_cv_func_memchr = no; then | ||
1398 | - jm_PREREQ_MEMCHR | ||
1399 | + AC_REQUIRE([AC_FUNC_REALLOC]) | ||
1400 | + dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works. | ||
1401 | + if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then | ||
1402 | + gl_PREREQ_REALLOC | ||
1403 | fi | ||
1404 | ]) | ||
1405 | |||
1406 | -# Prerequisites of lib/memchr.c. | ||
1407 | -AC_DEFUN([jm_PREREQ_MEMCHR], [ | ||
1408 | - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h) | ||
1409 | - AC_CHECK_HEADERS(bp-sym.h) | ||
1410 | -]) | ||
1411 | -#serial 1 | ||
1412 | - | ||
1413 | -dnl From Mumit Khan and Paul Eggert | ||
1414 | -dnl Determine whether mkdir accepts only one argument instead of the usual two. | ||
1415 | - | ||
1416 | -AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG], | ||
1417 | - [AC_CHECK_FUNCS(mkdir) | ||
1418 | - AC_CACHE_CHECK([whether mkdir takes only one argument], | ||
1419 | - patch_cv_mkdir_takes_one_arg, | ||
1420 | - [patch_cv_mkdir_takes_one_arg=no | ||
1421 | - if test $ac_cv_func_mkdir = yes; then | ||
1422 | - AC_TRY_COMPILE([ | ||
1423 | -#include <sys/types.h> | ||
1424 | -#include <sys/stat.h> | ||
1425 | - ], | ||
1426 | - [mkdir (".", 0);], | ||
1427 | - , | ||
1428 | - [AC_TRY_COMPILE([ | ||
1429 | -#include <sys/types.h> | ||
1430 | -#include <sys/stat.h> | ||
1431 | - ], | ||
1432 | - [mkdir (".");], | ||
1433 | - patch_cv_mkdir_takes_one_arg=yes | ||
1434 | - )] | ||
1435 | - ) | ||
1436 | - fi | ||
1437 | - ] | ||
1438 | - ) | ||
1439 | - if test $patch_cv_mkdir_takes_one_arg = yes; then | ||
1440 | - AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, | ||
1441 | - [Define if mkdir takes only one argument.]) | ||
1442 | - fi | ||
1443 | - ] | ||
1444 | -) | ||
1445 | -# onceonly.m4 serial 3 | ||
1446 | -dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. | ||
1447 | -dnl This file is free software, distributed under the terms of the GNU | ||
1448 | -dnl General Public License. As a special exception to the GNU General | ||
1449 | -dnl Public License, this file may be distributed as part of a program | ||
1450 | -dnl that contains a configuration script generated by Autoconf, under | ||
1451 | -dnl the same distribution terms as the rest of that program. | ||
1452 | - | ||
1453 | -dnl This file defines some "once only" variants of standard autoconf macros. | ||
1454 | -dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS | ||
1455 | -dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS | ||
1456 | -dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS | ||
1457 | -dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC | ||
1458 | -dnl The advantage is that the check for each of the headers/functions/decls | ||
1459 | -dnl will be put only once into the 'configure' file. It keeps the size of | ||
1460 | -dnl the 'configure' file down, and avoids redundant output when 'configure' | ||
1461 | -dnl is run. | ||
1462 | -dnl The drawback is that the checks cannot be conditionalized. If you write | ||
1463 | -dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi | ||
1464 | -dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to | ||
1465 | -dnl empty, and the check will be inserted before the body of the AC_DEFUNed | ||
1466 | -dnl function. | ||
1467 | - | ||
1468 | -dnl Autoconf version 2.57 or newer is recommended. | ||
1469 | -AC_PREREQ(2.54) | ||
1470 | - | ||
1471 | -# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of | ||
1472 | -# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). | ||
1473 | -AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ | ||
1474 | - : | ||
1475 | - AC_FOREACH([gl_HEADER_NAME], [$1], [ | ||
1476 | - AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]), | ||
1477 | - [-./], [___])), [ | ||
1478 | - AC_CHECK_HEADERS(gl_HEADER_NAME) | ||
1479 | - ]) | ||
1480 | - AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, | ||
1481 | - [-./], [___]))) | ||
1482 | - ]) | ||
1483 | -]) | ||
1484 | - | ||
1485 | -# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of | ||
1486 | -# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). | ||
1487 | -AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ | ||
1488 | +# Prerequisites of lib/realloc.c. | ||
1489 | +AC_DEFUN([gl_PREREQ_REALLOC], [ | ||
1490 | : | ||
1491 | - AC_FOREACH([gl_FUNC_NAME], [$1], [ | ||
1492 | - AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [ | ||
1493 | - AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME])) | ||
1494 | - ]) | ||
1495 | - AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME])) | ||
1496 | - ]) | ||
1497 | ]) | ||
1498 | |||
1499 | -# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of | ||
1500 | -# AC_CHECK_DECLS(DECL1, DECL2, ...). | ||
1501 | -AC_DEFUN([AC_CHECK_DECLS_ONCE], [ | ||
1502 | - : | ||
1503 | - AC_FOREACH([gl_DECL_NAME], [$1], [ | ||
1504 | - AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [ | ||
1505 | - AC_CHECK_DECLS(m4_defn([gl_DECL_NAME])) | ||
1506 | - ]) | ||
1507 | - AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME])) | ||
1508 | - ]) | ||
1509 | -]) | ||
1510 | # quote.m4 serial 1 | ||
1511 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1512 | dnl This file is free software, distributed under the terms of the GNU | ||
1513 | @@ -387,6 +1370,7 @@ | ||
1514 | dnl Prerequisites of lib/quote.c. | ||
1515 | AC_CHECK_HEADERS_ONCE(stddef.h) | ||
1516 | ]) | ||
1517 | + | ||
1518 | # quotearg.m4 serial 1 | ||
1519 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1520 | dnl This file is free software, distributed under the terms of the GNU | ||
1521 | @@ -403,32 +1387,69 @@ | ||
1522 | AC_TYPE_MBSTATE_T | ||
1523 | jm_FUNC_MBRTOWC | ||
1524 | ]) | ||
1525 | -# realloc.m4 serial 7 | ||
1526 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1527 | + | ||
1528 | +# mbstate_t.m4 serial 9 | ||
1529 | +dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. | ||
1530 | dnl This file is free software, distributed under the terms of the GNU | ||
1531 | dnl General Public License. As a special exception to the GNU General | ||
1532 | dnl Public License, this file may be distributed as part of a program | ||
1533 | dnl that contains a configuration script generated by Autoconf, under | ||
1534 | dnl the same distribution terms as the rest of that program. | ||
1535 | |||
1536 | -dnl From Jim Meyering. | ||
1537 | -dnl Determine whether realloc works when both arguments are 0. | ||
1538 | -dnl If it doesn't, arrange to use the replacement function. | ||
1539 | +# From Paul Eggert. | ||
1540 | |||
1541 | -AC_DEFUN([jm_FUNC_REALLOC], | ||
1542 | +# BeOS 5 has <wchar.h> but does not define mbstate_t, | ||
1543 | +# so you can't declare an object of that type. | ||
1544 | +# Check for this incompatibility with Standard C. | ||
1545 | + | ||
1546 | +# AC_TYPE_MBSTATE_T | ||
1547 | +# ----------------- | ||
1548 | +AC_DEFUN([AC_TYPE_MBSTATE_T], | ||
1549 | + [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, | ||
1550 | + [AC_COMPILE_IFELSE( | ||
1551 | + [AC_LANG_PROGRAM( | ||
1552 | + [AC_INCLUDES_DEFAULT | ||
1553 | +# include <wchar.h>], | ||
1554 | + [mbstate_t x; return sizeof x;])], | ||
1555 | + [ac_cv_type_mbstate_t=yes], | ||
1556 | + [ac_cv_type_mbstate_t=no])]) | ||
1557 | + if test $ac_cv_type_mbstate_t = yes; then | ||
1558 | + AC_DEFINE([HAVE_MBSTATE_T], 1, | ||
1559 | + [Define to 1 if <wchar.h> declares mbstate_t.]) | ||
1560 | + else | ||
1561 | + AC_DEFINE([mbstate_t], int, | ||
1562 | + [Define to a type if <wchar.h> does not define.]) | ||
1563 | + fi]) | ||
1564 | + | ||
1565 | +# mbrtowc.m4 serial 5 | ||
1566 | +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. | ||
1567 | +dnl This file is free software, distributed under the terms of the GNU | ||
1568 | +dnl General Public License. As a special exception to the GNU General | ||
1569 | +dnl Public License, this file may be distributed as part of a program | ||
1570 | +dnl that contains a configuration script generated by Autoconf, under | ||
1571 | +dnl the same distribution terms as the rest of that program. | ||
1572 | + | ||
1573 | +dnl From Paul Eggert | ||
1574 | + | ||
1575 | +dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with | ||
1576 | +dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere. | ||
1577 | + | ||
1578 | +AC_DEFUN([jm_FUNC_MBRTOWC], | ||
1579 | [ | ||
1580 | - AC_REQUIRE([AC_FUNC_REALLOC]) | ||
1581 | - dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works. | ||
1582 | - if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then | ||
1583 | - gl_PREREQ_REALLOC | ||
1584 | + AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], | ||
1585 | + jm_cv_func_mbrtowc, | ||
1586 | + [AC_TRY_LINK( | ||
1587 | + [#include <wchar.h>], | ||
1588 | + [mbstate_t state; return ! (sizeof state && mbrtowc);], | ||
1589 | + jm_cv_func_mbrtowc=yes, | ||
1590 | + jm_cv_func_mbrtowc=no)]) | ||
1591 | + if test $jm_cv_func_mbrtowc = yes; then | ||
1592 | + AC_DEFINE(HAVE_MBRTOWC, 1, | ||
1593 | + [Define to 1 if mbrtowc and mbstate_t are properly declared.]) | ||
1594 | fi | ||
1595 | ]) | ||
1596 | |||
1597 | -# Prerequisites of lib/realloc.c. | ||
1598 | -AC_DEFUN([gl_PREREQ_REALLOC], [ | ||
1599 | - : | ||
1600 | -]) | ||
1601 | -# rmdir.m4 serial 1 | ||
1602 | +# hash.m4 serial 1 | ||
1603 | dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1604 | dnl This file is free software, distributed under the terms of the GNU | ||
1605 | dnl General Public License. As a special exception to the GNU General | ||
1606 | @@ -436,18 +1457,71 @@ | ||
1607 | dnl that contains a configuration script generated by Autoconf, under | ||
1608 | dnl the same distribution terms as the rest of that program. | ||
1609 | |||
1610 | -AC_DEFUN([gl_FUNC_RMDIR], | ||
1611 | +AC_DEFUN([gl_HASH], | ||
1612 | [ | ||
1613 | - AC_REPLACE_FUNCS(rmdir) | ||
1614 | - if test $ac_cv_func_rmdir = no; then | ||
1615 | - gl_PREREQ_RMDIR | ||
1616 | - fi | ||
1617 | + dnl Prerequisites of lib/hash.c. | ||
1618 | + AC_CHECK_HEADERS_ONCE(stdlib.h) | ||
1619 | + AC_HEADER_STDBOOL | ||
1620 | + AC_CHECK_DECLS_ONCE(free malloc) | ||
1621 | ]) | ||
1622 | |||
1623 | -# Prerequisites of lib/rmdir.c. | ||
1624 | -AC_DEFUN([gl_PREREQ_RMDIR], [ | ||
1625 | - AC_REQUIRE([AC_HEADER_STAT]) | ||
1626 | - : | ||
1627 | +AC_DEFUN([ag_CHECK_NANOSECOND_STAT], | ||
1628 | + [AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
1629 | + [ac_cv_stat_nsec], | ||
1630 | + [AC_TRY_COMPILE( | ||
1631 | + [ | ||
1632 | + #include <sys/types.h> | ||
1633 | + #include <sys/stat.h> | ||
1634 | + #include <unistd.h> | ||
1635 | + struct stat st; | ||
1636 | + ], | ||
1637 | + [ return st.st_atimensec + st.st_mtimensec + st.st_ctimensec; ], | ||
1638 | + [ac_cv_stat_nsec=yes], | ||
1639 | + [ac_cv_stat_nsec=no]) | ||
1640 | + ]) | ||
1641 | + if test $ac_cv_stat_nsec = yes; then | ||
1642 | + AC_DEFINE(HAVE_STAT_NSEC, 1, [Define to 1 if struct stat has nanosecond timestamps.]) | ||
1643 | + fi | ||
1644 | + | ||
1645 | + AC_CACHE_CHECK([for nanosecond timestamps in struct stat], | ||
1646 | + [ac_cv_stat_timeval], | ||
1647 | + [AC_TRY_COMPILE( | ||
1648 | + [ | ||
1649 | + #include <time.h> | ||
1650 | + #include <sys/types.h> | ||
1651 | + #include <sys/stat.h> | ||
1652 | + #include <unistd.h> | ||
1653 | + struct stat st; | ||
1654 | + ], | ||
1655 | + [ return st.st_atim.tv_nsec + st.st_mtim.tv_nsec + st.st_ctim.tv_nsec; ], | ||
1656 | + [ac_cv_stat_timeval=yes], | ||
1657 | + [ac_cv_stat_timeval=no]) | ||
1658 | + ]) | ||
1659 | + if test $ac_cv_stat_timeval = yes; then | ||
1660 | + AC_DEFINE(HAVE_STAT_TIMEVAL, 1, [Define to 1 if struct stat comtains struct timeval's.]) | ||
1661 | + fi]) | ||
1662 | + | ||
1663 | +#serial 7 -*- autoconf -*- | ||
1664 | + | ||
1665 | +dnl From Jim Meyering. | ||
1666 | +dnl | ||
1667 | +dnl See if the glibc *_unlocked I/O macros or functions are available. | ||
1668 | +dnl Use only those *_unlocked macros or functions that are declared | ||
1669 | +dnl (because some of them were declared in Solaris 2.5.1 but were removed | ||
1670 | +dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run | ||
1671 | +dnl on Solaris 2.6). | ||
1672 | + | ||
1673 | +AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], | ||
1674 | +[ | ||
1675 | + dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked() | ||
1676 | + dnl etc. | ||
1677 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
1678 | + | ||
1679 | + AC_CHECK_DECLS_ONCE( | ||
1680 | + [clearerr_unlocked feof_unlocked ferror_unlocked | ||
1681 | + fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked | ||
1682 | + fread_unlocked fwrite_unlocked getc_unlocked | ||
1683 | + getchar_unlocked putc_unlocked putchar_unlocked]) | ||
1684 | ]) | ||
1685 | |||
1686 | # Check for setmode, DOS style. | ||
1687 | @@ -488,180 +1562,39 @@ | ||
1688 | AC_DEFINE(HAVE_SETMODE_DOS, 1, | ||
1689 | [Define to 1 if you have the DOS-style `setmode' function.]) | ||
1690 | fi]) | ||
1691 | -# Check for stdbool.h that conforms to C99. | ||
1692 | - | ||
1693 | -# Copyright (C) 2002-2003 Free Software Foundation, Inc. | ||
1694 | - | ||
1695 | -# This program is free software; you can redistribute it and/or modify | ||
1696 | -# it under the terms of the GNU General Public License as published by | ||
1697 | -# the Free Software Foundation; either version 2, or (at your option) | ||
1698 | -# any later version. | ||
1699 | - | ||
1700 | -# This program is distributed in the hope that it will be useful, | ||
1701 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1702 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1703 | -# GNU General Public License for more details. | ||
1704 | - | ||
1705 | -# You should have received a copy of the GNU General Public License | ||
1706 | -# along with this program; if not, write to the Free Software | ||
1707 | -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
1708 | -# 02111-1307, USA. | ||
1709 | - | ||
1710 | -# Prepare for substituting <stdbool.h> if it is not supported. | ||
1711 | - | ||
1712 | -AC_DEFUN([AM_STDBOOL_H], | ||
1713 | -[ | ||
1714 | - AC_REQUIRE([AC_HEADER_STDBOOL]) | ||
1715 | - | ||
1716 | - # Define two additional variables used in the Makefile substitution. | ||
1717 | - | ||
1718 | - if test "$ac_cv_header_stdbool_h" = yes; then | ||
1719 | - STDBOOL_H='' | ||
1720 | - else | ||
1721 | - STDBOOL_H='stdbool.h' | ||
1722 | - fi | ||
1723 | - AC_SUBST([STDBOOL_H]) | ||
1724 | - | ||
1725 | - if test "$ac_cv_type__Bool" = yes; then | ||
1726 | - HAVE__BOOL=1 | ||
1727 | - else | ||
1728 | - HAVE__BOOL=0 | ||
1729 | - fi | ||
1730 | - AC_SUBST([HAVE__BOOL]) | ||
1731 | -]) | ||
1732 | - | ||
1733 | -# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf | ||
1734 | -# have this macro built-in. | ||
1735 | - | ||
1736 | -AC_DEFUN([AC_HEADER_STDBOOL], | ||
1737 | - [AC_CACHE_CHECK([for stdbool.h that conforms to C99], | ||
1738 | - [ac_cv_header_stdbool_h], | ||
1739 | - [AC_TRY_COMPILE( | ||
1740 | - [ | ||
1741 | - #include <stdbool.h> | ||
1742 | - #ifndef bool | ||
1743 | - "error: bool is not defined" | ||
1744 | - #endif | ||
1745 | - #ifndef false | ||
1746 | - "error: false is not defined" | ||
1747 | - #endif | ||
1748 | - #if false | ||
1749 | - "error: false is not 0" | ||
1750 | - #endif | ||
1751 | - #ifndef true | ||
1752 | - "error: false is not defined" | ||
1753 | - #endif | ||
1754 | - #if true != 1 | ||
1755 | - "error: true is not 1" | ||
1756 | - #endif | ||
1757 | - #ifndef __bool_true_false_are_defined | ||
1758 | - "error: __bool_true_false_are_defined is not defined" | ||
1759 | - #endif | ||
1760 | - | ||
1761 | - struct s { _Bool s: 1; _Bool t; } s; | ||
1762 | - | ||
1763 | - char a[true == 1 ? 1 : -1]; | ||
1764 | - char b[false == 0 ? 1 : -1]; | ||
1765 | - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; | ||
1766 | - char d[(bool) -0.5 == true ? 1 : -1]; | ||
1767 | - bool e = &s; | ||
1768 | - char f[(_Bool) -0.0 == false ? 1 : -1]; | ||
1769 | - char g[true]; | ||
1770 | - char h[sizeof (_Bool)]; | ||
1771 | - char i[sizeof s.t]; | ||
1772 | - ], | ||
1773 | - [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ], | ||
1774 | - [ac_cv_header_stdbool_h=yes], | ||
1775 | - [ac_cv_header_stdbool_h=no])]) | ||
1776 | - AC_CHECK_TYPES([_Bool]) | ||
1777 | - if test $ac_cv_header_stdbool_h = yes; then | ||
1778 | - AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) | ||
1779 | - fi]) | ||
1780 | -#serial 7 -*- autoconf -*- | ||
1781 | - | ||
1782 | -dnl From Jim Meyering. | ||
1783 | -dnl | ||
1784 | -dnl See if the glibc *_unlocked I/O macros or functions are available. | ||
1785 | -dnl Use only those *_unlocked macros or functions that are declared | ||
1786 | -dnl (because some of them were declared in Solaris 2.5.1 but were removed | ||
1787 | -dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run | ||
1788 | -dnl on Solaris 2.6). | ||
1789 | - | ||
1790 | -AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], | ||
1791 | -[ | ||
1792 | - dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked() | ||
1793 | - dnl etc. | ||
1794 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
1795 | - | ||
1796 | - AC_CHECK_DECLS_ONCE( | ||
1797 | - [clearerr_unlocked feof_unlocked ferror_unlocked | ||
1798 | - fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked | ||
1799 | - fread_unlocked fwrite_unlocked getc_unlocked | ||
1800 | - getchar_unlocked putc_unlocked putchar_unlocked]) | ||
1801 | -]) | ||
1802 | -#serial 5 | ||
1803 | - | ||
1804 | -dnl From Jim Meyering | ||
1805 | - | ||
1806 | -dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- | ||
1807 | -dnl usually in <utime.h>. | ||
1808 | -dnl Some systems have utime.h but don't declare the struct anywhere. | ||
1809 | - | ||
1810 | -AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF], | ||
1811 | -[ | ||
1812 | - AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) | ||
1813 | - AC_REQUIRE([AC_HEADER_TIME]) | ||
1814 | - AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, | ||
1815 | - [AC_TRY_COMPILE( | ||
1816 | - [ | ||
1817 | -#ifdef TIME_WITH_SYS_TIME | ||
1818 | -# include <sys/time.h> | ||
1819 | -# include <time.h> | ||
1820 | -#else | ||
1821 | -# ifdef HAVE_SYS_TIME_H | ||
1822 | -# include <sys/time.h> | ||
1823 | -# else | ||
1824 | -# include <time.h> | ||
1825 | -# endif | ||
1826 | -#endif | ||
1827 | -#ifdef HAVE_UTIME_H | ||
1828 | -# include <utime.h> | ||
1829 | -#endif | ||
1830 | - ], | ||
1831 | - [static struct utimbuf x; x.actime = x.modtime;], | ||
1832 | - fu_cv_sys_struct_utimbuf=yes, | ||
1833 | - fu_cv_sys_struct_utimbuf=no) | ||
1834 | - ]) | ||
1835 | |||
1836 | - if test $fu_cv_sys_struct_utimbuf = yes; then | ||
1837 | - AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, | ||
1838 | - [Define if struct utimbuf is declared -- usually in <utime.h>. | ||
1839 | - Some systems have utime.h but don't declare the struct anywhere. ]) | ||
1840 | - fi | ||
1841 | -]) | ||
1842 | -# xalloc.m4 serial 1 | ||
1843 | -dnl Copyright (C) 2002 Free Software Foundation, Inc. | ||
1844 | -dnl This file is free software, distributed under the terms of the GNU | ||
1845 | -dnl General Public License. As a special exception to the GNU General | ||
1846 | -dnl Public License, this file may be distributed as part of a program | ||
1847 | -dnl that contains a configuration script generated by Autoconf, under | ||
1848 | -dnl the same distribution terms as the rest of that program. | ||
1849 | +#serial 1 | ||
1850 | |||
1851 | -AC_DEFUN([gl_XALLOC], | ||
1852 | -[ | ||
1853 | - gl_PREREQ_XMALLOC | ||
1854 | - gl_PREREQ_XSTRDUP | ||
1855 | -]) | ||
1856 | +dnl From Mumit Khan and Paul Eggert | ||
1857 | +dnl Determine whether mkdir accepts only one argument instead of the usual two. | ||
1858 | |||
1859 | -# Prerequisites of lib/xmalloc.c. | ||
1860 | -AC_DEFUN([gl_PREREQ_XMALLOC], [ | ||
1861 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1862 | - AC_REQUIRE([jm_FUNC_MALLOC]) | ||
1863 | - AC_REQUIRE([jm_FUNC_REALLOC]) | ||
1864 | -]) | ||
1865 | +AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG], | ||
1866 | + [AC_CHECK_FUNCS(mkdir) | ||
1867 | + AC_CACHE_CHECK([whether mkdir takes only one argument], | ||
1868 | + patch_cv_mkdir_takes_one_arg, | ||
1869 | + [patch_cv_mkdir_takes_one_arg=no | ||
1870 | + if test $ac_cv_func_mkdir = yes; then | ||
1871 | + AC_TRY_COMPILE([ | ||
1872 | +#include <sys/types.h> | ||
1873 | +#include <sys/stat.h> | ||
1874 | + ], | ||
1875 | + [mkdir (".", 0);], | ||
1876 | + , | ||
1877 | + [AC_TRY_COMPILE([ | ||
1878 | +#include <sys/types.h> | ||
1879 | +#include <sys/stat.h> | ||
1880 | + ], | ||
1881 | + [mkdir (".");], | ||
1882 | + patch_cv_mkdir_takes_one_arg=yes | ||
1883 | + )] | ||
1884 | + ) | ||
1885 | + fi | ||
1886 | + ] | ||
1887 | + ) | ||
1888 | + if test $patch_cv_mkdir_takes_one_arg = yes; then | ||
1889 | + AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, | ||
1890 | + [Define if mkdir takes only one argument.]) | ||
1891 | + fi | ||
1892 | + ] | ||
1893 | +) | ||
1894 | |||
1895 | -# Prerequisites of lib/xstrdup.c. | ||
1896 | -AC_DEFUN([gl_PREREQ_XSTRDUP], [ | ||
1897 | - AC_REQUIRE([AC_HEADER_STDC]) | ||
1898 | - AC_CHECK_HEADERS_ONCE(string.h) | ||
1899 | -]) | ||
1900 | --- patch-2.5.9.orig/configure | ||
1901 | +++ patch-2.5.9/configure | ||
1902 | @@ -1,11 +1,10 @@ | ||
1903 | #! /bin/sh | ||
1904 | # Guess values for system-dependent variables and create Makefiles. | ||
1905 | -# Generated by GNU Autoconf 2.57 for patch 2.5.9. | ||
1906 | +# Generated by GNU Autoconf 2.59 for patch 2.5.9. | ||
1907 | # | ||
1908 | # Report bugs to <bug-patch@gnu.org>. | ||
1909 | # | ||
1910 | -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
1911 | -# Free Software Foundation, Inc. | ||
1912 | +# Copyright (C) 2003 Free Software Foundation, Inc. | ||
1913 | # This configure script is free software; the Free Software Foundation | ||
1914 | # gives unlimited permission to copy, distribute and modify it. | ||
1915 | ## --------------------- ## | ||
1916 | @@ -22,9 +21,10 @@ | ||
1917 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
1918 | set -o posix | ||
1919 | fi | ||
1920 | +DUALCASE=1; export DUALCASE # for MKS sh | ||
1921 | |||
1922 | # Support unset when possible. | ||
1923 | -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
1924 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
1925 | as_unset=unset | ||
1926 | else | ||
1927 | as_unset=false | ||
1928 | @@ -43,7 +43,7 @@ | ||
1929 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
1930 | LC_TELEPHONE LC_TIME | ||
1931 | do | ||
1932 | - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
1933 | + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
1934 | eval $as_var=C; export $as_var | ||
1935 | else | ||
1936 | $as_unset $as_var | ||
1937 | @@ -220,16 +220,17 @@ | ||
1938 | if mkdir -p . 2>/dev/null; then | ||
1939 | as_mkdir_p=: | ||
1940 | else | ||
1941 | + test -d ./-p && rmdir ./-p | ||
1942 | as_mkdir_p=false | ||
1943 | fi | ||
1944 | |||
1945 | as_executable_p="test -f" | ||
1946 | |||
1947 | # Sed expression to map a string onto a valid CPP name. | ||
1948 | -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
1949 | +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
1950 | |||
1951 | # Sed expression to map a string onto a valid variable name. | ||
1952 | -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | ||
1953 | +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
1954 | |||
1955 | |||
1956 | # IFS | ||
1957 | @@ -669,7 +670,7 @@ | ||
1958 | |||
1959 | # Be sure to have absolute paths. | ||
1960 | for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | ||
1961 | - localstatedir libdir includedir oldincludedir infodir mandir | ||
1962 | + localstatedir libdir includedir oldincludedir infodir mandir | ||
1963 | do | ||
1964 | eval ac_val=$`echo $ac_var` | ||
1965 | case $ac_val in | ||
1966 | @@ -709,10 +710,10 @@ | ||
1967 | # Try the directory containing this script, then its parent. | ||
1968 | ac_confdir=`(dirname "$0") 2>/dev/null || | ||
1969 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
1970 | - X"$0" : 'X\(//\)[^/]' \| \ | ||
1971 | - X"$0" : 'X\(//\)$' \| \ | ||
1972 | - X"$0" : 'X\(/\)' \| \ | ||
1973 | - . : '\(.\)' 2>/dev/null || | ||
1974 | + X"$0" : 'X\(//\)[^/]' \| \ | ||
1975 | + X"$0" : 'X\(//\)$' \| \ | ||
1976 | + X"$0" : 'X\(/\)' \| \ | ||
1977 | + . : '\(.\)' 2>/dev/null || | ||
1978 | echo X"$0" | | ||
1979 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
1980 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
1981 | @@ -804,9 +805,9 @@ | ||
1982 | cat <<_ACEOF | ||
1983 | Installation directories: | ||
1984 | --prefix=PREFIX install architecture-independent files in PREFIX | ||
1985 | - [$ac_default_prefix] | ||
1986 | + [$ac_default_prefix] | ||
1987 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | ||
1988 | - [PREFIX] | ||
1989 | + [PREFIX] | ||
1990 | |||
1991 | By default, \`make install' will install all the files in | ||
1992 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | ||
1993 | @@ -896,12 +897,45 @@ | ||
1994 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
1995 | ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
1996 | esac | ||
1997 | -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be | ||
1998 | -# absolute. | ||
1999 | -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` | ||
2000 | -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` | ||
2001 | -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` | ||
2002 | -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` | ||
2003 | + | ||
2004 | +# Do not use `cd foo && pwd` to compute absolute paths, because | ||
2005 | +# the directories may not exist. | ||
2006 | +case `pwd` in | ||
2007 | +.) ac_abs_builddir="$ac_dir";; | ||
2008 | +*) | ||
2009 | + case "$ac_dir" in | ||
2010 | + .) ac_abs_builddir=`pwd`;; | ||
2011 | + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
2012 | + *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
2013 | + esac;; | ||
2014 | +esac | ||
2015 | +case $ac_abs_builddir in | ||
2016 | +.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
2017 | +*) | ||
2018 | + case ${ac_top_builddir}. in | ||
2019 | + .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
2020 | + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
2021 | + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
2022 | + esac;; | ||
2023 | +esac | ||
2024 | +case $ac_abs_builddir in | ||
2025 | +.) ac_abs_srcdir=$ac_srcdir;; | ||
2026 | +*) | ||
2027 | + case $ac_srcdir in | ||
2028 | + .) ac_abs_srcdir=$ac_abs_builddir;; | ||
2029 | + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
2030 | + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
2031 | + esac;; | ||
2032 | +esac | ||
2033 | +case $ac_abs_builddir in | ||
2034 | +.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
2035 | +*) | ||
2036 | + case $ac_top_srcdir in | ||
2037 | + .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
2038 | + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
2039 | + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
2040 | + esac;; | ||
2041 | +esac | ||
2042 | |||
2043 | cd $ac_dir | ||
2044 | # Check for guested configure; otherwise get Cygnus style configure. | ||
2045 | @@ -912,13 +946,13 @@ | ||
2046 | echo | ||
2047 | $SHELL $ac_srcdir/configure --help=recursive | ||
2048 | elif test -f $ac_srcdir/configure.ac || | ||
2049 | - test -f $ac_srcdir/configure.in; then | ||
2050 | + test -f $ac_srcdir/configure.in; then | ||
2051 | echo | ||
2052 | $ac_configure --help | ||
2053 | else | ||
2054 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | ||
2055 | fi | ||
2056 | - cd $ac_popdir | ||
2057 | + cd "$ac_popdir" | ||
2058 | done | ||
2059 | fi | ||
2060 | |||
2061 | @@ -926,10 +960,9 @@ | ||
2062 | if $ac_init_version; then | ||
2063 | cat <<\_ACEOF | ||
2064 | patch configure 2.5.9 | ||
2065 | -generated by GNU Autoconf 2.57 | ||
2066 | +generated by GNU Autoconf 2.59 | ||
2067 | |||
2068 | -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
2069 | -Free Software Foundation, Inc. | ||
2070 | +Copyright (C) 2003 Free Software Foundation, Inc. | ||
2071 | This configure script is free software; the Free Software Foundation | ||
2072 | gives unlimited permission to copy, distribute and modify it. | ||
2073 | _ACEOF | ||
2074 | @@ -941,7 +974,7 @@ | ||
2075 | running configure, to aid debugging if configure makes a mistake. | ||
2076 | |||
2077 | It was created by patch $as_me 2.5.9, which was | ||
2078 | -generated by GNU Autoconf 2.57. Invocation command line was | ||
2079 | +generated by GNU Autoconf 2.59. Invocation command line was | ||
2080 | |||
2081 | $ $0 $@ | ||
2082 | |||
2083 | @@ -1018,19 +1051,19 @@ | ||
2084 | 2) | ||
2085 | ac_configure_args1="$ac_configure_args1 '$ac_arg'" | ||
2086 | if test $ac_must_keep_next = true; then | ||
2087 | - ac_must_keep_next=false # Got value, back to normal. | ||
2088 | + ac_must_keep_next=false # Got value, back to normal. | ||
2089 | else | ||
2090 | - case $ac_arg in | ||
2091 | - *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
2092 | - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
2093 | - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
2094 | - | -with-* | --with-* | -without-* | --without-* | --x) | ||
2095 | - case "$ac_configure_args0 " in | ||
2096 | - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
2097 | - esac | ||
2098 | - ;; | ||
2099 | - -* ) ac_must_keep_next=true ;; | ||
2100 | - esac | ||
2101 | + case $ac_arg in | ||
2102 | + *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
2103 | + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
2104 | + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
2105 | + | -with-* | --with-* | -without-* | --without-* | --x) | ||
2106 | + case "$ac_configure_args0 " in | ||
2107 | + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
2108 | + esac | ||
2109 | + ;; | ||
2110 | + -* ) ac_must_keep_next=true ;; | ||
2111 | + esac | ||
2112 | fi | ||
2113 | ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | ||
2114 | # Get rid of the leading space. | ||
2115 | @@ -1064,12 +1097,12 @@ | ||
2116 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in | ||
2117 | *ac_space=\ *) | ||
2118 | sed -n \ | ||
2119 | - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
2120 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
2121 | + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
2122 | + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
2123 | ;; | ||
2124 | *) | ||
2125 | sed -n \ | ||
2126 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
2127 | + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
2128 | ;; | ||
2129 | esac; | ||
2130 | } | ||
2131 | @@ -1098,7 +1131,7 @@ | ||
2132 | for ac_var in $ac_subst_files | ||
2133 | do | ||
2134 | eval ac_val=$`echo $ac_var` | ||
2135 | - echo "$ac_var='"'"'$ac_val'"'"'" | ||
2136 | + echo "$ac_var='"'"'$ac_val'"'"'" | ||
2137 | done | sort | ||
2138 | echo | ||
2139 | fi | ||
2140 | @@ -1117,7 +1150,7 @@ | ||
2141 | echo "$as_me: caught signal $ac_signal" | ||
2142 | echo "$as_me: exit $exit_status" | ||
2143 | } >&5 | ||
2144 | - rm -f core core.* *.core && | ||
2145 | + rm -f core *.core && | ||
2146 | rm -rf conftest* confdefs* conf$$* $ac_clean_files && | ||
2147 | exit $exit_status | ||
2148 | ' 0 | ||
2149 | @@ -1197,7 +1230,7 @@ | ||
2150 | # value. | ||
2151 | ac_cache_corrupted=false | ||
2152 | for ac_var in `(set) 2>&1 | | ||
2153 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
2154 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
2155 | eval ac_old_set=\$ac_cv_env_${ac_var}_set | ||
2156 | eval ac_new_set=\$ac_env_${ac_var}_set | ||
2157 | eval ac_old_val="\$ac_cv_env_${ac_var}_value" | ||
2158 | @@ -1214,13 +1247,13 @@ | ||
2159 | ,);; | ||
2160 | *) | ||
2161 | if test "x$ac_old_val" != "x$ac_new_val"; then | ||
2162 | - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2163 | + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2164 | echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
2165 | - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
2166 | + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
2167 | echo "$as_me: former value: $ac_old_val" >&2;} | ||
2168 | - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
2169 | + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
2170 | echo "$as_me: current value: $ac_new_val" >&2;} | ||
2171 | - ac_cache_corrupted=: | ||
2172 | + ac_cache_corrupted=: | ||
2173 | fi;; | ||
2174 | esac | ||
2175 | # Pass precious variables to config.status. | ||
2176 | @@ -1629,7 +1662,6 @@ | ||
2177 | (exit $ac_status); } | ||
2178 | |||
2179 | cat >conftest.$ac_ext <<_ACEOF | ||
2180 | -#line $LINENO "configure" | ||
2181 | /* confdefs.h. */ | ||
2182 | _ACEOF | ||
2183 | cat confdefs.h >>conftest.$ac_ext | ||
2184 | @@ -1649,8 +1681,8 @@ | ||
2185 | # Try to create an executable without -o first, disregard a.out. | ||
2186 | # It will help us diagnose broken compilers, and finding out an intuition | ||
2187 | # of exeext. | ||
2188 | -echo "$as_me:$LINENO: checking for C compiler default output" >&5 | ||
2189 | -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 | ||
2190 | +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | ||
2191 | +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 | ||
2192 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
2193 | if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 | ||
2194 | (eval $ac_link_default) 2>&5 | ||
2195 | @@ -1670,23 +1702,23 @@ | ||
2196 | test -f "$ac_file" || continue | ||
2197 | case $ac_file in | ||
2198 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) | ||
2199 | - ;; | ||
2200 | + ;; | ||
2201 | conftest.$ac_ext ) | ||
2202 | - # This is the source file. | ||
2203 | - ;; | ||
2204 | + # This is the source file. | ||
2205 | + ;; | ||
2206 | [ab].out ) | ||
2207 | - # We found the default executable, but exeext='' is most | ||
2208 | - # certainly right. | ||
2209 | - break;; | ||
2210 | + # We found the default executable, but exeext='' is most | ||
2211 | + # certainly right. | ||
2212 | + break;; | ||
2213 | *.* ) | ||
2214 | - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2215 | - # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
2216 | - # but it would be cool to find out if it's true. Does anybody | ||
2217 | - # maintain Libtool? --akim. | ||
2218 | - export ac_cv_exeext | ||
2219 | - break;; | ||
2220 | + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2221 | + # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
2222 | + # but it would be cool to find out if it's true. Does anybody | ||
2223 | + # maintain Libtool? --akim. | ||
2224 | + export ac_cv_exeext | ||
2225 | + break;; | ||
2226 | * ) | ||
2227 | - break;; | ||
2228 | + break;; | ||
2229 | esac | ||
2230 | done | ||
2231 | else | ||
2232 | @@ -1760,8 +1792,8 @@ | ||
2233 | case $ac_file in | ||
2234 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; | ||
2235 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2236 | - export ac_cv_exeext | ||
2237 | - break;; | ||
2238 | + export ac_cv_exeext | ||
2239 | + break;; | ||
2240 | * ) break;; | ||
2241 | esac | ||
2242 | done | ||
2243 | @@ -1786,7 +1818,6 @@ | ||
2244 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2245 | else | ||
2246 | cat >conftest.$ac_ext <<_ACEOF | ||
2247 | -#line $LINENO "configure" | ||
2248 | /* confdefs.h. */ | ||
2249 | _ACEOF | ||
2250 | cat confdefs.h >>conftest.$ac_ext | ||
2251 | @@ -1837,7 +1868,6 @@ | ||
2252 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2253 | else | ||
2254 | cat >conftest.$ac_ext <<_ACEOF | ||
2255 | -#line $LINENO "configure" | ||
2256 | /* confdefs.h. */ | ||
2257 | _ACEOF | ||
2258 | cat confdefs.h >>conftest.$ac_ext | ||
2259 | @@ -1857,11 +1887,20 @@ | ||
2260 | _ACEOF | ||
2261 | rm -f conftest.$ac_objext | ||
2262 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2263 | - (eval $ac_compile) 2>&5 | ||
2264 | + (eval $ac_compile) 2>conftest.er1 | ||
2265 | ac_status=$? | ||
2266 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2267 | + rm -f conftest.er1 | ||
2268 | + cat conftest.err >&5 | ||
2269 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2270 | (exit $ac_status); } && | ||
2271 | - { ac_try='test -s conftest.$ac_objext' | ||
2272 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2273 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2274 | + (eval $ac_try) 2>&5 | ||
2275 | + ac_status=$? | ||
2276 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2277 | + (exit $ac_status); }; } && | ||
2278 | + { ac_try='test -s conftest.$ac_objext' | ||
2279 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2280 | (eval $ac_try) 2>&5 | ||
2281 | ac_status=$? | ||
2282 | @@ -1874,7 +1913,7 @@ | ||
2283 | |||
2284 | ac_compiler_gnu=no | ||
2285 | fi | ||
2286 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2287 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2288 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
2289 | |||
2290 | fi | ||
2291 | @@ -1890,7 +1929,6 @@ | ||
2292 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2293 | else | ||
2294 | cat >conftest.$ac_ext <<_ACEOF | ||
2295 | -#line $LINENO "configure" | ||
2296 | /* confdefs.h. */ | ||
2297 | _ACEOF | ||
2298 | cat confdefs.h >>conftest.$ac_ext | ||
2299 | @@ -1907,11 +1945,20 @@ | ||
2300 | _ACEOF | ||
2301 | rm -f conftest.$ac_objext | ||
2302 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2303 | - (eval $ac_compile) 2>&5 | ||
2304 | + (eval $ac_compile) 2>conftest.er1 | ||
2305 | ac_status=$? | ||
2306 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2307 | + rm -f conftest.er1 | ||
2308 | + cat conftest.err >&5 | ||
2309 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2310 | (exit $ac_status); } && | ||
2311 | - { ac_try='test -s conftest.$ac_objext' | ||
2312 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2313 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2314 | + (eval $ac_try) 2>&5 | ||
2315 | + ac_status=$? | ||
2316 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2317 | + (exit $ac_status); }; } && | ||
2318 | + { ac_try='test -s conftest.$ac_objext' | ||
2319 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2320 | (eval $ac_try) 2>&5 | ||
2321 | ac_status=$? | ||
2322 | @@ -1924,7 +1971,7 @@ | ||
2323 | |||
2324 | ac_cv_prog_cc_g=no | ||
2325 | fi | ||
2326 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2327 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2328 | fi | ||
2329 | echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
2330 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | ||
2331 | @@ -1951,7 +1998,6 @@ | ||
2332 | ac_cv_prog_cc_stdc=no | ||
2333 | ac_save_CC=$CC | ||
2334 | cat >conftest.$ac_ext <<_ACEOF | ||
2335 | -#line $LINENO "configure" | ||
2336 | /* confdefs.h. */ | ||
2337 | _ACEOF | ||
2338 | cat confdefs.h >>conftest.$ac_ext | ||
2339 | @@ -1979,6 +2025,16 @@ | ||
2340 | va_end (v); | ||
2341 | return s; | ||
2342 | } | ||
2343 | + | ||
2344 | +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | ||
2345 | + function prototypes and stuff, but not '\xHH' hex character constants. | ||
2346 | + These don't provoke an error unfortunately, instead are silently treated | ||
2347 | + as 'x'. The following induces an error, until -std1 is added to get | ||
2348 | + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | ||
2349 | + array size at least. It's necessary to write '\x00'==0 to get something | ||
2350 | + that's true only with -std1. */ | ||
2351 | +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | ||
2352 | + | ||
2353 | int test (int i, double x); | ||
2354 | struct s1 {int (*f) (int a);}; | ||
2355 | struct s2 {int (*f) (double a);}; | ||
2356 | @@ -2005,11 +2061,20 @@ | ||
2357 | CC="$ac_save_CC $ac_arg" | ||
2358 | rm -f conftest.$ac_objext | ||
2359 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2360 | - (eval $ac_compile) 2>&5 | ||
2361 | + (eval $ac_compile) 2>conftest.er1 | ||
2362 | ac_status=$? | ||
2363 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2364 | + rm -f conftest.er1 | ||
2365 | + cat conftest.err >&5 | ||
2366 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2367 | (exit $ac_status); } && | ||
2368 | - { ac_try='test -s conftest.$ac_objext' | ||
2369 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2370 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2371 | + (eval $ac_try) 2>&5 | ||
2372 | + ac_status=$? | ||
2373 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2374 | + (exit $ac_status); }; } && | ||
2375 | + { ac_try='test -s conftest.$ac_objext' | ||
2376 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2377 | (eval $ac_try) 2>&5 | ||
2378 | ac_status=$? | ||
2379 | @@ -2022,7 +2087,7 @@ | ||
2380 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2381 | |||
2382 | fi | ||
2383 | -rm -f conftest.$ac_objext | ||
2384 | +rm -f conftest.err conftest.$ac_objext | ||
2385 | done | ||
2386 | rm -f conftest.$ac_ext conftest.$ac_objext | ||
2387 | CC=$ac_save_CC | ||
2388 | @@ -2050,19 +2115,27 @@ | ||
2389 | _ACEOF | ||
2390 | rm -f conftest.$ac_objext | ||
2391 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2392 | - (eval $ac_compile) 2>&5 | ||
2393 | + (eval $ac_compile) 2>conftest.er1 | ||
2394 | ac_status=$? | ||
2395 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2396 | + rm -f conftest.er1 | ||
2397 | + cat conftest.err >&5 | ||
2398 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2399 | (exit $ac_status); } && | ||
2400 | - { ac_try='test -s conftest.$ac_objext' | ||
2401 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2402 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2403 | + (eval $ac_try) 2>&5 | ||
2404 | + ac_status=$? | ||
2405 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2406 | + (exit $ac_status); }; } && | ||
2407 | + { ac_try='test -s conftest.$ac_objext' | ||
2408 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2409 | (eval $ac_try) 2>&5 | ||
2410 | ac_status=$? | ||
2411 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2412 | (exit $ac_status); }; }; then | ||
2413 | for ac_declaration in \ | ||
2414 | - ''\ | ||
2415 | - '#include <stdlib.h>' \ | ||
2416 | + '' \ | ||
2417 | 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
2418 | 'extern "C" void std::exit (int); using std::exit;' \ | ||
2419 | 'extern "C" void exit (int) throw ();' \ | ||
2420 | @@ -2070,14 +2143,13 @@ | ||
2421 | 'void exit (int);' | ||
2422 | do | ||
2423 | cat >conftest.$ac_ext <<_ACEOF | ||
2424 | -#line $LINENO "configure" | ||
2425 | /* confdefs.h. */ | ||
2426 | _ACEOF | ||
2427 | cat confdefs.h >>conftest.$ac_ext | ||
2428 | cat >>conftest.$ac_ext <<_ACEOF | ||
2429 | /* end confdefs.h. */ | ||
2430 | -#include <stdlib.h> | ||
2431 | $ac_declaration | ||
2432 | +#include <stdlib.h> | ||
2433 | int | ||
2434 | main () | ||
2435 | { | ||
2436 | @@ -2088,11 +2160,20 @@ | ||
2437 | _ACEOF | ||
2438 | rm -f conftest.$ac_objext | ||
2439 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2440 | - (eval $ac_compile) 2>&5 | ||
2441 | + (eval $ac_compile) 2>conftest.er1 | ||
2442 | ac_status=$? | ||
2443 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2444 | + rm -f conftest.er1 | ||
2445 | + cat conftest.err >&5 | ||
2446 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2447 | (exit $ac_status); } && | ||
2448 | - { ac_try='test -s conftest.$ac_objext' | ||
2449 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2450 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2451 | + (eval $ac_try) 2>&5 | ||
2452 | + ac_status=$? | ||
2453 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2454 | + (exit $ac_status); }; } && | ||
2455 | + { ac_try='test -s conftest.$ac_objext' | ||
2456 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2457 | (eval $ac_try) 2>&5 | ||
2458 | ac_status=$? | ||
2459 | @@ -2105,9 +2186,8 @@ | ||
2460 | |||
2461 | continue | ||
2462 | fi | ||
2463 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2464 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2465 | cat >conftest.$ac_ext <<_ACEOF | ||
2466 | -#line $LINENO "configure" | ||
2467 | /* confdefs.h. */ | ||
2468 | _ACEOF | ||
2469 | cat confdefs.h >>conftest.$ac_ext | ||
2470 | @@ -2124,11 +2204,20 @@ | ||
2471 | _ACEOF | ||
2472 | rm -f conftest.$ac_objext | ||
2473 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2474 | - (eval $ac_compile) 2>&5 | ||
2475 | + (eval $ac_compile) 2>conftest.er1 | ||
2476 | ac_status=$? | ||
2477 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2478 | + rm -f conftest.er1 | ||
2479 | + cat conftest.err >&5 | ||
2480 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2481 | (exit $ac_status); } && | ||
2482 | - { ac_try='test -s conftest.$ac_objext' | ||
2483 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2484 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2485 | + (eval $ac_try) 2>&5 | ||
2486 | + ac_status=$? | ||
2487 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2488 | + (exit $ac_status); }; } && | ||
2489 | + { ac_try='test -s conftest.$ac_objext' | ||
2490 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2491 | (eval $ac_try) 2>&5 | ||
2492 | ac_status=$? | ||
2493 | @@ -2140,7 +2229,7 @@ | ||
2494 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2495 | |||
2496 | fi | ||
2497 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2498 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2499 | done | ||
2500 | rm -f conftest* | ||
2501 | if test -n "$ac_declaration"; then | ||
2502 | @@ -2154,7 +2243,7 @@ | ||
2503 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2504 | |||
2505 | fi | ||
2506 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2507 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2508 | ac_ext=c | ||
2509 | ac_cpp='$CPP $CPPFLAGS' | ||
2510 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
2511 | @@ -2189,7 +2278,6 @@ | ||
2512 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
2513 | # not just through cpp. "Syntax error" is here to catch this case. | ||
2514 | cat >conftest.$ac_ext <<_ACEOF | ||
2515 | -#line $LINENO "configure" | ||
2516 | /* confdefs.h. */ | ||
2517 | _ACEOF | ||
2518 | cat confdefs.h >>conftest.$ac_ext | ||
2519 | @@ -2200,7 +2288,7 @@ | ||
2520 | #else | ||
2521 | # include <assert.h> | ||
2522 | #endif | ||
2523 | - Syntax error | ||
2524 | + Syntax error | ||
2525 | _ACEOF | ||
2526 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2527 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
2528 | @@ -2212,6 +2300,7 @@ | ||
2529 | (exit $ac_status); } >/dev/null; then | ||
2530 | if test -s conftest.err; then | ||
2531 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2532 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2533 | else | ||
2534 | ac_cpp_err= | ||
2535 | fi | ||
2536 | @@ -2232,7 +2321,6 @@ | ||
2537 | # OK, works on sane cases. Now check whether non-existent headers | ||
2538 | # can be detected and how. | ||
2539 | cat >conftest.$ac_ext <<_ACEOF | ||
2540 | -#line $LINENO "configure" | ||
2541 | /* confdefs.h. */ | ||
2542 | _ACEOF | ||
2543 | cat confdefs.h >>conftest.$ac_ext | ||
2544 | @@ -2250,6 +2338,7 @@ | ||
2545 | (exit $ac_status); } >/dev/null; then | ||
2546 | if test -s conftest.err; then | ||
2547 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2548 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2549 | else | ||
2550 | ac_cpp_err= | ||
2551 | fi | ||
2552 | @@ -2296,7 +2385,6 @@ | ||
2553 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
2554 | # not just through cpp. "Syntax error" is here to catch this case. | ||
2555 | cat >conftest.$ac_ext <<_ACEOF | ||
2556 | -#line $LINENO "configure" | ||
2557 | /* confdefs.h. */ | ||
2558 | _ACEOF | ||
2559 | cat confdefs.h >>conftest.$ac_ext | ||
2560 | @@ -2307,7 +2395,7 @@ | ||
2561 | #else | ||
2562 | # include <assert.h> | ||
2563 | #endif | ||
2564 | - Syntax error | ||
2565 | + Syntax error | ||
2566 | _ACEOF | ||
2567 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2568 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
2569 | @@ -2319,6 +2407,7 @@ | ||
2570 | (exit $ac_status); } >/dev/null; then | ||
2571 | if test -s conftest.err; then | ||
2572 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2573 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2574 | else | ||
2575 | ac_cpp_err= | ||
2576 | fi | ||
2577 | @@ -2339,7 +2428,6 @@ | ||
2578 | # OK, works on sane cases. Now check whether non-existent headers | ||
2579 | # can be detected and how. | ||
2580 | cat >conftest.$ac_ext <<_ACEOF | ||
2581 | -#line $LINENO "configure" | ||
2582 | /* confdefs.h. */ | ||
2583 | _ACEOF | ||
2584 | cat confdefs.h >>conftest.$ac_ext | ||
2585 | @@ -2357,6 +2445,7 @@ | ||
2586 | (exit $ac_status); } >/dev/null; then | ||
2587 | if test -s conftest.err; then | ||
2588 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2589 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2590 | else | ||
2591 | ac_cpp_err= | ||
2592 | fi | ||
2593 | @@ -2431,6 +2520,7 @@ | ||
2594 | # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag | ||
2595 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
2596 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
2597 | +# OS/2's system install, which has a completely different semantic | ||
2598 | # ./install, which can be erroneously created by make from ./install.sh. | ||
2599 | echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
2600 | echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 | ||
2601 | @@ -2447,6 +2537,7 @@ | ||
2602 | case $as_dir/ in | ||
2603 | ./ | .// | /cC/* | \ | ||
2604 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | ||
2605 | + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ | ||
2606 | /usr/ucb/* ) ;; | ||
2607 | *) | ||
2608 | # OSF1 and SCO ODT 3.0 have their own names for install. | ||
2609 | @@ -2454,20 +2545,20 @@ | ||
2610 | # by default. | ||
2611 | for ac_prog in ginstall scoinst install; do | ||
2612 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2613 | - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2614 | - if test $ac_prog = install && | ||
2615 | - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2616 | - # AIX install. It has an incompatible calling convention. | ||
2617 | - : | ||
2618 | - elif test $ac_prog = install && | ||
2619 | - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2620 | - # program-specific install script used by HP pwplus--don't use. | ||
2621 | - : | ||
2622 | - else | ||
2623 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2624 | - break 3 | ||
2625 | - fi | ||
2626 | - fi | ||
2627 | + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2628 | + if test $ac_prog = install && | ||
2629 | + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2630 | + # AIX install. It has an incompatible calling convention. | ||
2631 | + : | ||
2632 | + elif test $ac_prog = install && | ||
2633 | + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2634 | + # program-specific install script used by HP pwplus--don't use. | ||
2635 | + : | ||
2636 | + else | ||
2637 | + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2638 | + break 3 | ||
2639 | + fi | ||
2640 | + fi | ||
2641 | done | ||
2642 | done | ||
2643 | ;; | ||
2644 | @@ -2499,7 +2590,7 @@ | ||
2645 | |||
2646 | echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
2647 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | ||
2648 | -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | ||
2649 | +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` | ||
2650 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | ||
2651 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2652 | else | ||
2653 | @@ -2596,7 +2687,6 @@ | ||
2654 | echo "$as_me:$LINENO: checking for AIX" >&5 | ||
2655 | echo $ECHO_N "checking for AIX... $ECHO_C" >&6 | ||
2656 | cat >conftest.$ac_ext <<_ACEOF | ||
2657 | -#line $LINENO "configure" | ||
2658 | /* confdefs.h. */ | ||
2659 | _ACEOF | ||
2660 | cat confdefs.h >>conftest.$ac_ext | ||
2661 | @@ -2628,7 +2718,6 @@ | ||
2662 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2663 | else | ||
2664 | cat >conftest.$ac_ext <<_ACEOF | ||
2665 | -#line $LINENO "configure" | ||
2666 | /* confdefs.h. */ | ||
2667 | _ACEOF | ||
2668 | cat confdefs.h >>conftest.$ac_ext | ||
2669 | @@ -2649,11 +2738,20 @@ | ||
2670 | _ACEOF | ||
2671 | rm -f conftest.$ac_objext | ||
2672 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2673 | - (eval $ac_compile) 2>&5 | ||
2674 | + (eval $ac_compile) 2>conftest.er1 | ||
2675 | ac_status=$? | ||
2676 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2677 | + rm -f conftest.er1 | ||
2678 | + cat conftest.err >&5 | ||
2679 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2680 | (exit $ac_status); } && | ||
2681 | - { ac_try='test -s conftest.$ac_objext' | ||
2682 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2683 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2684 | + (eval $ac_try) 2>&5 | ||
2685 | + ac_status=$? | ||
2686 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2687 | + (exit $ac_status); }; } && | ||
2688 | + { ac_try='test -s conftest.$ac_objext' | ||
2689 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2690 | (eval $ac_try) 2>&5 | ||
2691 | ac_status=$? | ||
2692 | @@ -2666,12 +2764,11 @@ | ||
2693 | |||
2694 | ac_cv_header_stdc=no | ||
2695 | fi | ||
2696 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2697 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2698 | |||
2699 | if test $ac_cv_header_stdc = yes; then | ||
2700 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
2701 | cat >conftest.$ac_ext <<_ACEOF | ||
2702 | -#line $LINENO "configure" | ||
2703 | /* confdefs.h. */ | ||
2704 | _ACEOF | ||
2705 | cat confdefs.h >>conftest.$ac_ext | ||
2706 | @@ -2693,7 +2790,6 @@ | ||
2707 | if test $ac_cv_header_stdc = yes; then | ||
2708 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
2709 | cat >conftest.$ac_ext <<_ACEOF | ||
2710 | -#line $LINENO "configure" | ||
2711 | /* confdefs.h. */ | ||
2712 | _ACEOF | ||
2713 | cat confdefs.h >>conftest.$ac_ext | ||
2714 | @@ -2718,7 +2814,6 @@ | ||
2715 | : | ||
2716 | else | ||
2717 | cat >conftest.$ac_ext <<_ACEOF | ||
2718 | -#line $LINENO "configure" | ||
2719 | /* confdefs.h. */ | ||
2720 | _ACEOF | ||
2721 | cat confdefs.h >>conftest.$ac_ext | ||
2722 | @@ -2730,9 +2825,9 @@ | ||
2723 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
2724 | #else | ||
2725 | # define ISLOWER(c) \ | ||
2726 | - (('a' <= (c) && (c) <= 'i') \ | ||
2727 | - || ('j' <= (c) && (c) <= 'r') \ | ||
2728 | - || ('s' <= (c) && (c) <= 'z')) | ||
2729 | + (('a' <= (c) && (c) <= 'i') \ | ||
2730 | + || ('j' <= (c) && (c) <= 'r') \ | ||
2731 | + || ('s' <= (c) && (c) <= 'z')) | ||
2732 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
2733 | #endif | ||
2734 | |||
2735 | @@ -2743,7 +2838,7 @@ | ||
2736 | int i; | ||
2737 | for (i = 0; i < 256; i++) | ||
2738 | if (XOR (islower (i), ISLOWER (i)) | ||
2739 | - || toupper (i) != TOUPPER (i)) | ||
2740 | + || toupper (i) != TOUPPER (i)) | ||
2741 | exit(2); | ||
2742 | exit (0); | ||
2743 | } | ||
2744 | @@ -2768,7 +2863,7 @@ | ||
2745 | ( exit $ac_status ) | ||
2746 | ac_cv_header_stdc=no | ||
2747 | fi | ||
2748 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
2749 | +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
2750 | fi | ||
2751 | fi | ||
2752 | fi | ||
2753 | @@ -2793,7 +2888,7 @@ | ||
2754 | |||
2755 | |||
2756 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
2757 | - inttypes.h stdint.h unistd.h | ||
2758 | + inttypes.h stdint.h unistd.h | ||
2759 | do | ||
2760 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
2761 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
2762 | @@ -2802,7 +2897,6 @@ | ||
2763 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2764 | else | ||
2765 | cat >conftest.$ac_ext <<_ACEOF | ||
2766 | -#line $LINENO "configure" | ||
2767 | /* confdefs.h. */ | ||
2768 | _ACEOF | ||
2769 | cat confdefs.h >>conftest.$ac_ext | ||
2770 | @@ -2814,11 +2908,20 @@ | ||
2771 | _ACEOF | ||
2772 | rm -f conftest.$ac_objext | ||
2773 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2774 | - (eval $ac_compile) 2>&5 | ||
2775 | + (eval $ac_compile) 2>conftest.er1 | ||
2776 | ac_status=$? | ||
2777 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2778 | + rm -f conftest.er1 | ||
2779 | + cat conftest.err >&5 | ||
2780 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2781 | (exit $ac_status); } && | ||
2782 | - { ac_try='test -s conftest.$ac_objext' | ||
2783 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2784 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2785 | + (eval $ac_try) 2>&5 | ||
2786 | + ac_status=$? | ||
2787 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2788 | + (exit $ac_status); }; } && | ||
2789 | + { ac_try='test -s conftest.$ac_objext' | ||
2790 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2791 | (eval $ac_try) 2>&5 | ||
2792 | ac_status=$? | ||
2793 | @@ -2831,7 +2934,7 @@ | ||
2794 | |||
2795 | eval "$as_ac_Header=no" | ||
2796 | fi | ||
2797 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2798 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2799 | fi | ||
2800 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
2801 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
2802 | @@ -2858,7 +2961,6 @@ | ||
2803 | echo "$as_me:$LINENO: checking minix/config.h usability" >&5 | ||
2804 | echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6 | ||
2805 | cat >conftest.$ac_ext <<_ACEOF | ||
2806 | -#line $LINENO "configure" | ||
2807 | /* confdefs.h. */ | ||
2808 | _ACEOF | ||
2809 | cat confdefs.h >>conftest.$ac_ext | ||
2810 | @@ -2869,11 +2971,20 @@ | ||
2811 | _ACEOF | ||
2812 | rm -f conftest.$ac_objext | ||
2813 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2814 | - (eval $ac_compile) 2>&5 | ||
2815 | + (eval $ac_compile) 2>conftest.er1 | ||
2816 | ac_status=$? | ||
2817 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2818 | + rm -f conftest.er1 | ||
2819 | + cat conftest.err >&5 | ||
2820 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2821 | (exit $ac_status); } && | ||
2822 | - { ac_try='test -s conftest.$ac_objext' | ||
2823 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2824 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2825 | + (eval $ac_try) 2>&5 | ||
2826 | + ac_status=$? | ||
2827 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2828 | + (exit $ac_status); }; } && | ||
2829 | + { ac_try='test -s conftest.$ac_objext' | ||
2830 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2831 | (eval $ac_try) 2>&5 | ||
2832 | ac_status=$? | ||
2833 | @@ -2886,7 +2997,7 @@ | ||
2834 | |||
2835 | ac_header_compiler=no | ||
2836 | fi | ||
2837 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2838 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2839 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
2840 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
2841 | |||
2842 | @@ -2894,7 +3005,6 @@ | ||
2843 | echo "$as_me:$LINENO: checking minix/config.h presence" >&5 | ||
2844 | echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6 | ||
2845 | cat >conftest.$ac_ext <<_ACEOF | ||
2846 | -#line $LINENO "configure" | ||
2847 | /* confdefs.h. */ | ||
2848 | _ACEOF | ||
2849 | cat confdefs.h >>conftest.$ac_ext | ||
2850 | @@ -2912,6 +3022,7 @@ | ||
2851 | (exit $ac_status); } >/dev/null; then | ||
2852 | if test -s conftest.err; then | ||
2853 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2854 | + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2855 | else | ||
2856 | ac_cpp_err= | ||
2857 | fi | ||
2858 | @@ -2931,33 +3042,32 @@ | ||
2859 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
2860 | |||
2861 | # So? What about this header? | ||
2862 | -case $ac_header_compiler:$ac_header_preproc in | ||
2863 | - yes:no ) | ||
2864 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
2865 | + yes:no: ) | ||
2866 | { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
2867 | echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
2868 | - { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 | ||
2869 | -echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} | ||
2870 | - ( | ||
2871 | - cat <<\_ASBOX | ||
2872 | -## ------------------------------------ ## | ||
2873 | -## Report this to bug-autoconf@gnu.org. ## | ||
2874 | -## ------------------------------------ ## | ||
2875 | -_ASBOX | ||
2876 | - ) | | ||
2877 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
2878 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 | ||
2879 | +echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} | ||
2880 | + ac_header_preproc=yes | ||
2881 | ;; | ||
2882 | - no:yes ) | ||
2883 | + no:yes:* ) | ||
2884 | { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 | ||
2885 | echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} | ||
2886 | - { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 | ||
2887 | -echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} | ||
2888 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 | ||
2889 | +echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} | ||
2890 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 | ||
2891 | +echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} | ||
2892 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
2893 | +echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
2894 | { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 | ||
2895 | echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} | ||
2896 | + { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 | ||
2897 | +echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} | ||
2898 | ( | ||
2899 | cat <<\_ASBOX | ||
2900 | -## ------------------------------------ ## | ||
2901 | -## Report this to bug-autoconf@gnu.org. ## | ||
2902 | -## ------------------------------------ ## | ||
2903 | +## -------------------------------- ## | ||
2904 | +## Report this to bug-patch@gnu.org ## | ||
2905 | +## -------------------------------- ## | ||
2906 | _ASBOX | ||
2907 | ) | | ||
2908 | sed "s/^/$as_me: WARNING: /" >&2 | ||
2909 | @@ -3000,15 +3110,15 @@ | ||
2910 | fi | ||
2911 | |||
2912 | |||
2913 | -echo "$as_me:$LINENO: checking for library containing strerror" >&5 | ||
2914 | -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 | ||
2915 | -if test "${ac_cv_search_strerror+set}" = set; then | ||
2916 | + | ||
2917 | + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 | ||
2918 | +echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 | ||
2919 | +if test "${ac_cv_lib_cposix_strerror+set}" = set; then | ||
2920 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2921 | else | ||
2922 | - ac_func_search_save_LIBS=$LIBS | ||
2923 | -ac_cv_search_strerror=no | ||
2924 | + ac_check_lib_save_LIBS=$LIBS | ||
2925 | +LIBS="-lcposix $LIBS" | ||
2926 | cat >conftest.$ac_ext <<_ACEOF | ||
2927 | -#line $LINENO "configure" | ||
2928 | /* confdefs.h. */ | ||
2929 | _ACEOF | ||
2930 | cat confdefs.h >>conftest.$ac_ext | ||
2931 | @@ -3032,79 +3142,43 @@ | ||
2932 | _ACEOF | ||
2933 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
2934 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
2935 | - (eval $ac_link) 2>&5 | ||
2936 | + (eval $ac_link) 2>conftest.er1 | ||
2937 | ac_status=$? | ||
2938 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
2939 | + rm -f conftest.er1 | ||
2940 | + cat conftest.err >&5 | ||
2941 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2942 | (exit $ac_status); } && | ||
2943 | - { ac_try='test -s conftest$ac_exeext' | ||
2944 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
2945 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2946 | (eval $ac_try) 2>&5 | ||
2947 | ac_status=$? | ||
2948 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2949 | - (exit $ac_status); }; }; then | ||
2950 | - ac_cv_search_strerror="none required" | ||
2951 | -else | ||
2952 | - echo "$as_me: failed program was:" >&5 | ||
2953 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2954 | - | ||
2955 | -fi | ||
2956 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
2957 | -if test "$ac_cv_search_strerror" = no; then | ||
2958 | - for ac_lib in cposix; do | ||
2959 | - LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
2960 | - cat >conftest.$ac_ext <<_ACEOF | ||
2961 | -#line $LINENO "configure" | ||
2962 | -/* confdefs.h. */ | ||
2963 | -_ACEOF | ||
2964 | -cat confdefs.h >>conftest.$ac_ext | ||
2965 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2966 | -/* end confdefs.h. */ | ||
2967 | - | ||
2968 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
2969 | -#ifdef __cplusplus | ||
2970 | -extern "C" | ||
2971 | -#endif | ||
2972 | -/* We use char because int might match the return type of a gcc2 | ||
2973 | - builtin and then its argument prototype would still apply. */ | ||
2974 | -char strerror (); | ||
2975 | -int | ||
2976 | -main () | ||
2977 | -{ | ||
2978 | -strerror (); | ||
2979 | - ; | ||
2980 | - return 0; | ||
2981 | -} | ||
2982 | -_ACEOF | ||
2983 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
2984 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
2985 | - (eval $ac_link) 2>&5 | ||
2986 | - ac_status=$? | ||
2987 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2988 | - (exit $ac_status); } && | ||
2989 | - { ac_try='test -s conftest$ac_exeext' | ||
2990 | + (exit $ac_status); }; } && | ||
2991 | + { ac_try='test -s conftest$ac_exeext' | ||
2992 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2993 | (eval $ac_try) 2>&5 | ||
2994 | ac_status=$? | ||
2995 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2996 | (exit $ac_status); }; }; then | ||
2997 | - ac_cv_search_strerror="-l$ac_lib" | ||
2998 | -break | ||
2999 | + ac_cv_lib_cposix_strerror=yes | ||
3000 | else | ||
3001 | echo "$as_me: failed program was:" >&5 | ||
3002 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3003 | |||
3004 | +ac_cv_lib_cposix_strerror=no | ||
3005 | fi | ||
3006 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3007 | - done | ||
3008 | +rm -f conftest.err conftest.$ac_objext \ | ||
3009 | + conftest$ac_exeext conftest.$ac_ext | ||
3010 | +LIBS=$ac_check_lib_save_LIBS | ||
3011 | fi | ||
3012 | -LIBS=$ac_func_search_save_LIBS | ||
3013 | +echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 | ||
3014 | +echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 | ||
3015 | +if test $ac_cv_lib_cposix_strerror = yes; then | ||
3016 | + LIBS="$LIBS -lcposix" | ||
3017 | fi | ||
3018 | -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 | ||
3019 | -echo "${ECHO_T}$ac_cv_search_strerror" >&6 | ||
3020 | -if test "$ac_cv_search_strerror" != no; then | ||
3021 | - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" | ||
3022 | |||
3023 | -fi | ||
3024 | + | ||
3025 | |||
3026 | # Check whether --enable-largefile or --disable-largefile was given. | ||
3027 | if test "${enable_largefile+set}" = set; then | ||
3028 | @@ -3124,8 +3198,7 @@ | ||
3029 | while :; do | ||
3030 | # IRIX 6.2 and later do not support large files by default, | ||
3031 | # so use the C compiler's -n32 option if that helps. | ||
3032 | - cat >conftest.$ac_ext <<_ACEOF | ||
3033 | -#line $LINENO "configure" | ||
3034 | + cat >conftest.$ac_ext <<_ACEOF | ||
3035 | /* confdefs.h. */ | ||
3036 | _ACEOF | ||
3037 | cat confdefs.h >>conftest.$ac_ext | ||
3038 | @@ -3150,11 +3223,20 @@ | ||
3039 | _ACEOF | ||
3040 | rm -f conftest.$ac_objext | ||
3041 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3042 | - (eval $ac_compile) 2>&5 | ||
3043 | + (eval $ac_compile) 2>conftest.er1 | ||
3044 | ac_status=$? | ||
3045 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3046 | + rm -f conftest.er1 | ||
3047 | + cat conftest.err >&5 | ||
3048 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3049 | (exit $ac_status); } && | ||
3050 | - { ac_try='test -s conftest.$ac_objext' | ||
3051 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3052 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3053 | + (eval $ac_try) 2>&5 | ||
3054 | + ac_status=$? | ||
3055 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3056 | + (exit $ac_status); }; } && | ||
3057 | + { ac_try='test -s conftest.$ac_objext' | ||
3058 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3059 | (eval $ac_try) 2>&5 | ||
3060 | ac_status=$? | ||
3061 | @@ -3166,15 +3248,24 @@ | ||
3062 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3063 | |||
3064 | fi | ||
3065 | -rm -f conftest.$ac_objext | ||
3066 | +rm -f conftest.err conftest.$ac_objext | ||
3067 | CC="$CC -n32" | ||
3068 | rm -f conftest.$ac_objext | ||
3069 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3070 | - (eval $ac_compile) 2>&5 | ||
3071 | + (eval $ac_compile) 2>conftest.er1 | ||
3072 | ac_status=$? | ||
3073 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3074 | + rm -f conftest.er1 | ||
3075 | + cat conftest.err >&5 | ||
3076 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3077 | (exit $ac_status); } && | ||
3078 | - { ac_try='test -s conftest.$ac_objext' | ||
3079 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3080 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3081 | + (eval $ac_try) 2>&5 | ||
3082 | + ac_status=$? | ||
3083 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3084 | + (exit $ac_status); }; } && | ||
3085 | + { ac_try='test -s conftest.$ac_objext' | ||
3086 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3087 | (eval $ac_try) 2>&5 | ||
3088 | ac_status=$? | ||
3089 | @@ -3186,8 +3277,8 @@ | ||
3090 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3091 | |||
3092 | fi | ||
3093 | -rm -f conftest.$ac_objext | ||
3094 | - break | ||
3095 | +rm -f conftest.err conftest.$ac_objext | ||
3096 | + break | ||
3097 | done | ||
3098 | CC=$ac_save_CC | ||
3099 | rm -f conftest.$ac_ext | ||
3100 | @@ -3207,7 +3298,6 @@ | ||
3101 | while :; do | ||
3102 | ac_cv_sys_file_offset_bits=no | ||
3103 | cat >conftest.$ac_ext <<_ACEOF | ||
3104 | -#line $LINENO "configure" | ||
3105 | /* confdefs.h. */ | ||
3106 | _ACEOF | ||
3107 | cat confdefs.h >>conftest.$ac_ext | ||
3108 | @@ -3232,11 +3322,20 @@ | ||
3109 | _ACEOF | ||
3110 | rm -f conftest.$ac_objext | ||
3111 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3112 | - (eval $ac_compile) 2>&5 | ||
3113 | + (eval $ac_compile) 2>conftest.er1 | ||
3114 | ac_status=$? | ||
3115 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3116 | + rm -f conftest.er1 | ||
3117 | + cat conftest.err >&5 | ||
3118 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3119 | (exit $ac_status); } && | ||
3120 | - { ac_try='test -s conftest.$ac_objext' | ||
3121 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3122 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3123 | + (eval $ac_try) 2>&5 | ||
3124 | + ac_status=$? | ||
3125 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3126 | + (exit $ac_status); }; } && | ||
3127 | + { ac_try='test -s conftest.$ac_objext' | ||
3128 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3129 | (eval $ac_try) 2>&5 | ||
3130 | ac_status=$? | ||
3131 | @@ -3248,9 +3347,8 @@ | ||
3132 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3133 | |||
3134 | fi | ||
3135 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3136 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3137 | cat >conftest.$ac_ext <<_ACEOF | ||
3138 | -#line $LINENO "configure" | ||
3139 | /* confdefs.h. */ | ||
3140 | _ACEOF | ||
3141 | cat confdefs.h >>conftest.$ac_ext | ||
3142 | @@ -3276,11 +3374,20 @@ | ||
3143 | _ACEOF | ||
3144 | rm -f conftest.$ac_objext | ||
3145 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3146 | - (eval $ac_compile) 2>&5 | ||
3147 | + (eval $ac_compile) 2>conftest.er1 | ||
3148 | ac_status=$? | ||
3149 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3150 | + rm -f conftest.er1 | ||
3151 | + cat conftest.err >&5 | ||
3152 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3153 | (exit $ac_status); } && | ||
3154 | - { ac_try='test -s conftest.$ac_objext' | ||
3155 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3156 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3157 | + (eval $ac_try) 2>&5 | ||
3158 | + ac_status=$? | ||
3159 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3160 | + (exit $ac_status); }; } && | ||
3161 | + { ac_try='test -s conftest.$ac_objext' | ||
3162 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3163 | (eval $ac_try) 2>&5 | ||
3164 | ac_status=$? | ||
3165 | @@ -3292,7 +3399,7 @@ | ||
3166 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3167 | |||
3168 | fi | ||
3169 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3170 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3171 | break | ||
3172 | done | ||
3173 | fi | ||
3174 | @@ -3314,7 +3421,6 @@ | ||
3175 | while :; do | ||
3176 | ac_cv_sys_large_files=no | ||
3177 | cat >conftest.$ac_ext <<_ACEOF | ||
3178 | -#line $LINENO "configure" | ||
3179 | /* confdefs.h. */ | ||
3180 | _ACEOF | ||
3181 | cat confdefs.h >>conftest.$ac_ext | ||
3182 | @@ -3339,11 +3445,20 @@ | ||
3183 | _ACEOF | ||
3184 | rm -f conftest.$ac_objext | ||
3185 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3186 | - (eval $ac_compile) 2>&5 | ||
3187 | + (eval $ac_compile) 2>conftest.er1 | ||
3188 | ac_status=$? | ||
3189 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3190 | + rm -f conftest.er1 | ||
3191 | + cat conftest.err >&5 | ||
3192 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3193 | (exit $ac_status); } && | ||
3194 | - { ac_try='test -s conftest.$ac_objext' | ||
3195 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3196 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3197 | + (eval $ac_try) 2>&5 | ||
3198 | + ac_status=$? | ||
3199 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3200 | + (exit $ac_status); }; } && | ||
3201 | + { ac_try='test -s conftest.$ac_objext' | ||
3202 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3203 | (eval $ac_try) 2>&5 | ||
3204 | ac_status=$? | ||
3205 | @@ -3355,9 +3470,8 @@ | ||
3206 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3207 | |||
3208 | fi | ||
3209 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3210 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3211 | cat >conftest.$ac_ext <<_ACEOF | ||
3212 | -#line $LINENO "configure" | ||
3213 | /* confdefs.h. */ | ||
3214 | _ACEOF | ||
3215 | cat confdefs.h >>conftest.$ac_ext | ||
3216 | @@ -3383,11 +3497,20 @@ | ||
3217 | _ACEOF | ||
3218 | rm -f conftest.$ac_objext | ||
3219 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3220 | - (eval $ac_compile) 2>&5 | ||
3221 | + (eval $ac_compile) 2>conftest.er1 | ||
3222 | ac_status=$? | ||
3223 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3224 | + rm -f conftest.er1 | ||
3225 | + cat conftest.err >&5 | ||
3226 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3227 | (exit $ac_status); } && | ||
3228 | - { ac_try='test -s conftest.$ac_objext' | ||
3229 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3230 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3231 | + (eval $ac_try) 2>&5 | ||
3232 | + ac_status=$? | ||
3233 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3234 | + (exit $ac_status); }; } && | ||
3235 | + { ac_try='test -s conftest.$ac_objext' | ||
3236 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3237 | (eval $ac_try) 2>&5 | ||
3238 | ac_status=$? | ||
3239 | @@ -3399,7 +3522,7 @@ | ||
3240 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3241 | |||
3242 | fi | ||
3243 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3244 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3245 | break | ||
3246 | done | ||
3247 | fi | ||
3248 | @@ -3443,7 +3566,6 @@ | ||
3249 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3250 | else | ||
3251 | cat >conftest.$ac_ext <<_ACEOF | ||
3252 | -#line $LINENO "configure" | ||
3253 | /* confdefs.h. */ | ||
3254 | _ACEOF | ||
3255 | cat confdefs.h >>conftest.$ac_ext | ||
3256 | @@ -3506,11 +3628,20 @@ | ||
3257 | _ACEOF | ||
3258 | rm -f conftest.$ac_objext | ||
3259 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3260 | - (eval $ac_compile) 2>&5 | ||
3261 | + (eval $ac_compile) 2>conftest.er1 | ||
3262 | ac_status=$? | ||
3263 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3264 | + rm -f conftest.er1 | ||
3265 | + cat conftest.err >&5 | ||
3266 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3267 | (exit $ac_status); } && | ||
3268 | - { ac_try='test -s conftest.$ac_objext' | ||
3269 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3270 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3271 | + (eval $ac_try) 2>&5 | ||
3272 | + ac_status=$? | ||
3273 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3274 | + (exit $ac_status); }; } && | ||
3275 | + { ac_try='test -s conftest.$ac_objext' | ||
3276 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3277 | (eval $ac_try) 2>&5 | ||
3278 | ac_status=$? | ||
3279 | @@ -3523,7 +3654,7 @@ | ||
3280 | |||
3281 | ac_cv_c_const=no | ||
3282 | fi | ||
3283 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3284 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3285 | fi | ||
3286 | echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 | ||
3287 | echo "${ECHO_T}$ac_cv_c_const" >&6 | ||
3288 | @@ -3550,7 +3681,6 @@ | ||
3289 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3290 | else | ||
3291 | cat >conftest.$ac_ext <<_ACEOF | ||
3292 | -#line $LINENO "configure" | ||
3293 | /* confdefs.h. */ | ||
3294 | _ACEOF | ||
3295 | cat confdefs.h >>conftest.$ac_ext | ||
3296 | @@ -3570,11 +3700,20 @@ | ||
3297 | _ACEOF | ||
3298 | rm -f conftest.$ac_objext | ||
3299 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3300 | - (eval $ac_compile) 2>&5 | ||
3301 | + (eval $ac_compile) 2>conftest.er1 | ||
3302 | ac_status=$? | ||
3303 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3304 | + rm -f conftest.er1 | ||
3305 | + cat conftest.err >&5 | ||
3306 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3307 | (exit $ac_status); } && | ||
3308 | - { ac_try='test -s conftest.$ac_objext' | ||
3309 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3310 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3311 | + (eval $ac_try) 2>&5 | ||
3312 | + ac_status=$? | ||
3313 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3314 | + (exit $ac_status); }; } && | ||
3315 | + { ac_try='test -s conftest.$ac_objext' | ||
3316 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3317 | (eval $ac_try) 2>&5 | ||
3318 | ac_status=$? | ||
3319 | @@ -3587,7 +3726,7 @@ | ||
3320 | |||
3321 | eval "$as_ac_Header=no" | ||
3322 | fi | ||
3323 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3324 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3325 | fi | ||
3326 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
3327 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
3328 | @@ -3610,7 +3749,6 @@ | ||
3329 | ac_func_search_save_LIBS=$LIBS | ||
3330 | ac_cv_search_opendir=no | ||
3331 | cat >conftest.$ac_ext <<_ACEOF | ||
3332 | -#line $LINENO "configure" | ||
3333 | /* confdefs.h. */ | ||
3334 | _ACEOF | ||
3335 | cat confdefs.h >>conftest.$ac_ext | ||
3336 | @@ -3634,11 +3772,20 @@ | ||
3337 | _ACEOF | ||
3338 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3339 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3340 | - (eval $ac_link) 2>&5 | ||
3341 | + (eval $ac_link) 2>conftest.er1 | ||
3342 | ac_status=$? | ||
3343 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3344 | + rm -f conftest.er1 | ||
3345 | + cat conftest.err >&5 | ||
3346 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3347 | (exit $ac_status); } && | ||
3348 | - { ac_try='test -s conftest$ac_exeext' | ||
3349 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3350 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3351 | + (eval $ac_try) 2>&5 | ||
3352 | + ac_status=$? | ||
3353 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3354 | + (exit $ac_status); }; } && | ||
3355 | + { ac_try='test -s conftest$ac_exeext' | ||
3356 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3357 | (eval $ac_try) 2>&5 | ||
3358 | ac_status=$? | ||
3359 | @@ -3650,12 +3797,12 @@ | ||
3360 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3361 | |||
3362 | fi | ||
3363 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3364 | +rm -f conftest.err conftest.$ac_objext \ | ||
3365 | + conftest$ac_exeext conftest.$ac_ext | ||
3366 | if test "$ac_cv_search_opendir" = no; then | ||
3367 | for ac_lib in dir; do | ||
3368 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
3369 | cat >conftest.$ac_ext <<_ACEOF | ||
3370 | -#line $LINENO "configure" | ||
3371 | /* confdefs.h. */ | ||
3372 | _ACEOF | ||
3373 | cat confdefs.h >>conftest.$ac_ext | ||
3374 | @@ -3679,11 +3826,20 @@ | ||
3375 | _ACEOF | ||
3376 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3377 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3378 | - (eval $ac_link) 2>&5 | ||
3379 | + (eval $ac_link) 2>conftest.er1 | ||
3380 | ac_status=$? | ||
3381 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3382 | + rm -f conftest.er1 | ||
3383 | + cat conftest.err >&5 | ||
3384 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3385 | (exit $ac_status); } && | ||
3386 | - { ac_try='test -s conftest$ac_exeext' | ||
3387 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3388 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3389 | + (eval $ac_try) 2>&5 | ||
3390 | + ac_status=$? | ||
3391 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3392 | + (exit $ac_status); }; } && | ||
3393 | + { ac_try='test -s conftest$ac_exeext' | ||
3394 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3395 | (eval $ac_try) 2>&5 | ||
3396 | ac_status=$? | ||
3397 | @@ -3696,7 +3852,8 @@ | ||
3398 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3399 | |||
3400 | fi | ||
3401 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3402 | +rm -f conftest.err conftest.$ac_objext \ | ||
3403 | + conftest$ac_exeext conftest.$ac_ext | ||
3404 | done | ||
3405 | fi | ||
3406 | LIBS=$ac_func_search_save_LIBS | ||
3407 | @@ -3717,7 +3874,6 @@ | ||
3408 | ac_func_search_save_LIBS=$LIBS | ||
3409 | ac_cv_search_opendir=no | ||
3410 | cat >conftest.$ac_ext <<_ACEOF | ||
3411 | -#line $LINENO "configure" | ||
3412 | /* confdefs.h. */ | ||
3413 | _ACEOF | ||
3414 | cat confdefs.h >>conftest.$ac_ext | ||
3415 | @@ -3741,11 +3897,20 @@ | ||
3416 | _ACEOF | ||
3417 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3418 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3419 | - (eval $ac_link) 2>&5 | ||
3420 | + (eval $ac_link) 2>conftest.er1 | ||
3421 | ac_status=$? | ||
3422 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3423 | + rm -f conftest.er1 | ||
3424 | + cat conftest.err >&5 | ||
3425 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3426 | (exit $ac_status); } && | ||
3427 | - { ac_try='test -s conftest$ac_exeext' | ||
3428 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3429 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3430 | + (eval $ac_try) 2>&5 | ||
3431 | + ac_status=$? | ||
3432 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3433 | + (exit $ac_status); }; } && | ||
3434 | + { ac_try='test -s conftest$ac_exeext' | ||
3435 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3436 | (eval $ac_try) 2>&5 | ||
3437 | ac_status=$? | ||
3438 | @@ -3757,12 +3922,12 @@ | ||
3439 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3440 | |||
3441 | fi | ||
3442 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3443 | +rm -f conftest.err conftest.$ac_objext \ | ||
3444 | + conftest$ac_exeext conftest.$ac_ext | ||
3445 | if test "$ac_cv_search_opendir" = no; then | ||
3446 | for ac_lib in x; do | ||
3447 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
3448 | cat >conftest.$ac_ext <<_ACEOF | ||
3449 | -#line $LINENO "configure" | ||
3450 | /* confdefs.h. */ | ||
3451 | _ACEOF | ||
3452 | cat confdefs.h >>conftest.$ac_ext | ||
3453 | @@ -3786,11 +3951,20 @@ | ||
3454 | _ACEOF | ||
3455 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3456 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3457 | - (eval $ac_link) 2>&5 | ||
3458 | + (eval $ac_link) 2>conftest.er1 | ||
3459 | ac_status=$? | ||
3460 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3461 | + rm -f conftest.er1 | ||
3462 | + cat conftest.err >&5 | ||
3463 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3464 | (exit $ac_status); } && | ||
3465 | - { ac_try='test -s conftest$ac_exeext' | ||
3466 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3467 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3468 | + (eval $ac_try) 2>&5 | ||
3469 | + ac_status=$? | ||
3470 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3471 | + (exit $ac_status); }; } && | ||
3472 | + { ac_try='test -s conftest$ac_exeext' | ||
3473 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3474 | (eval $ac_try) 2>&5 | ||
3475 | ac_status=$? | ||
3476 | @@ -3803,7 +3977,8 @@ | ||
3477 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3478 | |||
3479 | fi | ||
3480 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3481 | +rm -f conftest.err conftest.$ac_objext \ | ||
3482 | + conftest$ac_exeext conftest.$ac_ext | ||
3483 | done | ||
3484 | fi | ||
3485 | LIBS=$ac_func_search_save_LIBS | ||
3486 | @@ -3823,7 +3998,6 @@ | ||
3487 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3488 | else | ||
3489 | cat >conftest.$ac_ext <<_ACEOF | ||
3490 | -#line $LINENO "configure" | ||
3491 | /* confdefs.h. */ | ||
3492 | _ACEOF | ||
3493 | cat confdefs.h >>conftest.$ac_ext | ||
3494 | @@ -3844,11 +4018,20 @@ | ||
3495 | _ACEOF | ||
3496 | rm -f conftest.$ac_objext | ||
3497 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3498 | - (eval $ac_compile) 2>&5 | ||
3499 | + (eval $ac_compile) 2>conftest.er1 | ||
3500 | ac_status=$? | ||
3501 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3502 | + rm -f conftest.er1 | ||
3503 | + cat conftest.err >&5 | ||
3504 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3505 | (exit $ac_status); } && | ||
3506 | - { ac_try='test -s conftest.$ac_objext' | ||
3507 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3508 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3509 | + (eval $ac_try) 2>&5 | ||
3510 | + ac_status=$? | ||
3511 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3512 | + (exit $ac_status); }; } && | ||
3513 | + { ac_try='test -s conftest.$ac_objext' | ||
3514 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3515 | (eval $ac_try) 2>&5 | ||
3516 | ac_status=$? | ||
3517 | @@ -3861,12 +4044,11 @@ | ||
3518 | |||
3519 | ac_cv_header_stdc=no | ||
3520 | fi | ||
3521 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3522 | +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3523 | |||
3524 | if test $ac_cv_header_stdc = yes; then | ||
3525 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
3526 | cat >conftest.$ac_ext <<_ACEOF | ||
3527 | -#line $LINENO "configure" | ||
3528 | /* confdefs.h. */ | ||
3529 | _ACEOF | ||
3530 | cat confdefs.h >>conftest.$ac_ext | ||
3531 | @@ -3888,7 +4070,6 @@ | ||
3532 | if test $ac_cv_header_stdc = yes; then | ||
3533 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
3534 | cat >conftest.$ac_ext <<_ACEOF | ||
3535 | -#line $LINENO "configure" | ||
3536 | /* confdefs.h. */ | ||
3537 | _ACEOF | ||
3538 | cat confdefs.h >>conftest.$ac_ext | ||
3539 | @@ -3913,7 +4094,6 @@ | ||
3540 | : | ||
3541 | else | ||
3542 | cat >conftest.$ac_ext <<_ACEOF | ||
3543 | -#line $LINENO "configure" | ||
3544 | /* confdefs.h. */ | ||
3545 | _ACEOF | ||
3546 | cat confdefs.h >>conftest.$ac_ext | ||
3547 | @@ -3925,9 +4105,9 @@ | ||
3548 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
3549 | #else | ||
3550 | # define ISLOWER(c) \ | ||
3551 | - (('a' <= (c) && (c) <= 'i') \ | ||
3552 | - || ('j' <= (c) && (c) <= 'r') \ | ||
3553 | - || ('s' <= (c) && (c) <= 'z')) | ||
3554 | + (('a' <= (c) && (c) <= 'i') \ | ||
3555 | + || ('j' <= (c) && (c) <= 'r') \ | ||
3556 | + || ('s' <= (c) && (c) <= 'z')) | ||
3557 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
3558 | #endif | ||
3559 | |||