0
|
1 |
Only in pgbouncer-1.1.2-solaris: build
|
|
2 |
diff -r -u pgbouncer-1.1.2/configure pgbouncer-1.1.2-solaris/configure
|
|
3 |
--- configure Mon Dec 10 09:06:04 2007
|
|
4 |
+++ solaris/configure Wed Jan 30 09:46:00 2008
|
|
5 |
@@ -1,6 +1,6 @@
|
|
6 |
#! /bin/sh
|
|
7 |
# Guess values for system-dependent variables and create Makefiles.
|
|
8 |
-# Generated by GNU Autoconf 2.60 for pgbouncer 1.1.2.
|
|
9 |
+# Generated by GNU Autoconf 2.61 for pgbouncer 1.1.2.
|
|
10 |
#
|
|
11 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
12 |
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
13 |
@@ -10,7 +10,8 @@
|
|
14 |
## M4sh Initialization. ##
|
|
15 |
## --------------------- ##
|
|
16 |
|
|
17 |
-# Be Bourne compatible
|
|
18 |
+# Be more Bourne compatible
|
|
19 |
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
20 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
21 |
emulate sh
|
|
22 |
NULLCMD=:
|
|
23 |
@@ -19,12 +20,15 @@
|
|
24 |
alias -g '${1+"$@"}'='"$@"'
|
|
25 |
setopt NO_GLOB_SUBST
|
|
26 |
else
|
|
27 |
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
|
28 |
+ case `(set -o) 2>/dev/null` in
|
|
29 |
+ *posix*) set -o posix ;;
|
|
30 |
+esac
|
|
31 |
+
|
|
32 |
fi
|
|
33 |
-BIN_SH=xpg4; export BIN_SH # for Tru64
|
|
34 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
35 |
|
|
36 |
|
|
37 |
+
|
|
38 |
+
|
|
39 |
# PATH needs CR
|
|
40 |
# Avoid depending upon Character Ranges.
|
|
41 |
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
42 |
@@ -215,7 +219,7 @@
|
|
43 |
else
|
|
44 |
as_candidate_shells=
|
|
45 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
46 |
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
47 |
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
48 |
do
|
|
49 |
IFS=$as_save_IFS
|
|
50 |
test -z "$as_dir" && as_dir=.
|
|
51 |
@@ -233,7 +237,6 @@
|
|
52 |
# Try only shells that exist, to save several forks.
|
|
53 |
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
54 |
{ ("$as_shell") 2> /dev/null <<\_ASEOF
|
|
55 |
-# Be Bourne compatible
|
|
56 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
57 |
emulate sh
|
|
58 |
NULLCMD=:
|
|
59 |
@@ -242,11 +245,13 @@
|
|
60 |
alias -g '${1+"$@"}'='"$@"'
|
|
61 |
setopt NO_GLOB_SUBST
|
|
62 |
else
|
|
63 |
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
|
64 |
+ case `(set -o) 2>/dev/null` in
|
|
65 |
+ *posix*) set -o posix ;;
|
|
66 |
+esac
|
|
67 |
+
|
|
68 |
fi
|
|
69 |
-BIN_SH=xpg4; export BIN_SH # for Tru64
|
|
70 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
71 |
|
|
72 |
+
|
|
73 |
:
|
|
74 |
_ASEOF
|
|
75 |
}; then
|
|
76 |
@@ -253,7 +258,6 @@
|
|
77 |
CONFIG_SHELL=$as_shell
|
|
78 |
as_have_required=yes
|
|
79 |
if { "$as_shell" 2> /dev/null <<\_ASEOF
|
|
80 |
-# Be Bourne compatible
|
|
81 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
82 |
emulate sh
|
|
83 |
NULLCMD=:
|
|
84 |
@@ -262,11 +266,13 @@
|
|
85 |
alias -g '${1+"$@"}'='"$@"'
|
|
86 |
setopt NO_GLOB_SUBST
|
|
87 |
else
|
|
88 |
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
|
89 |
+ case `(set -o) 2>/dev/null` in
|
|
90 |
+ *posix*) set -o posix ;;
|
|
91 |
+esac
|
|
92 |
+
|
|
93 |
fi
|
|
94 |
-BIN_SH=xpg4; export BIN_SH # for Tru64
|
|
95 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
96 |
|
|
97 |
+
|
|
98 |
:
|
|
99 |
(as_func_return () {
|
|
100 |
(exit $1)
|
|
101 |
@@ -512,19 +518,28 @@
|
|
102 |
as_mkdir_p=false
|
|
103 |
fi
|
|
104 |
|
|
105 |
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
|
|
106 |
-# systems may use methods other than mode bits to determine executability.
|
|
107 |
-cat >conf$$.file <<_ASEOF
|
|
108 |
-#! /bin/sh
|
|
109 |
-exit 0
|
|
110 |
-_ASEOF
|
|
111 |
-chmod +x conf$$.file
|
|
112 |
-if test -x conf$$.file >/dev/null 2>&1; then
|
|
113 |
- as_executable_p="test -x"
|
|
114 |
+if test -x / >/dev/null 2>&1; then
|
|
115 |
+ as_test_x='test -x'
|
|
116 |
else
|
|
117 |
- as_executable_p=:
|
|
118 |
+ if ls -dL / >/dev/null 2>&1; then
|
|
119 |
+ as_ls_L_option=L
|
|
120 |
+ else
|
|
121 |
+ as_ls_L_option=
|
|
122 |
+ fi
|
|
123 |
+ as_test_x='
|
|
124 |
+ eval sh -c '\''
|
|
125 |
+ if test -d "$1"; then
|
|
126 |
+ test -d "$1/.";
|
|
127 |
+ else
|
|
128 |
+ case $1 in
|
|
129 |
+ -*)set "./$1";;
|
|
130 |
+ esac;
|
|
131 |
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
132 |
+ ???[sx]*):;;*)false;;esac;fi
|
|
133 |
+ '\'' sh
|
|
134 |
+ '
|
|
135 |
fi
|
|
136 |
-rm -f conf$$.file
|
|
137 |
+as_executable_p=$as_test_x
|
|
138 |
|
|
139 |
# Sed expression to map a string onto a valid CPP name.
|
|
140 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
141 |
@@ -565,36 +580,36 @@
|
|
142 |
# Factoring default headers for most tests.
|
|
143 |
ac_includes_default="\
|
|
144 |
#include <stdio.h>
|
|
145 |
-#if HAVE_SYS_TYPES_H
|
|
146 |
+#ifdef HAVE_SYS_TYPES_H
|
|
147 |
# include <sys/types.h>
|
|
148 |
#endif
|
|
149 |
-#if HAVE_SYS_STAT_H
|
|
150 |
+#ifdef HAVE_SYS_STAT_H
|
|
151 |
# include <sys/stat.h>
|
|
152 |
#endif
|
|
153 |
-#if STDC_HEADERS
|
|
154 |
+#ifdef STDC_HEADERS
|
|
155 |
# include <stdlib.h>
|
|
156 |
# include <stddef.h>
|
|
157 |
#else
|
|
158 |
-# if HAVE_STDLIB_H
|
|
159 |
+# ifdef HAVE_STDLIB_H
|
|
160 |
# include <stdlib.h>
|
|
161 |
# endif
|
|
162 |
#endif
|
|
163 |
-#if HAVE_STRING_H
|
|
164 |
-# if !STDC_HEADERS && HAVE_MEMORY_H
|
|
165 |
+#ifdef HAVE_STRING_H
|
|
166 |
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
|
167 |
# include <memory.h>
|
|
168 |
# endif
|
|
169 |
# include <string.h>
|
|
170 |
#endif
|
|
171 |
-#if HAVE_STRINGS_H
|
|
172 |
+#ifdef HAVE_STRINGS_H
|
|
173 |
# include <strings.h>
|
|
174 |
#endif
|
|
175 |
-#if HAVE_INTTYPES_H
|
|
176 |
+#ifdef HAVE_INTTYPES_H
|
|
177 |
# include <inttypes.h>
|
|
178 |
#endif
|
|
179 |
-#if HAVE_STDINT_H
|
|
180 |
+#ifdef HAVE_STDINT_H
|
|
181 |
# include <stdint.h>
|
|
182 |
#endif
|
|
183 |
-#if HAVE_UNISTD_H
|
|
184 |
+#ifdef HAVE_UNISTD_H
|
|
185 |
# include <unistd.h>
|
|
186 |
#endif"
|
|
187 |
|
|
188 |
@@ -659,6 +674,7 @@
|
|
189 |
CC
|
|
190 |
CFLAGS
|
|
191 |
LDFLAGS
|
|
192 |
+LIBS
|
|
193 |
CPPFLAGS
|
|
194 |
CPP'
|
|
195 |
|
|
196 |
@@ -766,10 +782,10 @@
|
|
197 |
-disable-* | --disable-*)
|
|
198 |
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
199 |
# Reject names that are not valid shell variable names.
|
|
200 |
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
201 |
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
202 |
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
203 |
{ (exit 1); exit 1; }; }
|
|
204 |
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
|
205 |
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
206 |
eval enable_$ac_feature=no ;;
|
|
207 |
|
|
208 |
-docdir | --docdir | --docdi | --doc | --do)
|
|
209 |
@@ -785,10 +801,10 @@
|
|
210 |
-enable-* | --enable-*)
|
|
211 |
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
212 |
# Reject names that are not valid shell variable names.
|
|
213 |
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
214 |
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
215 |
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
216 |
{ (exit 1); exit 1; }; }
|
|
217 |
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
|
218 |
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
219 |
eval enable_$ac_feature=\$ac_optarg ;;
|
|
220 |
|
|
221 |
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
|
|
222 |
@@ -982,19 +998,19 @@
|
|
223 |
-with-* | --with-*)
|
|
224 |
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
225 |
# Reject names that are not valid shell variable names.
|
|
226 |
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
227 |
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
228 |
{ echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
229 |
{ (exit 1); exit 1; }; }
|
|
230 |
- ac_package=`echo $ac_package| sed 's/-/_/g'`
|
|
231 |
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
232 |
eval with_$ac_package=\$ac_optarg ;;
|
|
233 |
|
|
234 |
-without-* | --without-*)
|
|
235 |
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
236 |
# Reject names that are not valid shell variable names.
|
|
237 |
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
238 |
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
239 |
{ echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
240 |
{ (exit 1); exit 1; }; }
|
|
241 |
- ac_package=`echo $ac_package | sed 's/-/_/g'`
|
|
242 |
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
243 |
eval with_$ac_package=no ;;
|
|
244 |
|
|
245 |
--x)
|
|
246 |
@@ -1246,6 +1262,7 @@
|
|
247 |
CFLAGS C compiler flags
|
|
248 |
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
|
249 |
nonstandard directory <lib dir>
|
|
250 |
+ LIBS libraries to pass to the linker, e.g. -l<library>
|
|
251 |
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
|
|
252 |
you have headers in a nonstandard directory <include dir>
|
|
253 |
CPP C preprocessor
|
|
254 |
@@ -1314,7 +1331,7 @@
|
|
255 |
if $ac_init_version; then
|
|
256 |
cat <<\_ACEOF
|
|
257 |
pgbouncer configure 1.1.2
|
|
258 |
-generated by GNU Autoconf 2.60
|
|
259 |
+generated by GNU Autoconf 2.61
|
|
260 |
|
|
261 |
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
262 |
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
263 |
@@ -1328,7 +1345,7 @@
|
|
264 |
running configure, to aid debugging if configure makes a mistake.
|
|
265 |
|
|
266 |
It was created by pgbouncer $as_me 1.1.2, which was
|
|
267 |
-generated by GNU Autoconf 2.60. Invocation command line was
|
|
268 |
+generated by GNU Autoconf 2.61. Invocation command line was
|
|
269 |
|
|
270 |
$ $0 $@
|
|
271 |
|
|
272 |
@@ -1706,7 +1723,7 @@
|
|
273 |
IFS=$as_save_IFS
|
|
274 |
test -z "$as_dir" && as_dir=.
|
|
275 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
276 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
277 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
278 |
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
279 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
280 |
break 2
|
|
281 |
@@ -1746,7 +1763,7 @@
|
|
282 |
IFS=$as_save_IFS
|
|
283 |
test -z "$as_dir" && as_dir=.
|
|
284 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
285 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
286 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
287 |
ac_cv_prog_ac_ct_CC="gcc"
|
|
288 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
289 |
break 2
|
|
290 |
@@ -1803,7 +1820,7 @@
|
|
291 |
IFS=$as_save_IFS
|
|
292 |
test -z "$as_dir" && as_dir=.
|
|
293 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
294 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
295 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
296 |
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
297 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
298 |
break 2
|
|
299 |
@@ -1844,7 +1861,7 @@
|
|
300 |
IFS=$as_save_IFS
|
|
301 |
test -z "$as_dir" && as_dir=.
|
|
302 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
303 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
304 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
305 |
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
306 |
ac_prog_rejected=yes
|
|
307 |
continue
|
|
308 |
@@ -1902,7 +1919,7 @@
|
|
309 |
IFS=$as_save_IFS
|
|
310 |
test -z "$as_dir" && as_dir=.
|
|
311 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
312 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
313 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
314 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
315 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
316 |
break 2
|
|
317 |
@@ -1946,7 +1963,7 @@
|
|
318 |
IFS=$as_save_IFS
|
|
319 |
test -z "$as_dir" && as_dir=.
|
|
320 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
321 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
322 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
323 |
ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
324 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
325 |
break 2
|
|
326 |
@@ -2087,7 +2104,7 @@
|
|
327 |
# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
|
328 |
# so that the user can short-circuit this test for compilers unknown to
|
|
329 |
# Autoconf.
|
|
330 |
-for ac_file in $ac_files
|
|
331 |
+for ac_file in $ac_files ''
|
|
332 |
do
|
|
333 |
test -f "$ac_file" || continue
|
|
334 |
case $ac_file in
|
|
335 |
@@ -2115,6 +2132,12 @@
|
|
336 |
test "$ac_cv_exeext" = no && ac_cv_exeext=
|
|
337 |
|
|
338 |
else
|
|
339 |
+ ac_file=''
|
|
340 |
+fi
|
|
341 |
+
|
|
342 |
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
343 |
+echo "${ECHO_T}$ac_file" >&6; }
|
|
344 |
+if test -z "$ac_file"; then
|
|
345 |
echo "$as_me: failed program was:" >&5
|
|
346 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
347 |
|
|
348 |
@@ -2126,8 +2149,6 @@
|
|
349 |
fi
|
|
350 |
|
|
351 |
ac_exeext=$ac_cv_exeext
|
|
352 |
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
353 |
-echo "${ECHO_T}$ac_file" >&6; }
|
|
354 |
|
|
355 |
# Check that the compiler produces executables we can run. If not, either
|
|
356 |
# the compiler is broken, or we cross compile.
|
|
357 |
@@ -2305,27 +2326,10 @@
|
|
358 |
rm -f conftest.er1
|
|
359 |
cat conftest.err >&5
|
|
360 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
361 |
- (exit $ac_status); } &&
|
|
362 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
363 |
- { (case "(($ac_try" in
|
|
364 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
365 |
- *) ac_try_echo=$ac_try;;
|
|
366 |
-esac
|
|
367 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
368 |
- (eval "$ac_try") 2>&5
|
|
369 |
- ac_status=$?
|
|
370 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
371 |
- (exit $ac_status); }; } &&
|
|
372 |
- { ac_try='test -s conftest.$ac_objext'
|
|
373 |
- { (case "(($ac_try" in
|
|
374 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
375 |
- *) ac_try_echo=$ac_try;;
|
|
376 |
-esac
|
|
377 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
378 |
- (eval "$ac_try") 2>&5
|
|
379 |
- ac_status=$?
|
|
380 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
381 |
- (exit $ac_status); }; }; then
|
|
382 |
+ (exit $ac_status); } && {
|
|
383 |
+ test -z "$ac_c_werror_flag" ||
|
|
384 |
+ test ! -s conftest.err
|
|
385 |
+ } && test -s conftest.$ac_objext; then
|
|
386 |
ac_compiler_gnu=yes
|
|
387 |
else
|
|
388 |
echo "$as_me: failed program was:" >&5
|
|
389 |
@@ -2380,27 +2384,10 @@
|
|
390 |
rm -f conftest.er1
|
|
391 |
cat conftest.err >&5
|
|
392 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
393 |
- (exit $ac_status); } &&
|
|
394 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
395 |
- { (case "(($ac_try" in
|
|
396 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
397 |
- *) ac_try_echo=$ac_try;;
|
|
398 |
-esac
|
|
399 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
400 |
- (eval "$ac_try") 2>&5
|
|
401 |
- ac_status=$?
|
|
402 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
403 |
- (exit $ac_status); }; } &&
|
|
404 |
- { ac_try='test -s conftest.$ac_objext'
|
|
405 |
- { (case "(($ac_try" in
|
|
406 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
407 |
- *) ac_try_echo=$ac_try;;
|
|
408 |
-esac
|
|
409 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
410 |
- (eval "$ac_try") 2>&5
|
|
411 |
- ac_status=$?
|
|
412 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
413 |
- (exit $ac_status); }; }; then
|
|
414 |
+ (exit $ac_status); } && {
|
|
415 |
+ test -z "$ac_c_werror_flag" ||
|
|
416 |
+ test ! -s conftest.err
|
|
417 |
+ } && test -s conftest.$ac_objext; then
|
|
418 |
ac_cv_prog_cc_g=yes
|
|
419 |
else
|
|
420 |
echo "$as_me: failed program was:" >&5
|
|
421 |
@@ -2435,27 +2422,10 @@
|
|
422 |
rm -f conftest.er1
|
|
423 |
cat conftest.err >&5
|
|
424 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
425 |
- (exit $ac_status); } &&
|
|
426 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
427 |
- { (case "(($ac_try" in
|
|
428 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
429 |
- *) ac_try_echo=$ac_try;;
|
|
430 |
-esac
|
|
431 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
432 |
- (eval "$ac_try") 2>&5
|
|
433 |
- ac_status=$?
|
|
434 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
435 |
- (exit $ac_status); }; } &&
|
|
436 |
- { ac_try='test -s conftest.$ac_objext'
|
|
437 |
- { (case "(($ac_try" in
|
|
438 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
439 |
- *) ac_try_echo=$ac_try;;
|
|
440 |
-esac
|
|
441 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
442 |
- (eval "$ac_try") 2>&5
|
|
443 |
- ac_status=$?
|
|
444 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
445 |
- (exit $ac_status); }; }; then
|
|
446 |
+ (exit $ac_status); } && {
|
|
447 |
+ test -z "$ac_c_werror_flag" ||
|
|
448 |
+ test ! -s conftest.err
|
|
449 |
+ } && test -s conftest.$ac_objext; then
|
|
450 |
:
|
|
451 |
else
|
|
452 |
echo "$as_me: failed program was:" >&5
|
|
453 |
@@ -2491,27 +2461,10 @@
|
|
454 |
rm -f conftest.er1
|
|
455 |
cat conftest.err >&5
|
|
456 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
457 |
- (exit $ac_status); } &&
|
|
458 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
459 |
- { (case "(($ac_try" in
|
|
460 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
461 |
- *) ac_try_echo=$ac_try;;
|
|
462 |
-esac
|
|
463 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
464 |
- (eval "$ac_try") 2>&5
|
|
465 |
- ac_status=$?
|
|
466 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
467 |
- (exit $ac_status); }; } &&
|
|
468 |
- { ac_try='test -s conftest.$ac_objext'
|
|
469 |
- { (case "(($ac_try" in
|
|
470 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
471 |
- *) ac_try_echo=$ac_try;;
|
|
472 |
-esac
|
|
473 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
474 |
- (eval "$ac_try") 2>&5
|
|
475 |
- ac_status=$?
|
|
476 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
477 |
- (exit $ac_status); }; }; then
|
|
478 |
+ (exit $ac_status); } && {
|
|
479 |
+ test -z "$ac_c_werror_flag" ||
|
|
480 |
+ test ! -s conftest.err
|
|
481 |
+ } && test -s conftest.$ac_objext; then
|
|
482 |
ac_cv_prog_cc_g=yes
|
|
483 |
else
|
|
484 |
echo "$as_me: failed program was:" >&5
|
|
485 |
@@ -2627,27 +2580,10 @@
|
|
486 |
rm -f conftest.er1
|
|
487 |
cat conftest.err >&5
|
|
488 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
489 |
- (exit $ac_status); } &&
|
|
490 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
491 |
- { (case "(($ac_try" in
|
|
492 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
493 |
- *) ac_try_echo=$ac_try;;
|
|
494 |
-esac
|
|
495 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
496 |
- (eval "$ac_try") 2>&5
|
|
497 |
- ac_status=$?
|
|
498 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
499 |
- (exit $ac_status); }; } &&
|
|
500 |
- { ac_try='test -s conftest.$ac_objext'
|
|
501 |
- { (case "(($ac_try" in
|
|
502 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
503 |
- *) ac_try_echo=$ac_try;;
|
|
504 |
-esac
|
|
505 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
506 |
- (eval "$ac_try") 2>&5
|
|
507 |
- ac_status=$?
|
|
508 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
509 |
- (exit $ac_status); }; }; then
|
|
510 |
+ (exit $ac_status); } && {
|
|
511 |
+ test -z "$ac_c_werror_flag" ||
|
|
512 |
+ test ! -s conftest.err
|
|
513 |
+ } && test -s conftest.$ac_objext; then
|
|
514 |
ac_cv_prog_cc_c89=$ac_arg
|
|
515 |
else
|
|
516 |
echo "$as_me: failed program was:" >&5
|
|
517 |
@@ -2736,17 +2672,10 @@
|
|
518 |
rm -f conftest.er1
|
|
519 |
cat conftest.err >&5
|
|
520 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
521 |
- (exit $ac_status); } >/dev/null; then
|
|
522 |
- if test -s conftest.err; then
|
|
523 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
524 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
525 |
- else
|
|
526 |
- ac_cpp_err=
|
|
527 |
- fi
|
|
528 |
-else
|
|
529 |
- ac_cpp_err=yes
|
|
530 |
-fi
|
|
531 |
-if test -z "$ac_cpp_err"; then
|
|
532 |
+ (exit $ac_status); } >/dev/null && {
|
|
533 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
534 |
+ test ! -s conftest.err
|
|
535 |
+ }; then
|
|
536 |
:
|
|
537 |
else
|
|
538 |
echo "$as_me: failed program was:" >&5
|
|
539 |
@@ -2780,17 +2709,10 @@
|
|
540 |
rm -f conftest.er1
|
|
541 |
cat conftest.err >&5
|
|
542 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
543 |
- (exit $ac_status); } >/dev/null; then
|
|
544 |
- if test -s conftest.err; then
|
|
545 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
546 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
547 |
- else
|
|
548 |
- ac_cpp_err=
|
|
549 |
- fi
|
|
550 |
-else
|
|
551 |
- ac_cpp_err=yes
|
|
552 |
-fi
|
|
553 |
-if test -z "$ac_cpp_err"; then
|
|
554 |
+ (exit $ac_status); } >/dev/null && {
|
|
555 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
556 |
+ test ! -s conftest.err
|
|
557 |
+ }; then
|
|
558 |
# Broken: success on invalid input.
|
|
559 |
continue
|
|
560 |
else
|
|
561 |
@@ -2855,17 +2777,10 @@
|
|
562 |
rm -f conftest.er1
|
|
563 |
cat conftest.err >&5
|
|
564 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
565 |
- (exit $ac_status); } >/dev/null; then
|
|
566 |
- if test -s conftest.err; then
|
|
567 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
568 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
569 |
- else
|
|
570 |
- ac_cpp_err=
|
|
571 |
- fi
|
|
572 |
-else
|
|
573 |
- ac_cpp_err=yes
|
|
574 |
-fi
|
|
575 |
-if test -z "$ac_cpp_err"; then
|
|
576 |
+ (exit $ac_status); } >/dev/null && {
|
|
577 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
578 |
+ test ! -s conftest.err
|
|
579 |
+ }; then
|
|
580 |
:
|
|
581 |
else
|
|
582 |
echo "$as_me: failed program was:" >&5
|
|
583 |
@@ -2899,17 +2814,10 @@
|
|
584 |
rm -f conftest.er1
|
|
585 |
cat conftest.err >&5
|
|
586 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
587 |
- (exit $ac_status); } >/dev/null; then
|
|
588 |
- if test -s conftest.err; then
|
|
589 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
590 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
591 |
- else
|
|
592 |
- ac_cpp_err=
|
|
593 |
- fi
|
|
594 |
-else
|
|
595 |
- ac_cpp_err=yes
|
|
596 |
-fi
|
|
597 |
-if test -z "$ac_cpp_err"; then
|
|
598 |
+ (exit $ac_status); } >/dev/null && {
|
|
599 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
600 |
+ test ! -s conftest.err
|
|
601 |
+ }; then
|
|
602 |
# Broken: success on invalid input.
|
|
603 |
continue
|
|
604 |
else
|
|
605 |
@@ -2961,7 +2869,7 @@
|
|
606 |
IFS=$as_save_IFS
|
|
607 |
test -z "$as_dir" && as_dir=.
|
|
608 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
609 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
610 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
611 |
ac_cv_prog_ASCIIDOC="$ac_prog"
|
|
612 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
613 |
break 2
|
|
614 |
@@ -3021,7 +2929,7 @@
|
|
615 |
IFS=$as_save_IFS
|
|
616 |
test -z "$as_dir" && as_dir=.
|
|
617 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
618 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
619 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
620 |
ac_cv_prog_XMLTO="$ac_prog"
|
|
621 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
622 |
break 2
|
|
623 |
@@ -3079,27 +2987,10 @@
|
|
624 |
rm -f conftest.er1
|
|
625 |
cat conftest.err >&5
|
|
626 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
627 |
- (exit $ac_status); } &&
|
|
628 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
629 |
- { (case "(($ac_try" in
|
|
630 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
631 |
- *) ac_try_echo=$ac_try;;
|
|
632 |
-esac
|
|
633 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
634 |
- (eval "$ac_try") 2>&5
|
|
635 |
- ac_status=$?
|
|
636 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
637 |
- (exit $ac_status); }; } &&
|
|
638 |
- { ac_try='test -s conftest.$ac_objext'
|
|
639 |
- { (case "(($ac_try" in
|
|
640 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
641 |
- *) ac_try_echo=$ac_try;;
|
|
642 |
-esac
|
|
643 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
644 |
- (eval "$ac_try") 2>&5
|
|
645 |
- ac_status=$?
|
|
646 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
647 |
- (exit $ac_status); }; }; then
|
|
648 |
+ (exit $ac_status); } && {
|
|
649 |
+ test -z "$ac_c_werror_flag" ||
|
|
650 |
+ test ! -s conftest.err
|
|
651 |
+ } && test -s conftest.$ac_objext; then
|
|
652 |
good="$good $f"
|
|
653 |
else
|
|
654 |
echo "$as_me: failed program was:" >&5
|
|
655 |
@@ -3137,7 +3028,7 @@
|
|
656 |
for ac_prog in grep ggrep; do
|
|
657 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
658 |
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
659 |
- { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
|
|
660 |
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
661 |
# Check for GNU ac_path_GREP and select it if it is found.
|
|
662 |
# Check for GNU $ac_path_GREP
|
|
663 |
case `"$ac_path_GREP" --version 2>&1` in
|
|
664 |
@@ -3219,7 +3110,7 @@
|
|
665 |
for ac_prog in egrep; do
|
|
666 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
667 |
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
668 |
- { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
|
|
669 |
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
670 |
# Check for GNU ac_path_EGREP and select it if it is found.
|
|
671 |
# Check for GNU $ac_path_EGREP
|
|
672 |
case `"$ac_path_EGREP" --version 2>&1` in
|
|
673 |
@@ -3315,27 +3206,10 @@
|
|
674 |
rm -f conftest.er1
|
|
675 |
cat conftest.err >&5
|
|
676 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
677 |
- (exit $ac_status); } &&
|
|
678 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
679 |
- { (case "(($ac_try" in
|
|
680 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
681 |
- *) ac_try_echo=$ac_try;;
|
|
682 |
-esac
|
|
683 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
684 |
- (eval "$ac_try") 2>&5
|
|
685 |
- ac_status=$?
|
|
686 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
687 |
- (exit $ac_status); }; } &&
|
|
688 |
- { ac_try='test -s conftest.$ac_objext'
|
|
689 |
- { (case "(($ac_try" in
|
|
690 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
691 |
- *) ac_try_echo=$ac_try;;
|
|
692 |
-esac
|
|
693 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
694 |
- (eval "$ac_try") 2>&5
|
|
695 |
- ac_status=$?
|
|
696 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
697 |
- (exit $ac_status); }; }; then
|
|
698 |
+ (exit $ac_status); } && {
|
|
699 |
+ test -z "$ac_c_werror_flag" ||
|
|
700 |
+ test ! -s conftest.err
|
|
701 |
+ } && test -s conftest.$ac_objext; then
|
|
702 |
ac_cv_header_stdc=yes
|
|
703 |
else
|
|
704 |
echo "$as_me: failed program was:" >&5
|
|
705 |
@@ -3511,27 +3385,10 @@
|
|
706 |
rm -f conftest.er1
|
|
707 |
cat conftest.err >&5
|
|
708 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
709 |
- (exit $ac_status); } &&
|
|
710 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
711 |
- { (case "(($ac_try" in
|
|
712 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
713 |
- *) ac_try_echo=$ac_try;;
|
|
714 |
-esac
|
|
715 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
716 |
- (eval "$ac_try") 2>&5
|
|
717 |
- ac_status=$?
|
|
718 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
719 |
- (exit $ac_status); }; } &&
|
|
720 |
- { ac_try='test -s conftest.$ac_objext'
|
|
721 |
- { (case "(($ac_try" in
|
|
722 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
723 |
- *) ac_try_echo=$ac_try;;
|
|
724 |
-esac
|
|
725 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
726 |
- (eval "$ac_try") 2>&5
|
|
727 |
- ac_status=$?
|
|
728 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
729 |
- (exit $ac_status); }; }; then
|
|
730 |
+ (exit $ac_status); } && {
|
|
731 |
+ test -z "$ac_c_werror_flag" ||
|
|
732 |
+ test ! -s conftest.err
|
|
733 |
+ } && test -s conftest.$ac_objext; then
|
|
734 |
eval "$as_ac_Header=yes"
|
|
735 |
else
|
|
736 |
echo "$as_me: failed program was:" >&5
|
|
737 |
@@ -3596,27 +3453,10 @@
|
|
738 |
rm -f conftest.er1
|
|
739 |
cat conftest.err >&5
|
|
740 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
741 |
- (exit $ac_status); } &&
|
|
742 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
743 |
- { (case "(($ac_try" in
|
|
744 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
745 |
- *) ac_try_echo=$ac_try;;
|
|
746 |
-esac
|
|
747 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
748 |
- (eval "$ac_try") 2>&5
|
|
749 |
- ac_status=$?
|
|
750 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
751 |
- (exit $ac_status); }; } &&
|
|
752 |
- { ac_try='test -s conftest.$ac_objext'
|
|
753 |
- { (case "(($ac_try" in
|
|
754 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
755 |
- *) ac_try_echo=$ac_try;;
|
|
756 |
-esac
|
|
757 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
758 |
- (eval "$ac_try") 2>&5
|
|
759 |
- ac_status=$?
|
|
760 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
761 |
- (exit $ac_status); }; }; then
|
|
762 |
+ (exit $ac_status); } && {
|
|
763 |
+ test -z "$ac_c_werror_flag" ||
|
|
764 |
+ test ! -s conftest.err
|
|
765 |
+ } && test -s conftest.$ac_objext; then
|
|
766 |
ac_header_compiler=yes
|
|
767 |
else
|
|
768 |
echo "$as_me: failed program was:" >&5
|
|
769 |
@@ -3652,17 +3492,10 @@
|
|
770 |
rm -f conftest.er1
|
|
771 |
cat conftest.err >&5
|
|
772 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
773 |
- (exit $ac_status); } >/dev/null; then
|
|
774 |
- if test -s conftest.err; then
|
|
775 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
776 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
777 |
- else
|
|
778 |
- ac_cpp_err=
|
|
779 |
- fi
|
|
780 |
-else
|
|
781 |
- ac_cpp_err=yes
|
|
782 |
-fi
|
|
783 |
-if test -z "$ac_cpp_err"; then
|
|
784 |
+ (exit $ac_status); } >/dev/null && {
|
|
785 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
786 |
+ test ! -s conftest.err
|
|
787 |
+ }; then
|
|
788 |
ac_header_preproc=yes
|
|
789 |
else
|
|
790 |
echo "$as_me: failed program was:" >&5
|
|
791 |
@@ -3760,27 +3593,10 @@
|
|
792 |
rm -f conftest.er1
|
|
793 |
cat conftest.err >&5
|
|
794 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
795 |
- (exit $ac_status); } &&
|
|
796 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
797 |
- { (case "(($ac_try" in
|
|
798 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
799 |
- *) ac_try_echo=$ac_try;;
|
|
800 |
-esac
|
|
801 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
802 |
- (eval "$ac_try") 2>&5
|
|
803 |
- ac_status=$?
|
|
804 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
805 |
- (exit $ac_status); }; } &&
|
|
806 |
- { ac_try='test -s conftest.$ac_objext'
|
|
807 |
- { (case "(($ac_try" in
|
|
808 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
809 |
- *) ac_try_echo=$ac_try;;
|
|
810 |
-esac
|
|
811 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
812 |
- (eval "$ac_try") 2>&5
|
|
813 |
- ac_status=$?
|
|
814 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
815 |
- (exit $ac_status); }; }; then
|
|
816 |
+ (exit $ac_status); } && {
|
|
817 |
+ test -z "$ac_c_werror_flag" ||
|
|
818 |
+ test ! -s conftest.err
|
|
819 |
+ } && test -s conftest.$ac_objext; then
|
|
820 |
eval "$as_ac_Header=yes"
|
|
821 |
else
|
|
822 |
echo "$as_me: failed program was:" >&5
|
|
823 |
@@ -3837,27 +3653,10 @@
|
|
824 |
rm -f conftest.er1
|
|
825 |
cat conftest.err >&5
|
|
826 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
827 |
- (exit $ac_status); } &&
|
|
828 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
829 |
- { (case "(($ac_try" in
|
|
830 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
831 |
- *) ac_try_echo=$ac_try;;
|
|
832 |
-esac
|
|
833 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
834 |
- (eval "$ac_try") 2>&5
|
|
835 |
- ac_status=$?
|
|
836 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
837 |
- (exit $ac_status); }; } &&
|
|
838 |
- { ac_try='test -s conftest.$ac_objext'
|
|
839 |
- { (case "(($ac_try" in
|
|
840 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
841 |
- *) ac_try_echo=$ac_try;;
|
|
842 |
-esac
|
|
843 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
844 |
- (eval "$ac_try") 2>&5
|
|
845 |
- ac_status=$?
|
|
846 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
847 |
- (exit $ac_status); }; }; then
|
|
848 |
+ (exit $ac_status); } && {
|
|
849 |
+ test -z "$ac_c_werror_flag" ||
|
|
850 |
+ test ! -s conftest.err
|
|
851 |
+ } && test -s conftest.$ac_objext; then
|
|
852 |
ac_cv_c_inline=$ac_kw
|
|
853 |
else
|
|
854 |
echo "$as_me: failed program was:" >&5
|
|
855 |
@@ -3908,7 +3707,8 @@
|
|
856 |
int
|
|
857 |
main ()
|
|
858 |
{
|
|
859 |
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
|
|
860 |
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
|
|
861 |
+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
|
|
862 |
bogus endian macros
|
|
863 |
#endif
|
|
864 |
|
|
865 |
@@ -3929,27 +3729,10 @@
|
|
866 |
rm -f conftest.er1
|
|
867 |
cat conftest.err >&5
|
|
868 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
869 |
- (exit $ac_status); } &&
|
|
870 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
871 |
- { (case "(($ac_try" in
|
|
872 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
873 |
- *) ac_try_echo=$ac_try;;
|
|
874 |
-esac
|
|
875 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
876 |
- (eval "$ac_try") 2>&5
|
|
877 |
- ac_status=$?
|
|
878 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
879 |
- (exit $ac_status); }; } &&
|
|
880 |
- { ac_try='test -s conftest.$ac_objext'
|
|
881 |
- { (case "(($ac_try" in
|
|
882 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
883 |
- *) ac_try_echo=$ac_try;;
|
|
884 |
-esac
|
|
885 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
886 |
- (eval "$ac_try") 2>&5
|
|
887 |
- ac_status=$?
|
|
888 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
889 |
- (exit $ac_status); }; }; then
|
|
890 |
+ (exit $ac_status); } && {
|
|
891 |
+ test -z "$ac_c_werror_flag" ||
|
|
892 |
+ test ! -s conftest.err
|
|
893 |
+ } && test -s conftest.$ac_objext; then
|
|
894 |
# It does; now see whether it defined to BIG_ENDIAN or not.
|
|
895 |
cat >conftest.$ac_ext <<_ACEOF
|
|
896 |
/* confdefs.h. */
|
|
897 |
@@ -3984,27 +3767,10 @@
|
|
898 |
rm -f conftest.er1
|
|
899 |
cat conftest.err >&5
|
|
900 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
901 |
- (exit $ac_status); } &&
|
|
902 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
903 |
- { (case "(($ac_try" in
|
|
904 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
905 |
- *) ac_try_echo=$ac_try;;
|
|
906 |
-esac
|
|
907 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
908 |
- (eval "$ac_try") 2>&5
|
|
909 |
- ac_status=$?
|
|
910 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
911 |
- (exit $ac_status); }; } &&
|
|
912 |
- { ac_try='test -s conftest.$ac_objext'
|
|
913 |
- { (case "(($ac_try" in
|
|
914 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
915 |
- *) ac_try_echo=$ac_try;;
|
|
916 |
-esac
|
|
917 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
918 |
- (eval "$ac_try") 2>&5
|
|
919 |
- ac_status=$?
|
|
920 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
921 |
- (exit $ac_status); }; }; then
|
|
922 |
+ (exit $ac_status); } && {
|
|
923 |
+ test -z "$ac_c_werror_flag" ||
|
|
924 |
+ test ! -s conftest.err
|
|
925 |
+ } && test -s conftest.$ac_objext; then
|
|
926 |
ac_cv_c_bigendian=yes
|
|
927 |
else
|
|
928 |
echo "$as_me: failed program was:" >&5
|
|
929 |
@@ -4055,27 +3821,10 @@
|
|
930 |
rm -f conftest.er1
|
|
931 |
cat conftest.err >&5
|
|
932 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
933 |
- (exit $ac_status); } &&
|
|
934 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
935 |
- { (case "(($ac_try" in
|
|
936 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
937 |
- *) ac_try_echo=$ac_try;;
|
|
938 |
-esac
|
|
939 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
940 |
- (eval "$ac_try") 2>&5
|
|
941 |
- ac_status=$?
|
|
942 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
943 |
- (exit $ac_status); }; } &&
|
|
944 |
- { ac_try='test -s conftest.$ac_objext'
|
|
945 |
- { (case "(($ac_try" in
|
|
946 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
947 |
- *) ac_try_echo=$ac_try;;
|
|
948 |
-esac
|
|
949 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
950 |
- (eval "$ac_try") 2>&5
|
|
951 |
- ac_status=$?
|
|
952 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
953 |
- (exit $ac_status); }; }; then
|
|
954 |
+ (exit $ac_status); } && {
|
|
955 |
+ test -z "$ac_c_werror_flag" ||
|
|
956 |
+ test ! -s conftest.err
|
|
957 |
+ } && test -s conftest.$ac_objext; then
|
|
958 |
if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
|
|
959 |
ac_cv_c_bigendian=yes
|
|
960 |
fi
|
|
961 |
@@ -4213,27 +3962,10 @@
|
|
962 |
rm -f conftest.er1
|
|
963 |
cat conftest.err >&5
|
|
964 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
965 |
- (exit $ac_status); } &&
|
|
966 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
967 |
- { (case "(($ac_try" in
|
|
968 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
969 |
- *) ac_try_echo=$ac_try;;
|
|
970 |
-esac
|
|
971 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
972 |
- (eval "$ac_try") 2>&5
|
|
973 |
- ac_status=$?
|
|
974 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
975 |
- (exit $ac_status); }; } &&
|
|
976 |
- { ac_try='test -s conftest.$ac_objext'
|
|
977 |
- { (case "(($ac_try" in
|
|
978 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
979 |
- *) ac_try_echo=$ac_try;;
|
|
980 |
-esac
|
|
981 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
982 |
- (eval "$ac_try") 2>&5
|
|
983 |
- ac_status=$?
|
|
984 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
985 |
- (exit $ac_status); }; }; then
|
|
986 |
+ (exit $ac_status); } && {
|
|
987 |
+ test -z "$ac_c_werror_flag" ||
|
|
988 |
+ test ! -s conftest.err
|
|
989 |
+ } && test -s conftest.$ac_objext; then
|
|
990 |
ac_cv_type_pid_t=yes
|
|
991 |
else
|
|
992 |
echo "$as_me: failed program was:" >&5
|
|
993 |
@@ -4293,27 +4025,10 @@
|
|
994 |
rm -f conftest.er1
|
|
995 |
cat conftest.err >&5
|
|
996 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
997 |
- (exit $ac_status); } &&
|
|
998 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
999 |
- { (case "(($ac_try" in
|
|
1000 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1001 |
- *) ac_try_echo=$ac_try;;
|
|
1002 |
-esac
|
|
1003 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1004 |
- (eval "$ac_try") 2>&5
|
|
1005 |
- ac_status=$?
|
|
1006 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1007 |
- (exit $ac_status); }; } &&
|
|
1008 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1009 |
- { (case "(($ac_try" in
|
|
1010 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1011 |
- *) ac_try_echo=$ac_try;;
|
|
1012 |
-esac
|
|
1013 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1014 |
- (eval "$ac_try") 2>&5
|
|
1015 |
- ac_status=$?
|
|
1016 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1017 |
- (exit $ac_status); }; }; then
|
|
1018 |
+ (exit $ac_status); } && {
|
|
1019 |
+ test -z "$ac_c_werror_flag" ||
|
|
1020 |
+ test ! -s conftest.err
|
|
1021 |
+ } && test -s conftest.$ac_objext; then
|
|
1022 |
ac_cv_type_size_t=yes
|
|
1023 |
else
|
|
1024 |
echo "$as_me: failed program was:" >&5
|
|
1025 |
@@ -4375,27 +4090,10 @@
|
|
1026 |
rm -f conftest.er1
|
|
1027 |
cat conftest.err >&5
|
|
1028 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1029 |
- (exit $ac_status); } &&
|
|
1030 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1031 |
- { (case "(($ac_try" in
|
|
1032 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1033 |
- *) ac_try_echo=$ac_try;;
|
|
1034 |
-esac
|
|
1035 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1036 |
- (eval "$ac_try") 2>&5
|
|
1037 |
- ac_status=$?
|
|
1038 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1039 |
- (exit $ac_status); }; } &&
|
|
1040 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1041 |
- { (case "(($ac_try" in
|
|
1042 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1043 |
- *) ac_try_echo=$ac_try;;
|
|
1044 |
-esac
|
|
1045 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1046 |
- (eval "$ac_try") 2>&5
|
|
1047 |
- ac_status=$?
|
|
1048 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1049 |
- (exit $ac_status); }; }; then
|
|
1050 |
+ (exit $ac_status); } && {
|
|
1051 |
+ test -z "$ac_c_werror_flag" ||
|
|
1052 |
+ test ! -s conftest.err
|
|
1053 |
+ } && test -s conftest.$ac_objext; then
|
|
1054 |
case $ac_type in
|
|
1055 |
uint8_t) ac_cv_c_uint8_t=yes ;;
|
|
1056 |
*) ac_cv_c_uint8_t=$ac_type ;;
|
|
1057 |
@@ -4468,27 +4166,10 @@
|
|
1058 |
rm -f conftest.er1
|
|
1059 |
cat conftest.err >&5
|
|
1060 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1061 |
- (exit $ac_status); } &&
|
|
1062 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1063 |
- { (case "(($ac_try" in
|
|
1064 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1065 |
- *) ac_try_echo=$ac_try;;
|
|
1066 |
-esac
|
|
1067 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1068 |
- (eval "$ac_try") 2>&5
|
|
1069 |
- ac_status=$?
|
|
1070 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1071 |
- (exit $ac_status); }; } &&
|
|
1072 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1073 |
- { (case "(($ac_try" in
|
|
1074 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1075 |
- *) ac_try_echo=$ac_try;;
|
|
1076 |
-esac
|
|
1077 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1078 |
- (eval "$ac_try") 2>&5
|
|
1079 |
- ac_status=$?
|
|
1080 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1081 |
- (exit $ac_status); }; }; then
|
|
1082 |
+ (exit $ac_status); } && {
|
|
1083 |
+ test -z "$ac_c_werror_flag" ||
|
|
1084 |
+ test ! -s conftest.err
|
|
1085 |
+ } && test -s conftest.$ac_objext; then
|
|
1086 |
case $ac_type in
|
|
1087 |
uint32_t) ac_cv_c_uint32_t=yes ;;
|
|
1088 |
*) ac_cv_c_uint32_t=$ac_type ;;
|
|
1089 |
@@ -4561,27 +4242,10 @@
|
|
1090 |
rm -f conftest.er1
|
|
1091 |
cat conftest.err >&5
|
|
1092 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1093 |
- (exit $ac_status); } &&
|
|
1094 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1095 |
- { (case "(($ac_try" in
|
|
1096 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1097 |
- *) ac_try_echo=$ac_try;;
|
|
1098 |
-esac
|
|
1099 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1100 |
- (eval "$ac_try") 2>&5
|
|
1101 |
- ac_status=$?
|
|
1102 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1103 |
- (exit $ac_status); }; } &&
|
|
1104 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1105 |
- { (case "(($ac_try" in
|
|
1106 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1107 |
- *) ac_try_echo=$ac_try;;
|
|
1108 |
-esac
|
|
1109 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1110 |
- (eval "$ac_try") 2>&5
|
|
1111 |
- ac_status=$?
|
|
1112 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1113 |
- (exit $ac_status); }; }; then
|
|
1114 |
+ (exit $ac_status); } && {
|
|
1115 |
+ test -z "$ac_c_werror_flag" ||
|
|
1116 |
+ test ! -s conftest.err
|
|
1117 |
+ } && test -s conftest.$ac_objext; then
|
|
1118 |
case $ac_type in
|
|
1119 |
uint64_t) ac_cv_c_uint64_t=yes ;;
|
|
1120 |
*) ac_cv_c_uint64_t=$ac_type ;;
|
|
1121 |
@@ -4669,27 +4333,10 @@
|
|
1122 |
rm -f conftest.er1
|
|
1123 |
cat conftest.err >&5
|
|
1124 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1125 |
- (exit $ac_status); } &&
|
|
1126 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1127 |
- { (case "(($ac_try" in
|
|
1128 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1129 |
- *) ac_try_echo=$ac_try;;
|
|
1130 |
-esac
|
|
1131 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1132 |
- (eval "$ac_try") 2>&5
|
|
1133 |
- ac_status=$?
|
|
1134 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1135 |
- (exit $ac_status); }; } &&
|
|
1136 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1137 |
- { (case "(($ac_try" in
|
|
1138 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1139 |
- *) ac_try_echo=$ac_try;;
|
|
1140 |
-esac
|
|
1141 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1142 |
- (eval "$ac_try") 2>&5
|
|
1143 |
- ac_status=$?
|
|
1144 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1145 |
- (exit $ac_status); }; }; then
|
|
1146 |
+ (exit $ac_status); } && {
|
|
1147 |
+ test -z "$ac_c_werror_flag" ||
|
|
1148 |
+ test ! -s conftest.err
|
|
1149 |
+ } && test -s conftest.$ac_objext; then
|
|
1150 |
break
|
|
1151 |
else
|
|
1152 |
echo "$as_me: failed program was:" >&5
|
|
1153 |
@@ -4713,27 +4360,10 @@
|
|
1154 |
rm -f conftest.er1
|
|
1155 |
cat conftest.err >&5
|
|
1156 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1157 |
- (exit $ac_status); } &&
|
|
1158 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1159 |
- { (case "(($ac_try" in
|
|
1160 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1161 |
- *) ac_try_echo=$ac_try;;
|
|
1162 |
-esac
|
|
1163 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1164 |
- (eval "$ac_try") 2>&5
|
|
1165 |
- ac_status=$?
|
|
1166 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1167 |
- (exit $ac_status); }; } &&
|
|
1168 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1169 |
- { (case "(($ac_try" in
|
|
1170 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1171 |
- *) ac_try_echo=$ac_try;;
|
|
1172 |
-esac
|
|
1173 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1174 |
- (eval "$ac_try") 2>&5
|
|
1175 |
- ac_status=$?
|
|
1176 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1177 |
- (exit $ac_status); }; }; then
|
|
1178 |
+ (exit $ac_status); } && {
|
|
1179 |
+ test -z "$ac_c_werror_flag" ||
|
|
1180 |
+ test ! -s conftest.err
|
|
1181 |
+ } && test -s conftest.$ac_objext; then
|
|
1182 |
ac_cv_sys_largefile_CC=' -n32'; break
|
|
1183 |
else
|
|
1184 |
echo "$as_me: failed program was:" >&5
|
|
1185 |
@@ -4761,7 +4391,6 @@
|
|
1186 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
1187 |
else
|
|
1188 |
while :; do
|
|
1189 |
- ac_cv_sys_file_offset_bits=no
|
|
1190 |
cat >conftest.$ac_ext <<_ACEOF
|
|
1191 |
/* confdefs.h. */
|
|
1192 |
_ACEOF
|
|
1193 |
@@ -4798,28 +4427,11 @@
|
|
1194 |
rm -f conftest.er1
|
|
1195 |
cat conftest.err >&5
|
|
1196 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1197 |
- (exit $ac_status); } &&
|
|
1198 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1199 |
- { (case "(($ac_try" in
|
|
1200 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1201 |
- *) ac_try_echo=$ac_try;;
|
|
1202 |
-esac
|
|
1203 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1204 |
- (eval "$ac_try") 2>&5
|
|
1205 |
- ac_status=$?
|
|
1206 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1207 |
- (exit $ac_status); }; } &&
|
|
1208 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1209 |
- { (case "(($ac_try" in
|
|
1210 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1211 |
- *) ac_try_echo=$ac_try;;
|
|
1212 |
-esac
|
|
1213 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1214 |
- (eval "$ac_try") 2>&5
|
|
1215 |
- ac_status=$?
|
|
1216 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1217 |
- (exit $ac_status); }; }; then
|
|
1218 |
- break
|
|
1219 |
+ (exit $ac_status); } && {
|
|
1220 |
+ test -z "$ac_c_werror_flag" ||
|
|
1221 |
+ test ! -s conftest.err
|
|
1222 |
+ } && test -s conftest.$ac_objext; then
|
|
1223 |
+ ac_cv_sys_file_offset_bits=no; break
|
|
1224 |
else
|
|
1225 |
echo "$as_me: failed program was:" >&5
|
|
1226 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
1227 |
@@ -4865,27 +4477,10 @@
|
|
1228 |
rm -f conftest.er1
|
|
1229 |
cat conftest.err >&5
|
|
1230 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1231 |
- (exit $ac_status); } &&
|
|
1232 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1233 |
- { (case "(($ac_try" in
|
|
1234 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1235 |
- *) ac_try_echo=$ac_try;;
|
|
1236 |
-esac
|
|
1237 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1238 |
- (eval "$ac_try") 2>&5
|
|
1239 |
- ac_status=$?
|
|
1240 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1241 |
- (exit $ac_status); }; } &&
|
|
1242 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1243 |
- { (case "(($ac_try" in
|
|
1244 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1245 |
- *) ac_try_echo=$ac_try;;
|
|
1246 |
-esac
|
|
1247 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1248 |
- (eval "$ac_try") 2>&5
|
|
1249 |
- ac_status=$?
|
|
1250 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1251 |
- (exit $ac_status); }; }; then
|
|
1252 |
+ (exit $ac_status); } && {
|
|
1253 |
+ test -z "$ac_c_werror_flag" ||
|
|
1254 |
+ test ! -s conftest.err
|
|
1255 |
+ } && test -s conftest.$ac_objext; then
|
|
1256 |
ac_cv_sys_file_offset_bits=64; break
|
|
1257 |
else
|
|
1258 |
echo "$as_me: failed program was:" >&5
|
|
1259 |
@@ -4895,26 +4490,28 @@
|
|
1260 |
fi
|
|
1261 |
|
|
1262 |
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
1263 |
+ ac_cv_sys_file_offset_bits=unknown
|
|
1264 |
break
|
|
1265 |
done
|
|
1266 |
fi
|
|
1267 |
{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
|
|
1268 |
echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
|
|
1269 |
-if test "$ac_cv_sys_file_offset_bits" != no; then
|
|
1270 |
-
|
|
1271 |
+case $ac_cv_sys_file_offset_bits in #(
|
|
1272 |
+ no | unknown) ;;
|
|
1273 |
+ *)
|
|
1274 |
cat >>confdefs.h <<_ACEOF
|
|
1275 |
#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
|
|
1276 |
_ACEOF
|
|
1277 |
-
|
|
1278 |
-fi
|
|
1279 |
+;;
|
|
1280 |
+esac
|
|
1281 |
rm -f conftest*
|
|
1282 |
- { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
|
|
1283 |
+ if test $ac_cv_sys_file_offset_bits = unknown; then
|
|
1284 |
+ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
|
|
1285 |
echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
|
|
1286 |
if test "${ac_cv_sys_large_files+set}" = set; then
|
|
1287 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
1288 |
else
|
|
1289 |
while :; do
|
|
1290 |
- ac_cv_sys_large_files=no
|
|
1291 |
cat >conftest.$ac_ext <<_ACEOF
|
|
1292 |
/* confdefs.h. */
|
|
1293 |
_ACEOF
|
|
1294 |
@@ -4951,28 +4548,11 @@
|
|
1295 |
rm -f conftest.er1
|
|
1296 |
cat conftest.err >&5
|
|
1297 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1298 |
- (exit $ac_status); } &&
|
|
1299 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1300 |
- { (case "(($ac_try" in
|
|
1301 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1302 |
- *) ac_try_echo=$ac_try;;
|
|
1303 |
-esac
|
|
1304 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1305 |
- (eval "$ac_try") 2>&5
|
|
1306 |
- ac_status=$?
|
|
1307 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1308 |
- (exit $ac_status); }; } &&
|
|
1309 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1310 |
- { (case "(($ac_try" in
|
|
1311 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1312 |
- *) ac_try_echo=$ac_try;;
|
|
1313 |
-esac
|
|
1314 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1315 |
- (eval "$ac_try") 2>&5
|
|
1316 |
- ac_status=$?
|
|
1317 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1318 |
- (exit $ac_status); }; }; then
|
|
1319 |
- break
|
|
1320 |
+ (exit $ac_status); } && {
|
|
1321 |
+ test -z "$ac_c_werror_flag" ||
|
|
1322 |
+ test ! -s conftest.err
|
|
1323 |
+ } && test -s conftest.$ac_objext; then
|
|
1324 |
+ ac_cv_sys_large_files=no; break
|
|
1325 |
else
|
|
1326 |
echo "$as_me: failed program was:" >&5
|
|
1327 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
1328 |
@@ -5018,27 +4598,10 @@
|
|
1329 |
rm -f conftest.er1
|
|
1330 |
cat conftest.err >&5
|
|
1331 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1332 |
- (exit $ac_status); } &&
|
|
1333 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1334 |
- { (case "(($ac_try" in
|
|
1335 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1336 |
- *) ac_try_echo=$ac_try;;
|
|
1337 |
-esac
|
|
1338 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1339 |
- (eval "$ac_try") 2>&5
|
|
1340 |
- ac_status=$?
|
|
1341 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1342 |
- (exit $ac_status); }; } &&
|
|
1343 |
- { ac_try='test -s conftest.$ac_objext'
|
|
1344 |
- { (case "(($ac_try" in
|
|
1345 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1346 |
- *) ac_try_echo=$ac_try;;
|
|
1347 |
-esac
|
|
1348 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1349 |
- (eval "$ac_try") 2>&5
|
|
1350 |
- ac_status=$?
|
|
1351 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1352 |
- (exit $ac_status); }; }; then
|
|
1353 |
+ (exit $ac_status); } && {
|
|
1354 |
+ test -z "$ac_c_werror_flag" ||
|
|
1355 |
+ test ! -s conftest.err
|
|
1356 |
+ } && test -s conftest.$ac_objext; then
|
|
1357 |
ac_cv_sys_large_files=1; break
|
|
1358 |
else
|
|
1359 |
echo "$as_me: failed program was:" >&5
|
|
1360 |
@@ -5048,19 +4611,22 @@
|
|
1361 |
fi
|
|
1362 |
|
|
1363 |
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
1364 |
+ ac_cv_sys_large_files=unknown
|
|
1365 |
break
|
|
1366 |
done
|
|
1367 |
fi
|
|
1368 |
{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
|
|
1369 |
echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
|
|
1370 |
-if test "$ac_cv_sys_large_files" != no; then
|
|
1371 |
-
|
|
1372 |
+case $ac_cv_sys_large_files in #(
|
|
1373 |
+ no | unknown) ;;
|
|
1374 |
+ *)
|
|
1375 |
cat >>confdefs.h <<_ACEOF
|
|
1376 |
#define _LARGE_FILES $ac_cv_sys_large_files
|
|
1377 |
_ACEOF
|
|
1378 |
-
|
|
1379 |
-fi
|
|
1380 |
+;;
|
|
1381 |
+esac
|
|
1382 |
rm -f conftest*
|
|
1383 |
+ fi
|
|
1384 |
fi
|
|
1385 |
|
|
1386 |
|
|
1387 |
@@ -5134,27 +4700,11 @@
|
|
1388 |
rm -f conftest.er1
|
|
1389 |
cat conftest.err >&5
|
|
1390 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1391 |
- (exit $ac_status); } &&
|
|
1392 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1393 |
- { (case "(($ac_try" in
|
|
1394 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1395 |
- *) ac_try_echo=$ac_try;;
|
|
1396 |
-esac
|
|
1397 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1398 |
- (eval "$ac_try") 2>&5
|
|
1399 |
- ac_status=$?
|
|
1400 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1401 |
- (exit $ac_status); }; } &&
|
|
1402 |
- { ac_try='test -s conftest$ac_exeext'
|
|
1403 |
- { (case "(($ac_try" in
|
|
1404 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1405 |
- *) ac_try_echo=$ac_try;;
|
|
1406 |
-esac
|
|
1407 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1408 |
- (eval "$ac_try") 2>&5
|
|
1409 |
- ac_status=$?
|
|
1410 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1411 |
- (exit $ac_status); }; }; then
|
|
1412 |
+ (exit $ac_status); } && {
|
|
1413 |
+ test -z "$ac_c_werror_flag" ||
|
|
1414 |
+ test ! -s conftest.err
|
|
1415 |
+ } && test -s conftest$ac_exeext &&
|
|
1416 |
+ $as_test_x conftest$ac_exeext; then
|
|
1417 |
eval "$as_ac_var=yes"
|
|
1418 |
else
|
|
1419 |
echo "$as_me: failed program was:" >&5
|
|
1420 |
@@ -5163,7 +4713,7 @@
|
|
1421 |
eval "$as_ac_var=no"
|
|
1422 |
fi
|
|
1423 |
|
|
1424 |
-rm -f core conftest.err conftest.$ac_objext \
|
|
1425 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
1426 |
conftest$ac_exeext conftest.$ac_ext
|
|
1427 |
fi
|
|
1428 |
ac_res=`eval echo '${'$as_ac_var'}'`
|
|
1429 |
@@ -5225,27 +4775,11 @@
|
|
1430 |
rm -f conftest.er1
|
|
1431 |
cat conftest.err >&5
|
|
1432 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1433 |
- (exit $ac_status); } &&
|
|
1434 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1435 |
- { (case "(($ac_try" in
|
|
1436 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1437 |
- *) ac_try_echo=$ac_try;;
|
|
1438 |
-esac
|
|
1439 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1440 |
- (eval "$ac_try") 2>&5
|
|
1441 |
- ac_status=$?
|
|
1442 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1443 |
- (exit $ac_status); }; } &&
|
|
1444 |
- { ac_try='test -s conftest$ac_exeext'
|
|
1445 |
- { (case "(($ac_try" in
|
|
1446 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1447 |
- *) ac_try_echo=$ac_try;;
|
|
1448 |
-esac
|
|
1449 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1450 |
- (eval "$ac_try") 2>&5
|
|
1451 |
- ac_status=$?
|
|
1452 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1453 |
- (exit $ac_status); }; }; then
|
|
1454 |
+ (exit $ac_status); } && {
|
|
1455 |
+ test -z "$ac_c_werror_flag" ||
|
|
1456 |
+ test ! -s conftest.err
|
|
1457 |
+ } && test -s conftest$ac_exeext &&
|
|
1458 |
+ $as_test_x conftest$ac_exeext; then
|
|
1459 |
ac_cv_search_crypt=$ac_res
|
|
1460 |
else
|
|
1461 |
echo "$as_me: failed program was:" >&5
|
|
1462 |
@@ -5254,7 +4788,7 @@
|
|
1463 |
|
|
1464 |
fi
|
|
1465 |
|
|
1466 |
-rm -f core conftest.err conftest.$ac_objext \
|
|
1467 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
1468 |
conftest$ac_exeext
|
|
1469 |
if test "${ac_cv_search_crypt+set}" = set; then
|
|
1470 |
break
|
|
1471 |
@@ -5328,27 +4862,11 @@
|
|
1472 |
rm -f conftest.er1
|
|
1473 |
cat conftest.err >&5
|
|
1474 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1475 |
- (exit $ac_status); } &&
|
|
1476 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1477 |
- { (case "(($ac_try" in
|
|
1478 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1479 |
- *) ac_try_echo=$ac_try;;
|
|
1480 |
-esac
|
|
1481 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1482 |
- (eval "$ac_try") 2>&5
|
|
1483 |
- ac_status=$?
|
|
1484 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1485 |
- (exit $ac_status); }; } &&
|
|
1486 |
- { ac_try='test -s conftest$ac_exeext'
|
|
1487 |
- { (case "(($ac_try" in
|
|
1488 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1489 |
- *) ac_try_echo=$ac_try;;
|
|
1490 |
-esac
|
|
1491 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1492 |
- (eval "$ac_try") 2>&5
|
|
1493 |
- ac_status=$?
|
|
1494 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1495 |
- (exit $ac_status); }; }; then
|
|
1496 |
+ (exit $ac_status); } && {
|
|
1497 |
+ test -z "$ac_c_werror_flag" ||
|
|
1498 |
+ test ! -s conftest.err
|
|
1499 |
+ } && test -s conftest$ac_exeext &&
|
|
1500 |
+ $as_test_x conftest$ac_exeext; then
|
|
1501 |
ac_cv_search_clock_gettime=$ac_res
|
|
1502 |
else
|
|
1503 |
echo "$as_me: failed program was:" >&5
|
|
1504 |
@@ -5357,7 +4875,7 @@
|
|
1505 |
|
|
1506 |
fi
|
|
1507 |
|
|
1508 |
-rm -f core conftest.err conftest.$ac_objext \
|
|
1509 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
1510 |
conftest$ac_exeext
|
|
1511 |
if test "${ac_cv_search_clock_gettime+set}" = set; then
|
|
1512 |
break
|
|
1513 |
@@ -5380,6 +4898,221 @@
|
|
1514 |
fi
|
|
1515 |
|
|
1516 |
|
|
1517 |
+{ echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
|
|
1518 |
+echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6; }
|
|
1519 |
+if test "${ac_cv_lib_socket_bind+set}" = set; then
|
|
1520 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
1521 |
+else
|
|
1522 |
+ ac_check_lib_save_LIBS=$LIBS
|
|
1523 |
+LIBS="-lsocket $LIBS"
|
|
1524 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
1525 |
+/* confdefs.h. */
|
|
1526 |
+_ACEOF
|
|
1527 |
+cat confdefs.h >>conftest.$ac_ext
|
|
1528 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
1529 |
+/* end confdefs.h. */
|
|
1530 |
+
|
|
1531 |
+/* Override any GCC internal prototype to avoid an error.
|
|
1532 |
+ Use char because int might match the return type of a GCC
|
|
1533 |
+ builtin and then its argument prototype would still apply. */
|
|
1534 |
+#ifdef __cplusplus
|
|
1535 |
+extern "C"
|
|
1536 |
+#endif
|
|
1537 |
+char bind ();
|
|
1538 |
+int
|
|
1539 |
+main ()
|
|
1540 |
+{
|
|
1541 |
+return bind ();
|
|
1542 |
+ ;
|
|
1543 |
+ return 0;
|
|
1544 |
+}
|
|
1545 |
+_ACEOF
|
|
1546 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
1547 |
+if { (ac_try="$ac_link"
|
|
1548 |
+case "(($ac_try" in
|
|
1549 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1550 |
+ *) ac_try_echo=$ac_try;;
|
|
1551 |
+esac
|
|
1552 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1553 |
+ (eval "$ac_link") 2>conftest.er1
|
|
1554 |
+ ac_status=$?
|
|
1555 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
1556 |
+ rm -f conftest.er1
|
|
1557 |
+ cat conftest.err >&5
|
|
1558 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1559 |
+ (exit $ac_status); } && {
|
|
1560 |
+ test -z "$ac_c_werror_flag" ||
|
|
1561 |
+ test ! -s conftest.err
|
|
1562 |
+ } && test -s conftest$ac_exeext &&
|
|
1563 |
+ $as_test_x conftest$ac_exeext; then
|
|
1564 |
+ ac_cv_lib_socket_bind=yes
|
|
1565 |
+else
|
|
1566 |
+ echo "$as_me: failed program was:" >&5
|
|
1567 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
1568 |
+
|
|
1569 |
+ ac_cv_lib_socket_bind=no
|
|
1570 |
+fi
|
|
1571 |
+
|
|
1572 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
1573 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
1574 |
+LIBS=$ac_check_lib_save_LIBS
|
|
1575 |
+fi
|
|
1576 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5
|
|
1577 |
+echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6; }
|
|
1578 |
+if test $ac_cv_lib_socket_bind = yes; then
|
|
1579 |
+ cat >>confdefs.h <<_ACEOF
|
|
1580 |
+#define HAVE_LIBSOCKET 1
|
|
1581 |
+_ACEOF
|
|
1582 |
+
|
|
1583 |
+ LIBS="-lsocket $LIBS"
|
|
1584 |
+
|
|
1585 |
+fi
|
|
1586 |
+
|
|
1587 |
+
|
|
1588 |
+{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
|
|
1589 |
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
|
|
1590 |
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
|
|
1591 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
1592 |
+else
|
|
1593 |
+ ac_check_lib_save_LIBS=$LIBS
|
|
1594 |
+LIBS="-lnsl $LIBS"
|
|
1595 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
1596 |
+/* confdefs.h. */
|
|
1597 |
+_ACEOF
|
|
1598 |
+cat confdefs.h >>conftest.$ac_ext
|
|
1599 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
1600 |
+/* end confdefs.h. */
|
|
1601 |
+
|
|
1602 |
+/* Override any GCC internal prototype to avoid an error.
|
|
1603 |
+ Use char because int might match the return type of a GCC
|
|
1604 |
+ builtin and then its argument prototype would still apply. */
|
|
1605 |
+#ifdef __cplusplus
|
|
1606 |
+extern "C"
|
|
1607 |
+#endif
|
|
1608 |
+char gethostbyname ();
|
|
1609 |
+int
|
|
1610 |
+main ()
|
|
1611 |
+{
|
|
1612 |
+return gethostbyname ();
|
|
1613 |
+ ;
|
|
1614 |
+ return 0;
|
|
1615 |
+}
|
|
1616 |
+_ACEOF
|
|
1617 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
1618 |
+if { (ac_try="$ac_link"
|
|
1619 |
+case "(($ac_try" in
|
|
1620 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1621 |
+ *) ac_try_echo=$ac_try;;
|
|
1622 |
+esac
|
|
1623 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1624 |
+ (eval "$ac_link") 2>conftest.er1
|
|
1625 |
+ ac_status=$?
|
|
1626 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
1627 |
+ rm -f conftest.er1
|
|
1628 |
+ cat conftest.err >&5
|
|
1629 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1630 |
+ (exit $ac_status); } && {
|
|
1631 |
+ test -z "$ac_c_werror_flag" ||
|
|
1632 |
+ test ! -s conftest.err
|
|
1633 |
+ } && test -s conftest$ac_exeext &&
|
|
1634 |
+ $as_test_x conftest$ac_exeext; then
|
|
1635 |
+ ac_cv_lib_nsl_gethostbyname=yes
|
|
1636 |
+else
|
|
1637 |
+ echo "$as_me: failed program was:" >&5
|
|
1638 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
1639 |
+
|
|
1640 |
+ ac_cv_lib_nsl_gethostbyname=no
|
|
1641 |
+fi
|
|
1642 |
+
|
|
1643 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
1644 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
1645 |
+LIBS=$ac_check_lib_save_LIBS
|
|
1646 |
+fi
|
|
1647 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
|
1648 |
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
|
|
1649 |
+if test $ac_cv_lib_nsl_gethostbyname = yes; then
|
|
1650 |
+ cat >>confdefs.h <<_ACEOF
|
|
1651 |
+#define HAVE_LIBNSL 1
|
|
1652 |
+_ACEOF
|
|
1653 |
+
|
|
1654 |
+ LIBS="-lnsl $LIBS"
|
|
1655 |
+
|
|
1656 |
+fi
|
|
1657 |
+
|
|
1658 |
+
|
|
1659 |
+{ echo "$as_me:$LINENO: checking for hstrerror in -lresolv" >&5
|
|
1660 |
+echo $ECHO_N "checking for hstrerror in -lresolv... $ECHO_C" >&6; }
|
|
1661 |
+if test "${ac_cv_lib_resolv_hstrerror+set}" = set; then
|
|
1662 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
1663 |
+else
|
|
1664 |
+ ac_check_lib_save_LIBS=$LIBS
|
|
1665 |
+LIBS="-lresolv $LIBS"
|
|
1666 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
1667 |
+/* confdefs.h. */
|
|
1668 |
+_ACEOF
|
|
1669 |
+cat confdefs.h >>conftest.$ac_ext
|
|
1670 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
1671 |
+/* end confdefs.h. */
|
|
1672 |
+
|
|
1673 |
+/* Override any GCC internal prototype to avoid an error.
|
|
1674 |
+ Use char because int might match the return type of a GCC
|
|
1675 |
+ builtin and then its argument prototype would still apply. */
|
|
1676 |
+#ifdef __cplusplus
|
|
1677 |
+extern "C"
|
|
1678 |
+#endif
|
|
1679 |
+char hstrerror ();
|
|
1680 |
+int
|
|
1681 |
+main ()
|
|
1682 |
+{
|
|
1683 |
+return hstrerror ();
|
|
1684 |
+ ;
|
|
1685 |
+ return 0;
|
|
1686 |
+}
|
|
1687 |
+_ACEOF
|
|
1688 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
1689 |
+if { (ac_try="$ac_link"
|
|
1690 |
+case "(($ac_try" in
|
|
1691 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1692 |
+ *) ac_try_echo=$ac_try;;
|
|
1693 |
+esac
|
|
1694 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1695 |
+ (eval "$ac_link") 2>conftest.er1
|
|
1696 |
+ ac_status=$?
|
|
1697 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
1698 |
+ rm -f conftest.er1
|
|
1699 |
+ cat conftest.err >&5
|
|
1700 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1701 |
+ (exit $ac_status); } && {
|
|
1702 |
+ test -z "$ac_c_werror_flag" ||
|
|
1703 |
+ test ! -s conftest.err
|
|
1704 |
+ } && test -s conftest$ac_exeext &&
|
|
1705 |
+ $as_test_x conftest$ac_exeext; then
|
|
1706 |
+ ac_cv_lib_resolv_hstrerror=yes
|
|
1707 |
+else
|
|
1708 |
+ echo "$as_me: failed program was:" >&5
|
|
1709 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
1710 |
+
|
|
1711 |
+ ac_cv_lib_resolv_hstrerror=no
|
|
1712 |
+fi
|
|
1713 |
+
|
|
1714 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
1715 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
1716 |
+LIBS=$ac_check_lib_save_LIBS
|
|
1717 |
+fi
|
|
1718 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_hstrerror" >&5
|
|
1719 |
+echo "${ECHO_T}$ac_cv_lib_resolv_hstrerror" >&6; }
|
|
1720 |
+if test $ac_cv_lib_resolv_hstrerror = yes; then
|
|
1721 |
+ cat >>confdefs.h <<_ACEOF
|
|
1722 |
+#define HAVE_LIBRESOLV 1
|
|
1723 |
+_ACEOF
|
|
1724 |
+
|
|
1725 |
+ LIBS="-lresolv $LIBS"
|
|
1726 |
+
|
|
1727 |
+fi
|
|
1728 |
+
|
|
1729 |
+
|
|
1730 |
+
|
|
1731 |
+
|
|
1732 |
{ echo "$as_me:$LINENO: checking for libevent" >&5
|
|
1733 |
echo $ECHO_N "checking for libevent... $ECHO_C" >&6; }
|
|
1734 |
|
|
1735 |
@@ -5418,27 +5151,11 @@
|
|
1736 |
rm -f conftest.er1
|
|
1737 |
cat conftest.err >&5
|
|
1738 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1739 |
- (exit $ac_status); } &&
|
|
1740 |
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
1741 |
- { (case "(($ac_try" in
|
|
1742 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1743 |
- *) ac_try_echo=$ac_try;;
|
|
1744 |
-esac
|
|
1745 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1746 |
- (eval "$ac_try") 2>&5
|
|
1747 |
- ac_status=$?
|
|
1748 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1749 |
- (exit $ac_status); }; } &&
|
|
1750 |
- { ac_try='test -s conftest$ac_exeext'
|
|
1751 |
- { (case "(($ac_try" in
|
|
1752 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
1753 |
- *) ac_try_echo=$ac_try;;
|
|
1754 |
-esac
|
|
1755 |
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
1756 |
- (eval "$ac_try") 2>&5
|
|
1757 |
- ac_status=$?
|
|
1758 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
1759 |
- (exit $ac_status); }; }; then
|
|
1760 |
+ (exit $ac_status); } && {
|
|
1761 |
+ test -z "$ac_c_werror_flag" ||
|
|
1762 |
+ test ! -s conftest.err
|
|
1763 |
+ } && test -s conftest$ac_exeext &&
|
|
1764 |
+ $as_test_x conftest$ac_exeext; then
|
|
1765 |
{ echo "$as_me:$LINENO: result: found" >&5
|
|
1766 |
echo "${ECHO_T}found" >&6; }
|
|
1767 |
else
|
|
1768 |
@@ -5450,7 +5167,7 @@
|
|
1769 |
{ (exit 1); exit 1; }; }
|
|
1770 |
fi
|
|
1771 |
|
|
1772 |
-rm -f core conftest.err conftest.$ac_objext \
|
|
1773 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
1774 |
conftest$ac_exeext conftest.$ac_ext
|
|
1775 |
|
|
1776 |
# autoconf does not want to find 'install', if not using automake...
|
|
1777 |
@@ -5638,7 +5355,8 @@
|
|
1778 |
## M4sh Initialization. ##
|
|
1779 |
## --------------------- ##
|
|
1780 |
|
|
1781 |
-# Be Bourne compatible
|
|
1782 |
+# Be more Bourne compatible
|
|
1783 |
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
1784 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
1785 |
emulate sh
|
|
1786 |
NULLCMD=:
|
|
1787 |
@@ -5647,12 +5365,15 @@
|
|
1788 |
alias -g '${1+"$@"}'='"$@"'
|
|
1789 |
setopt NO_GLOB_SUBST
|
|
1790 |
else
|
|
1791 |
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
|
1792 |
+ case `(set -o) 2>/dev/null` in
|
|
1793 |
+ *posix*) set -o posix ;;
|
|
1794 |
+esac
|
|
1795 |
+
|
|
1796 |
fi
|
|
1797 |
-BIN_SH=xpg4; export BIN_SH # for Tru64
|
|
1798 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
1799 |
|
|
1800 |
|
|
1801 |
+
|
|
1802 |
+
|
|
1803 |
# PATH needs CR
|
|
1804 |
# Avoid depending upon Character Ranges.
|
|
1805 |
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
1806 |
@@ -5874,19 +5595,28 @@
|
|
1807 |
as_mkdir_p=false
|
|
1808 |
fi
|
|
1809 |
|
|
1810 |
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
|
|
1811 |
-# systems may use methods other than mode bits to determine executability.
|
|
1812 |
-cat >conf$$.file <<_ASEOF
|
|
1813 |
-#! /bin/sh
|
|
1814 |
-exit 0
|
|
1815 |
-_ASEOF
|
|
1816 |
-chmod +x conf$$.file
|
|
1817 |
-if test -x conf$$.file >/dev/null 2>&1; then
|
|
1818 |
- as_executable_p="test -x"
|
|
1819 |
+if test -x / >/dev/null 2>&1; then
|
|
1820 |
+ as_test_x='test -x'
|
|
1821 |
else
|
|
1822 |
- as_executable_p=:
|
|
1823 |
+ if ls -dL / >/dev/null 2>&1; then
|
|
1824 |
+ as_ls_L_option=L
|
|
1825 |
+ else
|
|
1826 |
+ as_ls_L_option=
|
|
1827 |
+ fi
|
|
1828 |
+ as_test_x='
|
|
1829 |
+ eval sh -c '\''
|
|
1830 |
+ if test -d "$1"; then
|
|
1831 |
+ test -d "$1/.";
|
|
1832 |
+ else
|
|
1833 |
+ case $1 in
|
|
1834 |
+ -*)set "./$1";;
|
|
1835 |
+ esac;
|
|
1836 |
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
1837 |
+ ???[sx]*):;;*)false;;esac;fi
|
|
1838 |
+ '\'' sh
|
|
1839 |
+ '
|
|
1840 |
fi
|
|
1841 |
-rm -f conf$$.file
|
|
1842 |
+as_executable_p=$as_test_x
|
|
1843 |
|
|
1844 |
# Sed expression to map a string onto a valid CPP name.
|
|
1845 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
1846 |
@@ -5902,7 +5632,7 @@
|
|
1847 |
# values after options handling.
|
|
1848 |
ac_log="
|
|
1849 |
This file was extended by pgbouncer $as_me 1.1.2, which was
|
|
1850 |
-generated by GNU Autoconf 2.60. Invocation command line was
|
|
1851 |
+generated by GNU Autoconf 2.61. Invocation command line was
|
|
1852 |
|
|
1853 |
CONFIG_FILES = $CONFIG_FILES
|
|
1854 |
CONFIG_HEADERS = $CONFIG_HEADERS
|
|
1855 |
@@ -5930,7 +5660,7 @@
|
|
1856 |
Usage: $0 [OPTIONS] [FILE]...
|
|
1857 |
|
|
1858 |
-h, --help print this help, then exit
|
|
1859 |
- -V, --version print version number, then exit
|
|
1860 |
+ -V, --version print version number and configuration settings, then exit
|
|
1861 |
-q, --quiet do not print progress messages
|
|
1862 |
-d, --debug don't remove temporary files
|
|
1863 |
--recheck update $as_me by reconfiguring in the same conditions
|
|
1864 |
@@ -5951,7 +5681,7 @@
|
|
1865 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
1866 |
ac_cs_version="\\
|
|
1867 |
pgbouncer config.status 1.1.2
|
|
1868 |
-configured by $0, generated by GNU Autoconf 2.60,
|
|
1869 |
+configured by $0, generated by GNU Autoconf 2.61,
|
|
1870 |
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
1871 |
|
|
1872 |
Copyright (C) 2006 Free Software Foundation, Inc.
|
|
1873 |
diff -r -u configure.ac solaris/configure.ac
|
|
1874 |
--- configure.ac Mon Dec 10 09:06:04 2007
|
|
1875 |
+++ solaris/configure.ac Wed Jan 30 09:45:51 2008
|
|
1876 |
@@ -79,7 +79,12 @@
|
|
1877 |
AC_CHECK_FUNCS(strlcpy strlcat getpeereid getpeerucred)
|
|
1878 |
AC_SEARCH_LIBS(crypt, crypt, [], AC_MSG_ERROR([crypt not found]))
|
|
1879 |
AC_SEARCH_LIBS(clock_gettime, rt)
|
|
1880 |
+AC_CHECK_LIB(socket, bind)
|
|
1881 |
+AC_CHECK_LIB(nsl, gethostbyname)
|
|
1882 |
+AC_CHECK_LIB(resolv, hstrerror)
|
|
1883 |
|
|
1884 |
+
|
|
1885 |
+
|
|
1886 |
dnl Find libevent
|
|
1887 |
AC_MSG_CHECKING([for libevent])
|
|
1888 |
AC_ARG_WITH(libevent,
|
|
1889 |
Common subdirectories: debian and solaris/debian
|
|
1890 |
Common subdirectories: doc and solaris/doc
|
|
1891 |
Common subdirectories: etc and solaris/etc
|
|
1892 |
Common subdirectories: src and solaris/src
|
|
1893 |
Common subdirectories: test and solaris/test
|
|
1894 |
diff -r -u doc/Makefile solaris/doc/Makefile
|
|
1895 |
--- doc/Makefile Mon Dec 10 09:06:04 2007
|
|
1896 |
+++ solaris/doc/Makefile Wed Jan 30 11:16:20 2008
|
|
1897 |
@@ -14,8 +14,8 @@
|
|
1898 |
install: $(MANPAGES)
|
|
1899 |
mkdir -p $(DESTDIR)$(mandir)/man1/
|
|
1900 |
mkdir -p $(DESTDIR)$(mandir)/man5/
|
|
1901 |
- install -m 644 pgbouncer.1 $(DESTDIR)$(mandir)/man1/
|
|
1902 |
- install -m 644 pgbouncer.5 $(DESTDIR)$(mandir)/man5/
|
|
1903 |
+ $(INSTALL) -m 644 pgbouncer.1 $(DESTDIR)$(mandir)/man1/
|
|
1904 |
+ $(INSTALL) -m 644 pgbouncer.5 $(DESTDIR)$(mandir)/man5/
|
|
1905 |
|
|
1906 |
upload:
|
|
1907 |
devupload.sh overview.txt $(wiki)
|
|
1908 |
Only in solaris/src: #sys #
|
|
1909 |
diff -r -u src/admin.c solaris/src/admin.c
|
|
1910 |
--- src/admin.c Mon Dec 10 09:06:04 2007
|
|
1911 |
+++ solaris/src/admin.c Mon Jan 7 09:00:39 2008
|
|
1912 |
@@ -163,7 +163,9 @@
|
|
1913 |
int res;
|
|
1914 |
struct iovec iovec;
|
|
1915 |
uint8 pktbuf[1024];
|
|
1916 |
+#if 0
|
|
1917 |
uint8 cntbuf[CMSG_SPACE(sizeof(int))];
|
|
1918 |
+#endif
|
|
1919 |
|
|
1920 |
iovec.iov_base = pktbuf;
|
|
1921 |
BUILD_DataRow(res, pktbuf, sizeof(pktbuf), "issssiqissss",
|
|
1922 |
@@ -180,9 +182,16 @@
|
|
1923 |
|
|
1924 |
/* attach a fd */
|
|
1925 |
if (admin->remote_addr.is_unix && admin->own_user) {
|
|
1926 |
+#if 0
|
|
1927 |
msg.msg_control = cntbuf;
|
|
1928 |
msg.msg_controllen = sizeof(cntbuf);
|
|
1929 |
+#else
|
|
1930 |
+ msg.msg_accrights = (void *) &fd;
|
|
1931 |
+ msg.msg_accrightslen = sizeof(fd);
|
|
1932 |
|
|
1933 |
+#endif
|
|
1934 |
+
|
|
1935 |
+#if 0
|
|
1936 |
cmsg = CMSG_FIRSTHDR(&msg);
|
|
1937 |
cmsg->cmsg_level = SOL_SOCKET;
|
|
1938 |
cmsg->cmsg_type = SCM_RIGHTS;
|
|
1939 |
@@ -189,11 +198,16 @@
|
|
1940 |
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
|
1941 |
|
|
1942 |
memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
|
|
1943 |
+
|
|
1944 |
msg.msg_controllen = cmsg->cmsg_len;
|
|
1945 |
+#endif
|
|
1946 |
}
|
|
1947 |
|
|
1948 |
+#if 0
|
|
1949 |
slog_debug(admin, "sending socket list: fd=%d, len=%d",
|
|
1950 |
fd, msg.msg_controllen);
|
|
1951 |
+#endif
|
|
1952 |
+
|
|
1953 |
res = safe_sendmsg(sbuf_socket(&admin->sbuf), &msg, 0);
|
|
1954 |
if (res < 0) {
|
|
1955 |
log_error("send_one_fd: sendmsg error: %s", strerror(errno));
|
|
1956 |
diff -r -u src/loader.c solaris/src/loader.c
|
|
1957 |
--- src/loader.c Mon Dec 10 09:06:04 2007
|
|
1958 |
+++ solaris/src/loader.c Wed Jan 30 09:37:05 2008
|
|
1959 |
@@ -24,6 +24,7 @@
|
|
1960 |
|
|
1961 |
#include <netdb.h>
|
|
1962 |
|
|
1963 |
+
|
|
1964 |
/*
|
|
1965 |
* ConnString parsing
|
|
1966 |
*/
|
|
1967 |
diff -r -u src/sbuf.h solaris/src/sbuf.h
|
|
1968 |
--- src/sbuf.h Mon Dec 10 09:06:04 2007
|
|
1969 |
+++ solaris/src/sbuf.h Wed Jan 30 09:29:55 2008
|
|
1970 |
@@ -63,7 +63,7 @@
|
|
1971 |
int pkt_remain; /* total packet length remaining */
|
|
1972 |
int send_remain; /* total data to be sent remaining */
|
|
1973 |
|
|
1974 |
- uint8 buf[0];
|
|
1975 |
+ uint8 buf[1];
|
|
1976 |
};
|
|
1977 |
|
|
1978 |
#define sbuf_socket(sbuf) ((sbuf)->sock)
|
|
1979 |
diff -r -u src/system.c solaris/src/system.c
|
|
1980 |
--- src/system.c Mon Dec 10 09:06:04 2007
|
|
1981 |
+++ solaris/src/system.c Mon Jan 7 09:00:51 2008
|
|
1982 |
@@ -29,6 +29,11 @@
|
|
1983 |
#include <sys/ucred.h>
|
|
1984 |
#endif
|
|
1985 |
|
|
1986 |
+#if 1
|
|
1987 |
+#include <ucred.h>
|
|
1988 |
+#endif
|
|
1989 |
+
|
|
1990 |
+
|
|
1991 |
/*
|
|
1992 |
* Minimal spec-conforming implementations of strlcpy(), strlcat().
|
|
1993 |
*/
|
|
1994 |
diff -r -u src/system.h solaris/src/system.h
|
|
1995 |
--- src/system.h Mon Dec 10 09:06:04 2007
|
|
1996 |
+++ solaris/src/system.h Wed Jan 30 09:37:13 2008
|
|
1997 |
@@ -26,7 +26,7 @@
|
|
1998 |
|
|
1999 |
#define _GNU_SOURCE
|
|
2000 |
|
|
2001 |
-#include <sys/errno.h>
|
|
2002 |
+#include <errno.h>
|
|
2003 |
#include <sys/types.h>
|
|
2004 |
#include <sys/time.h>
|
|
2005 |
#include <sys/socket.h>
|
|
2006 |
@@ -105,3 +105,17 @@
|
|
2007 |
int getpeereid(int fd, uid_t *uid_p, gid_t *gid_p);
|
|
2008 |
#endif
|
|
2009 |
|
|
2010 |
+
|
|
2011 |
+#if !defined (BYTE_ORDER)
|
|
2012 |
+ #ifdef _LITTLE_ENDIAN
|
|
2013 |
+ #define BYTE_ORDER LITTLE_ENDIAN
|
|
2014 |
+ #else
|
|
2015 |
+ #define BYTE_ORDER BIG_ENDIAN
|
|
2016 |
+ #endif
|
|
2017 |
+#endif
|
|
2018 |
+
|
|
2019 |
+
|
|
2020 |
+#ifndef INADDR_NONE
|
|
2021 |
+ #define INADDR_NONE ((in_addr_t)(-1))
|
|
2022 |
+#endif
|
|
2023 |
+
|
|
2024 |
diff -r -u src/takeover.c solaris/src/takeover.c
|
|
2025 |
--- src/takeover.c Mon Dec 10 09:06:04 2007
|
|
2026 |
+++ solaris/src/takeover.c Mon Jan 7 09:00:52 2008
|
|
2027 |
@@ -43,7 +43,7 @@
|
|
2028 |
static bool takeover_load_fd(MBuf *pkt, const struct cmsghdr *cmsg)
|
|
2029 |
{
|
|
2030 |
int fd;
|
|
2031 |
- char *task, *s_addr, *user, *db;
|
|
2032 |
+ char *task, *s_address, *user, *db;
|
|
2033 |
char *client_enc, *std_string, *datestyle, *timezone;
|
|
2034 |
int oldfd, port, linkfd;
|
|
2035 |
int got;
|
|
2036 |
@@ -52,6 +52,7 @@
|
|
2037 |
|
|
2038 |
memset(&addr, 0, sizeof(addr));
|
|
2039 |
|
|
2040 |
+#if 0
|
|
2041 |
if (cmsg->cmsg_level == SOL_SOCKET
|
|
2042 |
&& cmsg->cmsg_type == SCM_RIGHTS
|
|
2043 |
&& cmsg->cmsg_len >= CMSG_LEN(sizeof(int)))
|
|
2044 |
@@ -61,12 +62,13 @@
|
|
2045 |
log_debug("got fd: %d", fd);
|
|
2046 |
} else
|
|
2047 |
fatal("broken fd packet");
|
|
2048 |
+#endif
|
|
2049 |
|
|
2050 |
/* parse row contents */
|
|
2051 |
got = scan_text_result(pkt, "issssiqissss", &oldfd, &task, &user, &db,
|
|
2052 |
- &s_addr, &port, &ckey, &linkfd,
|
|
2053 |
+ &s_address, &port, &ckey, &linkfd,
|
|
2054 |
&client_enc, &std_string, &datestyle, &timezone);
|
|
2055 |
- if (task == NULL || s_addr == NULL)
|
|
2056 |
+ if (task == NULL || s_address == NULL)
|
|
2057 |
fatal("NULL data from old process");
|
|
2058 |
|
|
2059 |
log_debug("FD row: fd=%d(%d) linkfd=%d task=%s user=%s db=%s enc=%s",
|
|
2060 |
@@ -75,11 +77,11 @@
|
|
2061 |
client_enc ? client_enc : "NULL");
|
|
2062 |
|
|
2063 |
/* fill address */
|
|
2064 |
- addr.is_unix = strcmp(s_addr, "unix") == 0 ? true : false;
|
|
2065 |
+ addr.is_unix = strcmp(s_address, "unix") == 0 ? true : false;
|
|
2066 |
if (addr.is_unix) {
|
|
2067 |
addr.port = cf_listen_port;
|
|
2068 |
} else {
|
|
2069 |
- addr.ip_addr.s_addr = inet_addr(s_addr);
|
|
2070 |
+ addr.ip_addr.s_addr = inet_addr(s_address);
|
|
2071 |
addr.port = port;
|
|
2072 |
}
|
|
2073 |
|
|
2074 |
@@ -183,8 +185,12 @@
|
|
2075 |
{
|
|
2076 |
struct cmsghdr *cmsg;
|
|
2077 |
PktHdr pkt;
|
|
2078 |
-
|
|
2079 |
+
|
|
2080 |
+#if 0
|
|
2081 |
cmsg = msg->msg_controllen ? CMSG_FIRSTHDR(msg) : NULL;
|
|
2082 |
+#else
|
|
2083 |
+ cmsg = NULL;
|
|
2084 |
+#endif
|
|
2085 |
|
|
2086 |
while (mbuf_avail(data) > 0) {
|
|
2087 |
if (!get_header(data, &pkt))
|
|
2088 |
@@ -204,7 +210,9 @@
|
|
2089 |
log_debug("takeover_parse_data: 'D'");
|
|
2090 |
if (cmsg) {
|
|
2091 |
takeover_load_fd(&pkt.data, cmsg);
|
|
2092 |
+#if 0
|
|
2093 |
cmsg = CMSG_NXTHDR(msg, cmsg);
|
|
2094 |
+#endif
|
|
2095 |
} else
|
|
2096 |
fatal("got row without fd info");
|
|
2097 |
break;
|
|
2098 |
@@ -244,8 +252,10 @@
|
|
2099 |
io.iov_len = sizeof(data_buf);
|
|
2100 |
msg.msg_iov = &io;
|
|
2101 |
msg.msg_iovlen = 1;
|
|
2102 |
+#if 0
|
|
2103 |
msg.msg_control = cnt_buf;
|
|
2104 |
msg.msg_controllen = sizeof(cnt_buf);
|
|
2105 |
+#endif
|
|
2106 |
|
|
2107 |
res = safe_recvmsg(sock, &msg, 0);
|
|
2108 |
if (res > 0) {
|
|
2109 |
diff -r -u src/util.c solaris/src/util.c
|
|
2110 |
--- src/util.c Mon Dec 10 09:06:04 2007
|
|
2111 |
+++ solaris/src/util.c Mon Jan 7 09:00:52 2008
|
|
2112 |
@@ -251,10 +251,12 @@
|
|
2113 |
goto loop;
|
|
2114 |
|
|
2115 |
if (res < 0) {
|
|
2116 |
+#if 0
|
|
2117 |
log_warning("safe_sendmsg(%d, msg[%d,%d], %d) = %s", fd,
|
|
2118 |
msg->msg_iov[0].iov_len,
|
|
2119 |
msg->msg_controllen,
|
|
2120 |
flags, strerror(errno));
|
|
2121 |
+#endif
|
|
2122 |
|
|
2123 |
/* with ancillary data on blocking socket OSX returns
|
|
2124 |
* EMSGSIZE instead of blocking. try to solve it by waiting */
|
|
2125 |
diff -r -u src/util.h solaris/src/util.h
|
|
2126 |
--- src/util.h Mon Dec 10 09:06:04 2007
|
|
2127 |
+++ solaris/src/util.h Mon Jan 7 09:00:53 2008
|
|
2128 |
@@ -66,11 +66,11 @@
|
|
2129 |
void _fatal(const char *file, int line, const char *func, bool do_exit, const char *s, ...);
|
|
2130 |
void _fatal_perror(const char *file, int line, const char *func, const char *s, ...);
|
|
2131 |
#define fatal(args...) \
|
|
2132 |
- _fatal(__FILE__, __LINE__, __FUNCTION__, true, ## args)
|
|
2133 |
+ _fatal(__FILE__, __LINE__, __func__, true, ## args)
|
|
2134 |
#define fatal_noexit(args...) \
|
|
2135 |
- _fatal(__FILE__, __LINE__, __FUNCTION__, false, ## args)
|
|
2136 |
+ _fatal(__FILE__, __LINE__, __func__, false, ## args)
|
|
2137 |
#define fatal_perror(args...) \
|
|
2138 |
- _fatal_perror(__FILE__, __LINE__, __FUNCTION__, ## args)
|
|
2139 |
+ _fatal_perror(__FILE__, __LINE__, __func__, ## args)
|
|
2140 |
|
|
2141 |
/*
|
|
2142 |
* non-interruptible operations
|