diff options
Diffstat (limited to 'meta')
5 files changed, 14325 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch new file mode 100644 index 0000000000..a2018a7331 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch | |||
@@ -0,0 +1,14225 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From ccf671f5b7fbbef53d9cfd3091229b0b2a25159d Mon Sep 17 00:00:00 2001 | ||
4 | From: Edward Sheldrake <ejs1920@sourceforge.net> | ||
5 | Date: Wed, 13 Jun 2012 12:09:21 -0700 | ||
6 | Subject: [PATCH] Fix --disable-canusb. | ||
7 | |||
8 | Reviewed-By: Guy Harris <guy@alum.mit.edu> | ||
9 | --- | ||
10 | config.h.in | 3 - | ||
11 | configure |10672 ++++++++++++++++++++++++++++++++++++++++------------------ | ||
12 | configure.in | 2 +- | ||
13 | 3 files changed, 7308 insertions(+), 3369 deletions(-) | ||
14 | |||
15 | diff --git a/config.h.in b/config.h.in | ||
16 | index bd5177c..aed5c37 100644 | ||
17 | --- a/config.h.in | ||
18 | +++ b/config.h.in | ||
19 | @@ -232,9 +232,6 @@ | ||
20 | /* Define to the one symbol short name of this package. */ | ||
21 | #undef PACKAGE_TARNAME | ||
22 | |||
23 | -/* Define to the home page for this package. */ | ||
24 | -#undef PACKAGE_URL | ||
25 | - | ||
26 | /* Define to the version of this package. */ | ||
27 | #undef PACKAGE_VERSION | ||
28 | |||
29 | diff --git a/configure b/configure | ||
30 | index 29e0f35..b8b29be 100755 | ||
31 | --- a/configure | ||
32 | +++ b/configure | ||
33 | @@ -1,84 +1,61 @@ | ||
34 | #! /bin/sh | ||
35 | # From configure.in Revision: 1.168 . | ||
36 | # Guess values for system-dependent variables and create Makefiles. | ||
37 | -# Generated by GNU Autoconf 2.67. | ||
38 | -# | ||
39 | +# Generated by GNU Autoconf 2.61. | ||
40 | # | ||
41 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | ||
42 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software | ||
43 | -# Foundation, Inc. | ||
44 | -# | ||
45 | -# | ||
46 | +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
47 | # This configure script is free software; the Free Software Foundation | ||
48 | # gives unlimited permission to copy, distribute and modify it. | ||
49 | -## -------------------- ## | ||
50 | -## M4sh Initialization. ## | ||
51 | -## -------------------- ## | ||
52 | +## --------------------- ## | ||
53 | +## M4sh Initialization. ## | ||
54 | +## --------------------- ## | ||
55 | |||
56 | # Be more Bourne compatible | ||
57 | DUALCASE=1; export DUALCASE # for MKS sh | ||
58 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : | ||
59 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
60 | emulate sh | ||
61 | NULLCMD=: | ||
62 | - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | ||
63 | + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
64 | # is contrary to our usage. Disable this feature. | ||
65 | alias -g '${1+"$@"}'='"$@"' | ||
66 | setopt NO_GLOB_SUBST | ||
67 | else | ||
68 | - case `(set -o) 2>/dev/null` in #( | ||
69 | - *posix*) : | ||
70 | - set -o posix ;; #( | ||
71 | - *) : | ||
72 | - ;; | ||
73 | + case `(set -o) 2>/dev/null` in | ||
74 | + *posix*) set -o posix ;; | ||
75 | esac | ||
76 | + | ||
77 | fi | ||
78 | |||
79 | |||
80 | -as_nl=' | ||
81 | -' | ||
82 | -export as_nl | ||
83 | -# Printing a long string crashes Solaris 7 /usr/bin/printf. | ||
84 | -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | ||
85 | -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo | ||
86 | -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo | ||
87 | -# Prefer a ksh shell builtin over an external printf program on Solaris, | ||
88 | -# but without wasting forks for bash or zsh. | ||
89 | -if test -z "$BASH_VERSION$ZSH_VERSION" \ | ||
90 | - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
91 | - as_echo='print -r --' | ||
92 | - as_echo_n='print -rn --' | ||
93 | -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
94 | - as_echo='printf %s\n' | ||
95 | - as_echo_n='printf %s' | ||
96 | -else | ||
97 | - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then | ||
98 | - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' | ||
99 | - as_echo_n='/usr/ucb/echo -n' | ||
100 | + | ||
101 | + | ||
102 | +# PATH needs CR | ||
103 | +# Avoid depending upon Character Ranges. | ||
104 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
105 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
106 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
107 | +as_cr_digits='0123456789' | ||
108 | +as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
109 | + | ||
110 | +# The user is always right. | ||
111 | +if test "${PATH_SEPARATOR+set}" != set; then | ||
112 | + echo "#! /bin/sh" >conf$$.sh | ||
113 | + echo "exit 0" >>conf$$.sh | ||
114 | + chmod +x conf$$.sh | ||
115 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
116 | + PATH_SEPARATOR=';' | ||
117 | else | ||
118 | - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' | ||
119 | - as_echo_n_body='eval | ||
120 | - arg=$1; | ||
121 | - case $arg in #( | ||
122 | - *"$as_nl"*) | ||
123 | - expr "X$arg" : "X\\(.*\\)$as_nl"; | ||
124 | - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; | ||
125 | - esac; | ||
126 | - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" | ||
127 | - ' | ||
128 | - export as_echo_n_body | ||
129 | - as_echo_n='sh -c $as_echo_n_body as_echo' | ||
130 | + PATH_SEPARATOR=: | ||
131 | fi | ||
132 | - export as_echo_body | ||
133 | - as_echo='sh -c $as_echo_body as_echo' | ||
134 | + rm -f conf$$.sh | ||
135 | fi | ||
136 | |||
137 | -# The user is always right. | ||
138 | -if test "${PATH_SEPARATOR+set}" != set; then | ||
139 | - PATH_SEPARATOR=: | ||
140 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { | ||
141 | - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || | ||
142 | - PATH_SEPARATOR=';' | ||
143 | - } | ||
144 | +# Support unset when possible. | ||
145 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
146 | + as_unset=unset | ||
147 | +else | ||
148 | + as_unset=false | ||
149 | fi | ||
150 | |||
151 | |||
152 | @@ -87,18 +64,20 @@ fi | ||
153 | # there to prevent editors from complaining about space-tab. | ||
154 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word | ||
155 | # splitting by setting IFS to empty value.) | ||
156 | +as_nl=' | ||
157 | +' | ||
158 | IFS=" "" $as_nl" | ||
159 | |||
160 | # Find who we are. Look in the path if we contain no directory separator. | ||
161 | -case $0 in #(( | ||
162 | +case $0 in | ||
163 | *[\\/]* ) as_myself=$0 ;; | ||
164 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
165 | for as_dir in $PATH | ||
166 | do | ||
167 | IFS=$as_save_IFS | ||
168 | test -z "$as_dir" && as_dir=. | ||
169 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
170 | - done | ||
171 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
172 | +done | ||
173 | IFS=$as_save_IFS | ||
174 | |||
175 | ;; | ||
176 | @@ -109,270 +88,32 @@ if test "x$as_myself" = x; then | ||
177 | as_myself=$0 | ||
178 | fi | ||
179 | if test ! -f "$as_myself"; then | ||
180 | - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
181 | - exit 1 | ||
182 | + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
183 | + { (exit 1); exit 1; } | ||
184 | fi | ||
185 | |||
186 | -# Unset variables that we do not need and which cause bugs (e.g. in | ||
187 | -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" | ||
188 | -# suppresses any "Segmentation fault" message there. '((' could | ||
189 | -# trigger a bug in pdksh 5.2.14. | ||
190 | -for as_var in BASH_ENV ENV MAIL MAILPATH | ||
191 | -do eval test x\${$as_var+set} = xset \ | ||
192 | - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : | ||
193 | +# Work around bugs in pre-3.0 UWIN ksh. | ||
194 | +for as_var in ENV MAIL MAILPATH | ||
195 | +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
196 | done | ||
197 | PS1='$ ' | ||
198 | PS2='> ' | ||
199 | PS4='+ ' | ||
200 | |||
201 | # NLS nuisances. | ||
202 | -LC_ALL=C | ||
203 | -export LC_ALL | ||
204 | -LANGUAGE=C | ||
205 | -export LANGUAGE | ||
206 | - | ||
207 | -# CDPATH. | ||
208 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
209 | - | ||
210 | -if test "x$CONFIG_SHELL" = x; then | ||
211 | - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : | ||
212 | - emulate sh | ||
213 | - NULLCMD=: | ||
214 | - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which | ||
215 | - # is contrary to our usage. Disable this feature. | ||
216 | - alias -g '\${1+\"\$@\"}'='\"\$@\"' | ||
217 | - setopt NO_GLOB_SUBST | ||
218 | -else | ||
219 | - case \`(set -o) 2>/dev/null\` in #( | ||
220 | - *posix*) : | ||
221 | - set -o posix ;; #( | ||
222 | - *) : | ||
223 | - ;; | ||
224 | -esac | ||
225 | -fi | ||
226 | -" | ||
227 | - as_required="as_fn_return () { (exit \$1); } | ||
228 | -as_fn_success () { as_fn_return 0; } | ||
229 | -as_fn_failure () { as_fn_return 1; } | ||
230 | -as_fn_ret_success () { return 0; } | ||
231 | -as_fn_ret_failure () { return 1; } | ||
232 | - | ||
233 | -exitcode=0 | ||
234 | -as_fn_success || { exitcode=1; echo as_fn_success failed.; } | ||
235 | -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } | ||
236 | -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } | ||
237 | -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } | ||
238 | -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : | ||
239 | - | ||
240 | -else | ||
241 | - exitcode=1; echo positional parameters were not saved. | ||
242 | -fi | ||
243 | -test x\$exitcode = x0 || exit 1" | ||
244 | - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO | ||
245 | - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO | ||
246 | - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && | ||
247 | - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 | ||
248 | -test \$(( 1 + 1 )) = 2 || exit 1" | ||
249 | - if (eval "$as_required") 2>/dev/null; then : | ||
250 | - as_have_required=yes | ||
251 | -else | ||
252 | - as_have_required=no | ||
253 | -fi | ||
254 | - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : | ||
255 | - | ||
256 | -else | ||
257 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
258 | -as_found=false | ||
259 | -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
260 | +for as_var in \ | ||
261 | + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | ||
262 | + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
263 | + LC_TELEPHONE LC_TIME | ||
264 | do | ||
265 | - IFS=$as_save_IFS | ||
266 | - test -z "$as_dir" && as_dir=. | ||
267 | - as_found=: | ||
268 | - case $as_dir in #( | ||
269 | - /*) | ||
270 | - for as_base in sh bash ksh sh5; do | ||
271 | - # Try only shells that exist, to save several forks. | ||
272 | - as_shell=$as_dir/$as_base | ||
273 | - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | ||
274 | - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : | ||
275 | - CONFIG_SHELL=$as_shell as_have_required=yes | ||
276 | - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : | ||
277 | - break 2 | ||
278 | -fi | ||
279 | -fi | ||
280 | - done;; | ||
281 | - esac | ||
282 | - as_found=false | ||
283 | -done | ||
284 | -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && | ||
285 | - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : | ||
286 | - CONFIG_SHELL=$SHELL as_have_required=yes | ||
287 | -fi; } | ||
288 | -IFS=$as_save_IFS | ||
289 | - | ||
290 | - | ||
291 | - if test "x$CONFIG_SHELL" != x; then : | ||
292 | - # We cannot yet assume a decent shell, so we have to provide a | ||
293 | - # neutralization value for shells without unset; and this also | ||
294 | - # works around shells that cannot unset nonexistent variables. | ||
295 | - BASH_ENV=/dev/null | ||
296 | - ENV=/dev/null | ||
297 | - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | ||
298 | - export CONFIG_SHELL | ||
299 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | ||
300 | -fi | ||
301 | - | ||
302 | - if test x$as_have_required = xno; then : | ||
303 | - $as_echo "$0: This script requires a shell more modern than all" | ||
304 | - $as_echo "$0: the shells that I found on your system." | ||
305 | - if test x${ZSH_VERSION+set} = xset ; then | ||
306 | - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" | ||
307 | - $as_echo "$0: be upgraded to zsh 4.3.4 or later." | ||
308 | + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
309 | + eval $as_var=C; export $as_var | ||
310 | else | ||
311 | - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, | ||
312 | -$0: including any error possibly output before this | ||
313 | -$0: message. Then install a modern shell, or manually run | ||
314 | -$0: the script under such a shell if you do have one." | ||
315 | - fi | ||
316 | - exit 1 | ||
317 | -fi | ||
318 | -fi | ||
319 | -fi | ||
320 | -SHELL=${CONFIG_SHELL-/bin/sh} | ||
321 | -export SHELL | ||
322 | -# Unset more variables known to interfere with behavior of common tools. | ||
323 | -CLICOLOR_FORCE= GREP_OPTIONS= | ||
324 | -unset CLICOLOR_FORCE GREP_OPTIONS | ||
325 | - | ||
326 | -## --------------------- ## | ||
327 | -## M4sh Shell Functions. ## | ||
328 | -## --------------------- ## | ||
329 | -# as_fn_unset VAR | ||
330 | -# --------------- | ||
331 | -# Portably unset VAR. | ||
332 | -as_fn_unset () | ||
333 | -{ | ||
334 | - { eval $1=; unset $1;} | ||
335 | -} | ||
336 | -as_unset=as_fn_unset | ||
337 | - | ||
338 | -# as_fn_set_status STATUS | ||
339 | -# ----------------------- | ||
340 | -# Set $? to STATUS, without forking. | ||
341 | -as_fn_set_status () | ||
342 | -{ | ||
343 | - return $1 | ||
344 | -} # as_fn_set_status | ||
345 | - | ||
346 | -# as_fn_exit STATUS | ||
347 | -# ----------------- | ||
348 | -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. | ||
349 | -as_fn_exit () | ||
350 | -{ | ||
351 | - set +e | ||
352 | - as_fn_set_status $1 | ||
353 | - exit $1 | ||
354 | -} # as_fn_exit | ||
355 | - | ||
356 | -# as_fn_mkdir_p | ||
357 | -# ------------- | ||
358 | -# Create "$as_dir" as a directory, including parents if necessary. | ||
359 | -as_fn_mkdir_p () | ||
360 | -{ | ||
361 | - | ||
362 | - case $as_dir in #( | ||
363 | - -*) as_dir=./$as_dir;; | ||
364 | - esac | ||
365 | - test -d "$as_dir" || eval $as_mkdir_p || { | ||
366 | - as_dirs= | ||
367 | - while :; do | ||
368 | - case $as_dir in #( | ||
369 | - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | ||
370 | - *) as_qdir=$as_dir;; | ||
371 | - esac | ||
372 | - as_dirs="'$as_qdir' $as_dirs" | ||
373 | - as_dir=`$as_dirname -- "$as_dir" || | ||
374 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
375 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
376 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
377 | - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
378 | -$as_echo X"$as_dir" | | ||
379 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
380 | - s//\1/ | ||
381 | - q | ||
382 | - } | ||
383 | - /^X\(\/\/\)[^/].*/{ | ||
384 | - s//\1/ | ||
385 | - q | ||
386 | - } | ||
387 | - /^X\(\/\/\)$/{ | ||
388 | - s//\1/ | ||
389 | - q | ||
390 | - } | ||
391 | - /^X\(\/\).*/{ | ||
392 | - s//\1/ | ||
393 | - q | ||
394 | - } | ||
395 | - s/.*/./; q'` | ||
396 | - test -d "$as_dir" && break | ||
397 | - done | ||
398 | - test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
399 | - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" | ||
400 | - | ||
401 | - | ||
402 | -} # as_fn_mkdir_p | ||
403 | -# as_fn_append VAR VALUE | ||
404 | -# ---------------------- | ||
405 | -# Append the text in VALUE to the end of the definition contained in VAR. Take | ||
406 | -# advantage of any shell optimizations that allow amortized linear growth over | ||
407 | -# repeated appends, instead of the typical quadratic growth present in naive | ||
408 | -# implementations. | ||
409 | -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : | ||
410 | - eval 'as_fn_append () | ||
411 | - { | ||
412 | - eval $1+=\$2 | ||
413 | - }' | ||
414 | -else | ||
415 | - as_fn_append () | ||
416 | - { | ||
417 | - eval $1=\$$1\$2 | ||
418 | - } | ||
419 | -fi # as_fn_append | ||
420 | - | ||
421 | -# as_fn_arith ARG... | ||
422 | -# ------------------ | ||
423 | -# Perform arithmetic evaluation on the ARGs, and store the result in the | ||
424 | -# global $as_val. Take advantage of shells that can avoid forks. The arguments | ||
425 | -# must be portable across $(()) and expr. | ||
426 | -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : | ||
427 | - eval 'as_fn_arith () | ||
428 | - { | ||
429 | - as_val=$(( $* )) | ||
430 | - }' | ||
431 | -else | ||
432 | - as_fn_arith () | ||
433 | - { | ||
434 | - as_val=`expr "$@" || test $? -eq 1` | ||
435 | - } | ||
436 | -fi # as_fn_arith | ||
437 | - | ||
438 | - | ||
439 | -# as_fn_error STATUS ERROR [LINENO LOG_FD] | ||
440 | -# ---------------------------------------- | ||
441 | -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are | ||
442 | -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the | ||
443 | -# script with STATUS, using 1 if that was 0. | ||
444 | -as_fn_error () | ||
445 | -{ | ||
446 | - as_status=$1; test $as_status -eq 0 && as_status=1 | ||
447 | - if test "$4"; then | ||
448 | - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
449 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 | ||
450 | + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
451 | fi | ||
452 | - $as_echo "$as_me: error: $2" >&2 | ||
453 | - as_fn_exit $as_status | ||
454 | -} # as_fn_error | ||
455 | +done | ||
456 | |||
457 | +# Required to use basename. | ||
458 | if expr a : '\(a\)' >/dev/null 2>&1 && | ||
459 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
460 | as_expr=expr | ||
461 | @@ -386,17 +127,13 @@ else | ||
462 | as_basename=false | ||
463 | fi | ||
464 | |||
465 | -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
466 | - as_dirname=dirname | ||
467 | -else | ||
468 | - as_dirname=false | ||
469 | -fi | ||
470 | |||
471 | +# Name of the executable. | ||
472 | as_me=`$as_basename -- "$0" || | ||
473 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
474 | X"$0" : 'X\(//\)$' \| \ | ||
475 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
476 | -$as_echo X/"$0" | | ||
477 | +echo X/"$0" | | ||
478 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
479 | s//\1/ | ||
480 | q | ||
481 | @@ -411,149 +148,434 @@ $as_echo X/"$0" | | ||
482 | } | ||
483 | s/.*/./; q'` | ||
484 | |||
485 | -# Avoid depending upon Character Ranges. | ||
486 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
487 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
488 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
489 | -as_cr_digits='0123456789' | ||
490 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
491 | +# CDPATH. | ||
492 | +$as_unset CDPATH | ||
493 | |||
494 | |||
495 | - as_lineno_1=$LINENO as_lineno_1a=$LINENO | ||
496 | - as_lineno_2=$LINENO as_lineno_2a=$LINENO | ||
497 | - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && | ||
498 | - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { | ||
499 | - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) | ||
500 | - sed -n ' | ||
501 | - p | ||
502 | - /[$]LINENO/= | ||
503 | - ' <$as_myself | | ||
504 | - sed ' | ||
505 | - s/[$]LINENO.*/&-/ | ||
506 | - t lineno | ||
507 | - b | ||
508 | - :lineno | ||
509 | - N | ||
510 | - :loop | ||
511 | - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | ||
512 | - t loop | ||
513 | - s/-\n.*// | ||
514 | - ' >$as_me.lineno && | ||
515 | - chmod +x "$as_me.lineno" || | ||
516 | - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } | ||
517 | +if test "x$CONFIG_SHELL" = x; then | ||
518 | + if (eval ":") 2>/dev/null; then | ||
519 | + as_have_required=yes | ||
520 | +else | ||
521 | + as_have_required=no | ||
522 | +fi | ||
523 | |||
524 | - # Don't try to exec as it changes $[0], causing all sort of problems | ||
525 | - # (the dirname of $[0] is not the place where we might find the | ||
526 | - # original and so on. Autoconf is especially sensitive to this). | ||
527 | - . "./$as_me.lineno" | ||
528 | - # Exit status is that of the last command. | ||
529 | - exit | ||
530 | + if test $as_have_required = yes && (eval ": | ||
531 | +(as_func_return () { | ||
532 | + (exit \$1) | ||
533 | +} | ||
534 | +as_func_success () { | ||
535 | + as_func_return 0 | ||
536 | +} | ||
537 | +as_func_failure () { | ||
538 | + as_func_return 1 | ||
539 | +} | ||
540 | +as_func_ret_success () { | ||
541 | + return 0 | ||
542 | +} | ||
543 | +as_func_ret_failure () { | ||
544 | + return 1 | ||
545 | } | ||
546 | |||
547 | -ECHO_C= ECHO_N= ECHO_T= | ||
548 | -case `echo -n x` in #((((( | ||
549 | --n*) | ||
550 | - case `echo 'xy\c'` in | ||
551 | - *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
552 | - xy) ECHO_C='\c';; | ||
553 | - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null | ||
554 | - ECHO_T=' ';; | ||
555 | - esac;; | ||
556 | -*) | ||
557 | - ECHO_N='-n';; | ||
558 | -esac | ||
559 | - | ||
560 | -rm -f conf$$ conf$$.exe conf$$.file | ||
561 | -if test -d conf$$.dir; then | ||
562 | - rm -f conf$$.dir/conf$$.file | ||
563 | -else | ||
564 | - rm -f conf$$.dir | ||
565 | - mkdir conf$$.dir 2>/dev/null | ||
566 | -fi | ||
567 | -if (echo >conf$$.file) 2>/dev/null; then | ||
568 | - if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
569 | - as_ln_s='ln -s' | ||
570 | - # ... but there are two gotchas: | ||
571 | - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | ||
572 | - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | ||
573 | - # In both cases, we have to default to `cp -p'. | ||
574 | - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
575 | - as_ln_s='cp -p' | ||
576 | - elif ln conf$$.file conf$$ 2>/dev/null; then | ||
577 | - as_ln_s=ln | ||
578 | - else | ||
579 | - as_ln_s='cp -p' | ||
580 | - fi | ||
581 | +exitcode=0 | ||
582 | +if as_func_success; then | ||
583 | + : | ||
584 | else | ||
585 | - as_ln_s='cp -p' | ||
586 | + exitcode=1 | ||
587 | + echo as_func_success failed. | ||
588 | fi | ||
589 | -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | ||
590 | -rmdir conf$$.dir 2>/dev/null | ||
591 | |||
592 | -if mkdir -p . 2>/dev/null; then | ||
593 | - as_mkdir_p='mkdir -p "$as_dir"' | ||
594 | +if as_func_failure; then | ||
595 | + exitcode=1 | ||
596 | + echo as_func_failure succeeded. | ||
597 | +fi | ||
598 | + | ||
599 | +if as_func_ret_success; then | ||
600 | + : | ||
601 | else | ||
602 | - test -d ./-p && rmdir ./-p | ||
603 | - as_mkdir_p=false | ||
604 | + exitcode=1 | ||
605 | + echo as_func_ret_success failed. | ||
606 | fi | ||
607 | |||
608 | -if test -x / >/dev/null 2>&1; then | ||
609 | - as_test_x='test -x' | ||
610 | +if as_func_ret_failure; then | ||
611 | + exitcode=1 | ||
612 | + echo as_func_ret_failure succeeded. | ||
613 | +fi | ||
614 | + | ||
615 | +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
616 | + : | ||
617 | else | ||
618 | - if ls -dL / >/dev/null 2>&1; then | ||
619 | - as_ls_L_option=L | ||
620 | - else | ||
621 | - as_ls_L_option= | ||
622 | - fi | ||
623 | - as_test_x=' | ||
624 | - eval sh -c '\'' | ||
625 | - if test -d "$1"; then | ||
626 | - test -d "$1/."; | ||
627 | - else | ||
628 | - case $1 in #( | ||
629 | - -*)set "./$1";; | ||
630 | - esac; | ||
631 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
632 | - ???[sx]*):;;*)false;;esac;fi | ||
633 | - '\'' sh | ||
634 | - ' | ||
635 | + exitcode=1 | ||
636 | + echo positional parameters were not saved. | ||
637 | fi | ||
638 | -as_executable_p=$as_test_x | ||
639 | |||
640 | -# Sed expression to map a string onto a valid CPP name. | ||
641 | -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
642 | +test \$exitcode = 0) || { (exit 1); exit 1; } | ||
643 | |||
644 | -# Sed expression to map a string onto a valid variable name. | ||
645 | -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
646 | +( | ||
647 | + as_lineno_1=\$LINENO | ||
648 | + as_lineno_2=\$LINENO | ||
649 | + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && | ||
650 | + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } | ||
651 | +") 2> /dev/null; then | ||
652 | + : | ||
653 | +else | ||
654 | + as_candidate_shells= | ||
655 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
656 | +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
657 | +do | ||
658 | + IFS=$as_save_IFS | ||
659 | + test -z "$as_dir" && as_dir=. | ||
660 | + case $as_dir in | ||
661 | + /*) | ||
662 | + for as_base in sh bash ksh sh5; do | ||
663 | + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" | ||
664 | + done;; | ||
665 | + esac | ||
666 | +done | ||
667 | +IFS=$as_save_IFS | ||
668 | |||
669 | |||
670 | -test -n "$DJDIR" || exec 7<&0 </dev/null | ||
671 | -exec 6>&1 | ||
672 | + for as_shell in $as_candidate_shells $SHELL; do | ||
673 | + # Try only shells that exist, to save several forks. | ||
674 | + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | ||
675 | + { ("$as_shell") 2> /dev/null <<\_ASEOF | ||
676 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
677 | + emulate sh | ||
678 | + NULLCMD=: | ||
679 | + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
680 | + # is contrary to our usage. Disable this feature. | ||
681 | + alias -g '${1+"$@"}'='"$@"' | ||
682 | + setopt NO_GLOB_SUBST | ||
683 | +else | ||
684 | + case `(set -o) 2>/dev/null` in | ||
685 | + *posix*) set -o posix ;; | ||
686 | +esac | ||
687 | |||
688 | -# Name of the host. | ||
689 | -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, | ||
690 | -# so uname gets run too. | ||
691 | -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | ||
692 | +fi | ||
693 | |||
694 | -# | ||
695 | -# Initializations. | ||
696 | -# | ||
697 | -ac_default_prefix=/usr/local | ||
698 | -ac_clean_files= | ||
699 | -ac_config_libobj_dir=. | ||
700 | -LIBOBJS= | ||
701 | -cross_compiling=no | ||
702 | -subdirs= | ||
703 | -MFLAGS= | ||
704 | -MAKEFLAGS= | ||
705 | |||
706 | -# Identity of this package. | ||
707 | -PACKAGE_NAME= | ||
708 | +: | ||
709 | +_ASEOF | ||
710 | +}; then | ||
711 | + CONFIG_SHELL=$as_shell | ||
712 | + as_have_required=yes | ||
713 | + if { "$as_shell" 2> /dev/null <<\_ASEOF | ||
714 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
715 | + emulate sh | ||
716 | + NULLCMD=: | ||
717 | + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
718 | + # is contrary to our usage. Disable this feature. | ||
719 | + alias -g '${1+"$@"}'='"$@"' | ||
720 | + setopt NO_GLOB_SUBST | ||
721 | +else | ||
722 | + case `(set -o) 2>/dev/null` in | ||
723 | + *posix*) set -o posix ;; | ||
724 | +esac | ||
725 | + | ||
726 | +fi | ||
727 | + | ||
728 | + | ||
729 | +: | ||
730 | +(as_func_return () { | ||
731 | + (exit $1) | ||
732 | +} | ||
733 | +as_func_success () { | ||
734 | + as_func_return 0 | ||
735 | +} | ||
736 | +as_func_failure () { | ||
737 | + as_func_return 1 | ||
738 | +} | ||
739 | +as_func_ret_success () { | ||
740 | + return 0 | ||
741 | +} | ||
742 | +as_func_ret_failure () { | ||
743 | + return 1 | ||
744 | +} | ||
745 | + | ||
746 | +exitcode=0 | ||
747 | +if as_func_success; then | ||
748 | + : | ||
749 | +else | ||
750 | + exitcode=1 | ||
751 | + echo as_func_success failed. | ||
752 | +fi | ||
753 | + | ||
754 | +if as_func_failure; then | ||
755 | + exitcode=1 | ||
756 | + echo as_func_failure succeeded. | ||
757 | +fi | ||
758 | + | ||
759 | +if as_func_ret_success; then | ||
760 | + : | ||
761 | +else | ||
762 | + exitcode=1 | ||
763 | + echo as_func_ret_success failed. | ||
764 | +fi | ||
765 | + | ||
766 | +if as_func_ret_failure; then | ||
767 | + exitcode=1 | ||
768 | + echo as_func_ret_failure succeeded. | ||
769 | +fi | ||
770 | + | ||
771 | +if ( set x; as_func_ret_success y && test x = "$1" ); then | ||
772 | + : | ||
773 | +else | ||
774 | + exitcode=1 | ||
775 | + echo positional parameters were not saved. | ||
776 | +fi | ||
777 | + | ||
778 | +test $exitcode = 0) || { (exit 1); exit 1; } | ||
779 | + | ||
780 | +( | ||
781 | + as_lineno_1=$LINENO | ||
782 | + as_lineno_2=$LINENO | ||
783 | + test "x$as_lineno_1" != "x$as_lineno_2" && | ||
784 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } | ||
785 | + | ||
786 | +_ASEOF | ||
787 | +}; then | ||
788 | + break | ||
789 | +fi | ||
790 | + | ||
791 | +fi | ||
792 | + | ||
793 | + done | ||
794 | + | ||
795 | + if test "x$CONFIG_SHELL" != x; then | ||
796 | + for as_var in BASH_ENV ENV | ||
797 | + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
798 | + done | ||
799 | + export CONFIG_SHELL | ||
800 | + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | ||
801 | +fi | ||
802 | + | ||
803 | + | ||
804 | + if test $as_have_required = no; then | ||
805 | + echo This script requires a shell more modern than all the | ||
806 | + echo shells that I found on your system. Please install a | ||
807 | + echo modern shell, or manually run the script under such a | ||
808 | + echo shell if you do have one. | ||
809 | + { (exit 1); exit 1; } | ||
810 | +fi | ||
811 | + | ||
812 | + | ||
813 | +fi | ||
814 | + | ||
815 | +fi | ||
816 | + | ||
817 | + | ||
818 | + | ||
819 | +(eval "as_func_return () { | ||
820 | + (exit \$1) | ||
821 | +} | ||
822 | +as_func_success () { | ||
823 | + as_func_return 0 | ||
824 | +} | ||
825 | +as_func_failure () { | ||
826 | + as_func_return 1 | ||
827 | +} | ||
828 | +as_func_ret_success () { | ||
829 | + return 0 | ||
830 | +} | ||
831 | +as_func_ret_failure () { | ||
832 | + return 1 | ||
833 | +} | ||
834 | + | ||
835 | +exitcode=0 | ||
836 | +if as_func_success; then | ||
837 | + : | ||
838 | +else | ||
839 | + exitcode=1 | ||
840 | + echo as_func_success failed. | ||
841 | +fi | ||
842 | + | ||
843 | +if as_func_failure; then | ||
844 | + exitcode=1 | ||
845 | + echo as_func_failure succeeded. | ||
846 | +fi | ||
847 | + | ||
848 | +if as_func_ret_success; then | ||
849 | + : | ||
850 | +else | ||
851 | + exitcode=1 | ||
852 | + echo as_func_ret_success failed. | ||
853 | +fi | ||
854 | + | ||
855 | +if as_func_ret_failure; then | ||
856 | + exitcode=1 | ||
857 | + echo as_func_ret_failure succeeded. | ||
858 | +fi | ||
859 | + | ||
860 | +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
861 | + : | ||
862 | +else | ||
863 | + exitcode=1 | ||
864 | + echo positional parameters were not saved. | ||
865 | +fi | ||
866 | + | ||
867 | +test \$exitcode = 0") || { | ||
868 | + echo No shell found that supports shell functions. | ||
869 | + echo Please tell autoconf@gnu.org about your system, | ||
870 | + echo including any error possibly output before this | ||
871 | + echo message | ||
872 | +} | ||
873 | + | ||
874 | + | ||
875 | + | ||
876 | + as_lineno_1=$LINENO | ||
877 | + as_lineno_2=$LINENO | ||
878 | + test "x$as_lineno_1" != "x$as_lineno_2" && | ||
879 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | ||
880 | + | ||
881 | + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
882 | + # uniformly replaced by the line number. The first 'sed' inserts a | ||
883 | + # line-number line after each line using $LINENO; the second 'sed' | ||
884 | + # does the real work. The second script uses 'N' to pair each | ||
885 | + # line-number line with the line containing $LINENO, and appends | ||
886 | + # trailing '-' during substitution so that $LINENO is not a special | ||
887 | + # case at line end. | ||
888 | + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
889 | + # scripts with optimization help from Paolo Bonzini. Blame Lee | ||
890 | + # E. McMahon (1931-1989) for sed's syntax. :-) | ||
891 | + sed -n ' | ||
892 | + p | ||
893 | + /[$]LINENO/= | ||
894 | + ' <$as_myself | | ||
895 | + sed ' | ||
896 | + s/[$]LINENO.*/&-/ | ||
897 | + t lineno | ||
898 | + b | ||
899 | + :lineno | ||
900 | + N | ||
901 | + :loop | ||
902 | + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | ||
903 | + t loop | ||
904 | + s/-\n.*// | ||
905 | + ' >$as_me.lineno && | ||
906 | + chmod +x "$as_me.lineno" || | ||
907 | + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
908 | + { (exit 1); exit 1; }; } | ||
909 | + | ||
910 | + # Don't try to exec as it changes $[0], causing all sort of problems | ||
911 | + # (the dirname of $[0] is not the place where we might find the | ||
912 | + # original and so on. Autoconf is especially sensitive to this). | ||
913 | + . "./$as_me.lineno" | ||
914 | + # Exit status is that of the last command. | ||
915 | + exit | ||
916 | +} | ||
917 | + | ||
918 | + | ||
919 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
920 | + as_dirname=dirname | ||
921 | +else | ||
922 | + as_dirname=false | ||
923 | +fi | ||
924 | + | ||
925 | +ECHO_C= ECHO_N= ECHO_T= | ||
926 | +case `echo -n x` in | ||
927 | +-n*) | ||
928 | + case `echo 'x\c'` in | ||
929 | + *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
930 | + *) ECHO_C='\c';; | ||
931 | + esac;; | ||
932 | +*) | ||
933 | + ECHO_N='-n';; | ||
934 | +esac | ||
935 | + | ||
936 | +if expr a : '\(a\)' >/dev/null 2>&1 && | ||
937 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
938 | + as_expr=expr | ||
939 | +else | ||
940 | + as_expr=false | ||
941 | +fi | ||
942 | + | ||
943 | +rm -f conf$$ conf$$.exe conf$$.file | ||
944 | +if test -d conf$$.dir; then | ||
945 | + rm -f conf$$.dir/conf$$.file | ||
946 | +else | ||
947 | + rm -f conf$$.dir | ||
948 | + mkdir conf$$.dir | ||
949 | +fi | ||
950 | +echo >conf$$.file | ||
951 | +if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
952 | + as_ln_s='ln -s' | ||
953 | + # ... but there are two gotchas: | ||
954 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | ||
955 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | ||
956 | + # In both cases, we have to default to `cp -p'. | ||
957 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
958 | + as_ln_s='cp -p' | ||
959 | +elif ln conf$$.file conf$$ 2>/dev/null; then | ||
960 | + as_ln_s=ln | ||
961 | +else | ||
962 | + as_ln_s='cp -p' | ||
963 | +fi | ||
964 | +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | ||
965 | +rmdir conf$$.dir 2>/dev/null | ||
966 | + | ||
967 | +if mkdir -p . 2>/dev/null; then | ||
968 | + as_mkdir_p=: | ||
969 | +else | ||
970 | + test -d ./-p && rmdir ./-p | ||
971 | + as_mkdir_p=false | ||
972 | +fi | ||
973 | + | ||
974 | +if test -x / >/dev/null 2>&1; then | ||
975 | + as_test_x='test -x' | ||
976 | +else | ||
977 | + if ls -dL / >/dev/null 2>&1; then | ||
978 | + as_ls_L_option=L | ||
979 | + else | ||
980 | + as_ls_L_option= | ||
981 | + fi | ||
982 | + as_test_x=' | ||
983 | + eval sh -c '\'' | ||
984 | + if test -d "$1"; then | ||
985 | + test -d "$1/."; | ||
986 | + else | ||
987 | + case $1 in | ||
988 | + -*)set "./$1";; | ||
989 | + esac; | ||
990 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | ||
991 | + ???[sx]*):;;*)false;;esac;fi | ||
992 | + '\'' sh | ||
993 | + ' | ||
994 | +fi | ||
995 | +as_executable_p=$as_test_x | ||
996 | + | ||
997 | +# Sed expression to map a string onto a valid CPP name. | ||
998 | +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
999 | + | ||
1000 | +# Sed expression to map a string onto a valid variable name. | ||
1001 | +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
1002 | + | ||
1003 | + | ||
1004 | + | ||
1005 | +exec 7<&0 </dev/null 6>&1 | ||
1006 | + | ||
1007 | +# Name of the host. | ||
1008 | +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | ||
1009 | +# so uname gets run too. | ||
1010 | +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | ||
1011 | + | ||
1012 | +# | ||
1013 | +# Initializations. | ||
1014 | +# | ||
1015 | +ac_default_prefix=/usr/local | ||
1016 | +ac_clean_files= | ||
1017 | +ac_config_libobj_dir=. | ||
1018 | +LIBOBJS= | ||
1019 | +cross_compiling=no | ||
1020 | +subdirs= | ||
1021 | +MFLAGS= | ||
1022 | +MAKEFLAGS= | ||
1023 | +SHELL=${CONFIG_SHELL-/bin/sh} | ||
1024 | + | ||
1025 | +# Identity of this package. | ||
1026 | +PACKAGE_NAME= | ||
1027 | PACKAGE_TARNAME= | ||
1028 | PACKAGE_VERSION= | ||
1029 | PACKAGE_STRING= | ||
1030 | PACKAGE_BUGREPORT= | ||
1031 | -PACKAGE_URL= | ||
1032 | |||
1033 | ac_unique_file="pcap.c" | ||
1034 | # Factoring default headers for most tests. | ||
1035 | @@ -592,128 +614,102 @@ ac_includes_default="\ | ||
1036 | # include <unistd.h> | ||
1037 | #endif" | ||
1038 | |||
1039 | -ac_subst_vars='LTLIBOBJS | ||
1040 | -INSTALL_DATA | ||
1041 | -INSTALL_SCRIPT | ||
1042 | -INSTALL_PROGRAM | ||
1043 | -CAN_SRC | ||
1044 | -PCAP_SUPPORT_CAN | ||
1045 | -CANUSB_SRC | ||
1046 | -PCAP_SUPPORT_CANUSB | ||
1047 | -BT_SRC | ||
1048 | -PCAP_SUPPORT_BT | ||
1049 | -NETFILTER_SRC | ||
1050 | -PCAP_SUPPORT_NETFILTER | ||
1051 | -USB_SRC | ||
1052 | -PCAP_SUPPORT_USB | ||
1053 | -MAN_MISC_INFO | ||
1054 | -MAN_FILE_FORMATS | ||
1055 | -DYEXT | ||
1056 | -SSRC | ||
1057 | -ADDLARCHIVEOBJS | ||
1058 | -ADDLOBJS | ||
1059 | -V_RPATH_OPT | ||
1060 | -V_SONAME_OPT | ||
1061 | -V_SHLIB_OPT | ||
1062 | -V_SHLIB_CMD | ||
1063 | -V_PCAP | ||
1064 | -V_INCLS | ||
1065 | -V_FINDALLDEVS | ||
1066 | -V_DEFS | ||
1067 | -V_CCOPT | ||
1068 | -AR | ||
1069 | -RANLIB | ||
1070 | -V_YACC | ||
1071 | -V_LEX | ||
1072 | -HAVE_LINUX_TPACKET_AUXDATA | ||
1073 | -LIBOBJS | ||
1074 | -EGREP | ||
1075 | -GREP | ||
1076 | -CPP | ||
1077 | -OBJEXT | ||
1078 | -EXEEXT | ||
1079 | -ac_ct_CC | ||
1080 | -CPPFLAGS | ||
1081 | -LDFLAGS | ||
1082 | -CFLAGS | ||
1083 | -CC | ||
1084 | -SHLICC2 | ||
1085 | -target_os | ||
1086 | -target_vendor | ||
1087 | -target_cpu | ||
1088 | -target | ||
1089 | -host_os | ||
1090 | -host_vendor | ||
1091 | -host_cpu | ||
1092 | -host | ||
1093 | -build_os | ||
1094 | -build_vendor | ||
1095 | -build_cpu | ||
1096 | -build | ||
1097 | -target_alias | ||
1098 | -host_alias | ||
1099 | -build_alias | ||
1100 | -LIBS | ||
1101 | -ECHO_T | ||
1102 | -ECHO_N | ||
1103 | -ECHO_C | ||
1104 | -DEFS | ||
1105 | -mandir | ||
1106 | -localedir | ||
1107 | -libdir | ||
1108 | -psdir | ||
1109 | -pdfdir | ||
1110 | -dvidir | ||
1111 | -htmldir | ||
1112 | -infodir | ||
1113 | -docdir | ||
1114 | -oldincludedir | ||
1115 | -includedir | ||
1116 | -localstatedir | ||
1117 | -sharedstatedir | ||
1118 | -sysconfdir | ||
1119 | -datadir | ||
1120 | -datarootdir | ||
1121 | -libexecdir | ||
1122 | -sbindir | ||
1123 | -bindir | ||
1124 | -program_transform_name | ||
1125 | -prefix | ||
1126 | -exec_prefix | ||
1127 | -PACKAGE_URL | ||
1128 | -PACKAGE_BUGREPORT | ||
1129 | -PACKAGE_STRING | ||
1130 | -PACKAGE_VERSION | ||
1131 | -PACKAGE_TARNAME | ||
1132 | -PACKAGE_NAME | ||
1133 | +ac_subst_vars='SHELL | ||
1134 | PATH_SEPARATOR | ||
1135 | -SHELL' | ||
1136 | +PACKAGE_NAME | ||
1137 | +PACKAGE_TARNAME | ||
1138 | +PACKAGE_VERSION | ||
1139 | +PACKAGE_STRING | ||
1140 | +PACKAGE_BUGREPORT | ||
1141 | +exec_prefix | ||
1142 | +prefix | ||
1143 | +program_transform_name | ||
1144 | +bindir | ||
1145 | +sbindir | ||
1146 | +libexecdir | ||
1147 | +datarootdir | ||
1148 | +datadir | ||
1149 | +sysconfdir | ||
1150 | +sharedstatedir | ||
1151 | +localstatedir | ||
1152 | +includedir | ||
1153 | +oldincludedir | ||
1154 | +docdir | ||
1155 | +infodir | ||
1156 | +htmldir | ||
1157 | +dvidir | ||
1158 | +pdfdir | ||
1159 | +psdir | ||
1160 | +libdir | ||
1161 | +localedir | ||
1162 | +mandir | ||
1163 | +DEFS | ||
1164 | +ECHO_C | ||
1165 | +ECHO_N | ||
1166 | +ECHO_T | ||
1167 | +LIBS | ||
1168 | +build_alias | ||
1169 | +host_alias | ||
1170 | +target_alias | ||
1171 | +build | ||
1172 | +build_cpu | ||
1173 | +build_vendor | ||
1174 | +build_os | ||
1175 | +host | ||
1176 | +host_cpu | ||
1177 | +host_vendor | ||
1178 | +host_os | ||
1179 | +target | ||
1180 | +target_cpu | ||
1181 | +target_vendor | ||
1182 | +target_os | ||
1183 | +SHLICC2 | ||
1184 | +CC | ||
1185 | +CFLAGS | ||
1186 | +LDFLAGS | ||
1187 | +CPPFLAGS | ||
1188 | +ac_ct_CC | ||
1189 | +EXEEXT | ||
1190 | +OBJEXT | ||
1191 | +CPP | ||
1192 | +GREP | ||
1193 | +EGREP | ||
1194 | +LIBOBJS | ||
1195 | +HAVE_LINUX_TPACKET_AUXDATA | ||
1196 | +V_LEX | ||
1197 | +V_YACC | ||
1198 | +RANLIB | ||
1199 | +AR | ||
1200 | +V_CCOPT | ||
1201 | +V_DEFS | ||
1202 | +V_FINDALLDEVS | ||
1203 | +V_INCLS | ||
1204 | +V_PCAP | ||
1205 | +V_SHLIB_CMD | ||
1206 | +V_SHLIB_OPT | ||
1207 | +V_SONAME_OPT | ||
1208 | +V_RPATH_OPT | ||
1209 | +ADDLOBJS | ||
1210 | +ADDLARCHIVEOBJS | ||
1211 | +SSRC | ||
1212 | +DYEXT | ||
1213 | +MAN_FILE_FORMATS | ||
1214 | +MAN_MISC_INFO | ||
1215 | +PCAP_SUPPORT_USB | ||
1216 | +USB_SRC | ||
1217 | +PCAP_SUPPORT_NETFILTER | ||
1218 | +NETFILTER_SRC | ||
1219 | +PCAP_SUPPORT_BT | ||
1220 | +BT_SRC | ||
1221 | +PCAP_SUPPORT_CANUSB | ||
1222 | +CANUSB_SRC | ||
1223 | +PCAP_SUPPORT_CAN | ||
1224 | +CAN_SRC | ||
1225 | +INSTALL_PROGRAM | ||
1226 | +INSTALL_SCRIPT | ||
1227 | +INSTALL_DATA | ||
1228 | +LTLIBOBJS' | ||
1229 | ac_subst_files='' | ||
1230 | -ac_user_opts=' | ||
1231 | -enable_option_checking | ||
1232 | -with_gcc | ||
1233 | -enable_largefile | ||
1234 | -enable_protochain | ||
1235 | -with_sita | ||
1236 | -with_pcap | ||
1237 | -with_libnl | ||
1238 | -enable_ipv6 | ||
1239 | -enable_optimizer_dbg | ||
1240 | -enable_yydebug | ||
1241 | -with_dag | ||
1242 | -with_dag_includes | ||
1243 | -with_dag_libraries | ||
1244 | -with_septel | ||
1245 | -with_snf | ||
1246 | -with_snf_includes | ||
1247 | -with_snf_libraries | ||
1248 | -with_flex | ||
1249 | -with_bison | ||
1250 | -enable_universal | ||
1251 | -enable_bluetooth | ||
1252 | -enable_canusb | ||
1253 | -enable_can | ||
1254 | -' | ||
1255 | ac_precious_vars='build_alias | ||
1256 | host_alias | ||
1257 | target_alias | ||
1258 | @@ -728,8 +724,6 @@ CPP' | ||
1259 | # Initialize some variables set by options. | ||
1260 | ac_init_help= | ||
1261 | ac_init_version=false | ||
1262 | -ac_unrecognized_opts= | ||
1263 | -ac_unrecognized_sep= | ||
1264 | # The variables have the same names as the options, with | ||
1265 | # dashes changed to underlines. | ||
1266 | cache_file=/dev/null | ||
1267 | @@ -785,9 +779,8 @@ do | ||
1268 | fi | ||
1269 | |||
1270 | case $ac_option in | ||
1271 | - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | ||
1272 | - *=) ac_optarg= ;; | ||
1273 | - *) ac_optarg=yes ;; | ||
1274 | + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | ||
1275 | + *) ac_optarg=yes ;; | ||
1276 | esac | ||
1277 | |||
1278 | # Accept the important Cygnus configure options, so we can diagnose typos. | ||
1279 | @@ -829,20 +822,13 @@ do | ||
1280 | datarootdir=$ac_optarg ;; | ||
1281 | |||
1282 | -disable-* | --disable-*) | ||
1283 | - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | ||
1284 | + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | ||
1285 | # Reject names that are not valid shell variable names. | ||
1286 | - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
1287 | - as_fn_error $? "invalid feature name: $ac_useropt" | ||
1288 | - ac_useropt_orig=$ac_useropt | ||
1289 | - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
1290 | - case $ac_user_opts in | ||
1291 | - *" | ||
1292 | -"enable_$ac_useropt" | ||
1293 | -"*) ;; | ||
1294 | - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" | ||
1295 | - ac_unrecognized_sep=', ';; | ||
1296 | - esac | ||
1297 | - eval enable_$ac_useropt=no ;; | ||
1298 | + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | ||
1299 | + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | ||
1300 | + { (exit 1); exit 1; }; } | ||
1301 | + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | ||
1302 | + eval enable_$ac_feature=no ;; | ||
1303 | |||
1304 | -docdir | --docdir | --docdi | --doc | --do) | ||
1305 | ac_prev=docdir ;; | ||
1306 | @@ -855,20 +841,13 @@ do | ||
1307 | dvidir=$ac_optarg ;; | ||
1308 | |||
1309 | -enable-* | --enable-*) | ||
1310 | - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | ||
1311 | + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | ||
1312 | # Reject names that are not valid shell variable names. | ||
1313 | - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
1314 | - as_fn_error $? "invalid feature name: $ac_useropt" | ||
1315 | - ac_useropt_orig=$ac_useropt | ||
1316 | - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
1317 | - case $ac_user_opts in | ||
1318 | - *" | ||
1319 | -"enable_$ac_useropt" | ||
1320 | -"*) ;; | ||
1321 | - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" | ||
1322 | - ac_unrecognized_sep=', ';; | ||
1323 | - esac | ||
1324 | - eval enable_$ac_useropt=\$ac_optarg ;; | ||
1325 | + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | ||
1326 | + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | ||
1327 | + { (exit 1); exit 1; }; } | ||
1328 | + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | ||
1329 | + eval enable_$ac_feature=\$ac_optarg ;; | ||
1330 | |||
1331 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | ||
1332 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ | ||
1333 | @@ -1059,36 +1038,22 @@ do | ||
1334 | ac_init_version=: ;; | ||
1335 | |||
1336 | -with-* | --with-*) | ||
1337 | - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | ||
1338 | + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | ||
1339 | # Reject names that are not valid shell variable names. | ||
1340 | - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
1341 | - as_fn_error $? "invalid package name: $ac_useropt" | ||
1342 | - ac_useropt_orig=$ac_useropt | ||
1343 | - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
1344 | - case $ac_user_opts in | ||
1345 | - *" | ||
1346 | -"with_$ac_useropt" | ||
1347 | -"*) ;; | ||
1348 | - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" | ||
1349 | - ac_unrecognized_sep=', ';; | ||
1350 | - esac | ||
1351 | - eval with_$ac_useropt=\$ac_optarg ;; | ||
1352 | + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | ||
1353 | + { echo "$as_me: error: invalid package name: $ac_package" >&2 | ||
1354 | + { (exit 1); exit 1; }; } | ||
1355 | + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | ||
1356 | + eval with_$ac_package=\$ac_optarg ;; | ||
1357 | |||
1358 | -without-* | --without-*) | ||
1359 | - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` | ||
1360 | + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | ||
1361 | # Reject names that are not valid shell variable names. | ||
1362 | - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | ||
1363 | - as_fn_error $? "invalid package name: $ac_useropt" | ||
1364 | - ac_useropt_orig=$ac_useropt | ||
1365 | - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | ||
1366 | - case $ac_user_opts in | ||
1367 | - *" | ||
1368 | -"with_$ac_useropt" | ||
1369 | -"*) ;; | ||
1370 | - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" | ||
1371 | - ac_unrecognized_sep=', ';; | ||
1372 | - esac | ||
1373 | - eval with_$ac_useropt=no ;; | ||
1374 | + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | ||
1375 | + { echo "$as_me: error: invalid package name: $ac_package" >&2 | ||
1376 | + { (exit 1); exit 1; }; } | ||
1377 | + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | ||
1378 | + eval with_$ac_package=no ;; | ||
1379 | |||
1380 | --x) | ||
1381 | # Obsolete; use --with-x. | ||
1382 | @@ -1108,25 +1073,25 @@ do | ||
1383 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | ||
1384 | x_libraries=$ac_optarg ;; | ||
1385 | |||
1386 | - -*) as_fn_error $? "unrecognized option: \`$ac_option' | ||
1387 | -Try \`$0 --help' for more information" | ||
1388 | + -*) { echo "$as_me: error: unrecognized option: $ac_option | ||
1389 | +Try \`$0 --help' for more information." >&2 | ||
1390 | + { (exit 1); exit 1; }; } | ||
1391 | ;; | ||
1392 | |||
1393 | *=*) | ||
1394 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` | ||
1395 | # Reject names that are not valid shell variable names. | ||
1396 | - case $ac_envvar in #( | ||
1397 | - '' | [0-9]* | *[!_$as_cr_alnum]* ) | ||
1398 | - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; | ||
1399 | - esac | ||
1400 | + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | ||
1401 | + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | ||
1402 | + { (exit 1); exit 1; }; } | ||
1403 | eval $ac_envvar=\$ac_optarg | ||
1404 | export $ac_envvar ;; | ||
1405 | |||
1406 | *) | ||
1407 | # FIXME: should be removed in autoconf 3.0. | ||
1408 | - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 | ||
1409 | + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 | ||
1410 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && | ||
1411 | - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 | ||
1412 | + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 | ||
1413 | : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} | ||
1414 | ;; | ||
1415 | |||
1416 | @@ -1135,36 +1100,23 @@ done | ||
1417 | |||
1418 | if test -n "$ac_prev"; then | ||
1419 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` | ||
1420 | - as_fn_error $? "missing argument to $ac_option" | ||
1421 | + { echo "$as_me: error: missing argument to $ac_option" >&2 | ||
1422 | + { (exit 1); exit 1; }; } | ||
1423 | fi | ||
1424 | |||
1425 | -if test -n "$ac_unrecognized_opts"; then | ||
1426 | - case $enable_option_checking in | ||
1427 | - no) ;; | ||
1428 | - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; | ||
1429 | - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; | ||
1430 | - esac | ||
1431 | -fi | ||
1432 | - | ||
1433 | -# Check all directory arguments for consistency. | ||
1434 | +# Be sure to have absolute directory names. | ||
1435 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | ||
1436 | datadir sysconfdir sharedstatedir localstatedir includedir \ | ||
1437 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | ||
1438 | libdir localedir mandir | ||
1439 | do | ||
1440 | eval ac_val=\$$ac_var | ||
1441 | - # Remove trailing slashes. | ||
1442 | - case $ac_val in | ||
1443 | - */ ) | ||
1444 | - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` | ||
1445 | - eval $ac_var=\$ac_val;; | ||
1446 | - esac | ||
1447 | - # Be sure to have absolute directory names. | ||
1448 | case $ac_val in | ||
1449 | [\\/$]* | ?:[\\/]* ) continue;; | ||
1450 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | ||
1451 | esac | ||
1452 | - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" | ||
1453 | + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
1454 | + { (exit 1); exit 1; }; } | ||
1455 | done | ||
1456 | |||
1457 | # There might be people who depend on the old broken behavior: `$host' | ||
1458 | @@ -1178,8 +1130,8 @@ target=$target_alias | ||
1459 | if test "x$host_alias" != x; then | ||
1460 | if test "x$build_alias" = x; then | ||
1461 | cross_compiling=maybe | ||
1462 | - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. | ||
1463 | - If a cross compiler is detected then cross compile mode will be used" >&2 | ||
1464 | + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | ||
1465 | + If a cross compiler is detected then cross compile mode will be used." >&2 | ||
1466 | elif test "x$build_alias" != "x$host_alias"; then | ||
1467 | cross_compiling=yes | ||
1468 | fi | ||
1469 | @@ -1194,21 +1146,23 @@ test "$silent" = yes && exec 6>/dev/null | ||
1470 | ac_pwd=`pwd` && test -n "$ac_pwd" && | ||
1471 | ac_ls_di=`ls -di .` && | ||
1472 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | ||
1473 | - as_fn_error $? "working directory cannot be determined" | ||
1474 | + { echo "$as_me: error: Working directory cannot be determined" >&2 | ||
1475 | + { (exit 1); exit 1; }; } | ||
1476 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | ||
1477 | - as_fn_error $? "pwd does not report name of working directory" | ||
1478 | + { echo "$as_me: error: pwd does not report name of working directory" >&2 | ||
1479 | + { (exit 1); exit 1; }; } | ||
1480 | |||
1481 | |||
1482 | # Find the source files, if location was not specified. | ||
1483 | if test -z "$srcdir"; then | ||
1484 | ac_srcdir_defaulted=yes | ||
1485 | # Try the directory containing this script, then the parent directory. | ||
1486 | - ac_confdir=`$as_dirname -- "$as_myself" || | ||
1487 | -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
1488 | - X"$as_myself" : 'X\(//\)[^/]' \| \ | ||
1489 | - X"$as_myself" : 'X\(//\)$' \| \ | ||
1490 | - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || | ||
1491 | -$as_echo X"$as_myself" | | ||
1492 | + ac_confdir=`$as_dirname -- "$0" || | ||
1493 | +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
1494 | + X"$0" : 'X\(//\)[^/]' \| \ | ||
1495 | + X"$0" : 'X\(//\)$' \| \ | ||
1496 | + X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
1497 | +echo X"$0" | | ||
1498 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
1499 | s//\1/ | ||
1500 | q | ||
1501 | @@ -1235,11 +1189,13 @@ else | ||
1502 | fi | ||
1503 | if test ! -r "$srcdir/$ac_unique_file"; then | ||
1504 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | ||
1505 | - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" | ||
1506 | + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | ||
1507 | + { (exit 1); exit 1; }; } | ||
1508 | fi | ||
1509 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | ||
1510 | ac_abs_confdir=`( | ||
1511 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" | ||
1512 | + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 | ||
1513 | + { (exit 1); exit 1; }; } | ||
1514 | pwd)` | ||
1515 | # When building in place, set srcdir=. | ||
1516 | if test "$ac_abs_confdir" = "$ac_pwd"; then | ||
1517 | @@ -1279,7 +1235,7 @@ Configuration: | ||
1518 | --help=short display options specific to this package | ||
1519 | --help=recursive display the short help of all the included packages | ||
1520 | -V, --version display version information and exit | ||
1521 | - -q, --quiet, --silent do not print \`checking ...' messages | ||
1522 | + -q, --quiet, --silent do not print \`checking...' messages | ||
1523 | --cache-file=FILE cache test results in FILE [disabled] | ||
1524 | -C, --config-cache alias for \`--cache-file=config.cache' | ||
1525 | -n, --no-create do not create output files | ||
1526 | @@ -1287,9 +1243,9 @@ Configuration: | ||
1527 | |||
1528 | Installation directories: | ||
1529 | --prefix=PREFIX install architecture-independent files in PREFIX | ||
1530 | - [$ac_default_prefix] | ||
1531 | + [$ac_default_prefix] | ||
1532 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | ||
1533 | - [PREFIX] | ||
1534 | + [PREFIX] | ||
1535 | |||
1536 | By default, \`make install' will install all the files in | ||
1537 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | ||
1538 | @@ -1299,25 +1255,25 @@ for instance \`--prefix=\$HOME'. | ||
1539 | For better control, use the options below. | ||
1540 | |||
1541 | Fine tuning of the installation directories: | ||
1542 | - --bindir=DIR user executables [EPREFIX/bin] | ||
1543 | - --sbindir=DIR system admin executables [EPREFIX/sbin] | ||
1544 | - --libexecdir=DIR program executables [EPREFIX/libexec] | ||
1545 | - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | ||
1546 | - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | ||
1547 | - --localstatedir=DIR modifiable single-machine data [PREFIX/var] | ||
1548 | - --libdir=DIR object code libraries [EPREFIX/lib] | ||
1549 | - --includedir=DIR C header files [PREFIX/include] | ||
1550 | - --oldincludedir=DIR C header files for non-gcc [/usr/include] | ||
1551 | - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | ||
1552 | - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | ||
1553 | - --infodir=DIR info documentation [DATAROOTDIR/info] | ||
1554 | - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | ||
1555 | - --mandir=DIR man documentation [DATAROOTDIR/man] | ||
1556 | - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] | ||
1557 | - --htmldir=DIR html documentation [DOCDIR] | ||
1558 | - --dvidir=DIR dvi documentation [DOCDIR] | ||
1559 | - --pdfdir=DIR pdf documentation [DOCDIR] | ||
1560 | - --psdir=DIR ps documentation [DOCDIR] | ||
1561 | + --bindir=DIR user executables [EPREFIX/bin] | ||
1562 | + --sbindir=DIR system admin executables [EPREFIX/sbin] | ||
1563 | + --libexecdir=DIR program executables [EPREFIX/libexec] | ||
1564 | + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | ||
1565 | + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | ||
1566 | + --localstatedir=DIR modifiable single-machine data [PREFIX/var] | ||
1567 | + --libdir=DIR object code libraries [EPREFIX/lib] | ||
1568 | + --includedir=DIR C header files [PREFIX/include] | ||
1569 | + --oldincludedir=DIR C header files for non-gcc [/usr/include] | ||
1570 | + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | ||
1571 | + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | ||
1572 | + --infodir=DIR info documentation [DATAROOTDIR/info] | ||
1573 | + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | ||
1574 | + --mandir=DIR man documentation [DATAROOTDIR/man] | ||
1575 | + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] | ||
1576 | + --htmldir=DIR html documentation [DOCDIR] | ||
1577 | + --dvidir=DIR dvi documentation [DOCDIR] | ||
1578 | + --pdfdir=DIR pdf documentation [DOCDIR] | ||
1579 | + --psdir=DIR ps documentation [DOCDIR] | ||
1580 | _ACEOF | ||
1581 | |||
1582 | cat <<\_ACEOF | ||
1583 | @@ -1334,7 +1290,6 @@ if test -n "$ac_init_help"; then | ||
1584 | cat <<\_ACEOF | ||
1585 | |||
1586 | Optional Features: | ||
1587 | - --disable-option-checking ignore unrecognized --enable/--with options | ||
1588 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | ||
1589 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | ||
1590 | --disable-largefile omit support for large files | ||
1591 | @@ -1344,11 +1299,12 @@ Optional Features: | ||
1592 | --enable-optimizer-dbg build optimizer debugging code | ||
1593 | --enable-yydebug build parser debugging code | ||
1594 | --disable-universal don't build universal on OS X | ||
1595 | + --enable-shared build shared libraries [default=yes, if support | ||
1596 | + available] | ||
1597 | --enable-bluetooth enable Bluetooth support [default=yes, if support | ||
1598 | available] | ||
1599 | --enable-canusb enable canusb support [default=yes, if support | ||
1600 | available] | ||
1601 | - | ||
1602 | --enable-can enable CAN support [default=yes, if support | ||
1603 | available] | ||
1604 | |||
1605 | @@ -1381,14 +1337,13 @@ Some influential environment variables: | ||
1606 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | ||
1607 | nonstandard directory <lib dir> | ||
1608 | LIBS libraries to pass to the linker, e.g. -l<library> | ||
1609 | - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if | ||
1610 | + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | ||
1611 | you have headers in a nonstandard directory <include dir> | ||
1612 | CPP C preprocessor | ||
1613 | |||
1614 | Use these variables to override the choices made by `configure' or to help | ||
1615 | it to find libraries and programs with nonstandard names/locations. | ||
1616 | |||
1617 | -Report bugs to the package provider. | ||
1618 | _ACEOF | ||
1619 | ac_status=$? | ||
1620 | fi | ||
1621 | @@ -1396,17 +1351,15 @@ fi | ||
1622 | if test "$ac_init_help" = "recursive"; then | ||
1623 | # If there are subdirs, report their specific --help. | ||
1624 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue | ||
1625 | - test -d "$ac_dir" || | ||
1626 | - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || | ||
1627 | - continue | ||
1628 | + test -d "$ac_dir" || continue | ||
1629 | ac_builddir=. | ||
1630 | |||
1631 | case "$ac_dir" in | ||
1632 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
1633 | *) | ||
1634 | - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` | ||
1635 | + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
1636 | # A ".." for each directory in $ac_dir_suffix. | ||
1637 | - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` | ||
1638 | + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | ||
1639 | case $ac_top_builddir_sub in | ||
1640 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
1641 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | ||
1642 | @@ -1442,7 +1395,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | ||
1643 | echo && | ||
1644 | $SHELL "$ac_srcdir/configure" --help=recursive | ||
1645 | else | ||
1646 | - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | ||
1647 | + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | ||
1648 | fi || ac_status=$? | ||
1649 | cd "$ac_pwd" || { ac_status=$?; break; } | ||
1650 | done | ||
1651 | @@ -1452,519 +1405,68 @@ test -n "$ac_init_help" && exit $ac_status | ||
1652 | if $ac_init_version; then | ||
1653 | cat <<\_ACEOF | ||
1654 | configure | ||
1655 | -generated by GNU Autoconf 2.67 | ||
1656 | +generated by GNU Autoconf 2.61 | ||
1657 | |||
1658 | -Copyright (C) 2010 Free Software Foundation, Inc. | ||
1659 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | ||
1660 | +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
1661 | This configure script is free software; the Free Software Foundation | ||
1662 | gives unlimited permission to copy, distribute and modify it. | ||
1663 | _ACEOF | ||
1664 | exit | ||
1665 | fi | ||
1666 | +cat >config.log <<_ACEOF | ||
1667 | +This file contains any messages produced by compilers while | ||
1668 | +running configure, to aid debugging if configure makes a mistake. | ||
1669 | |||
1670 | -## ------------------------ ## | ||
1671 | -## Autoconf initialization. ## | ||
1672 | -## ------------------------ ## | ||
1673 | - | ||
1674 | -# ac_fn_c_try_compile LINENO | ||
1675 | -# -------------------------- | ||
1676 | -# Try to compile conftest.$ac_ext, and return whether this succeeded. | ||
1677 | -ac_fn_c_try_compile () | ||
1678 | -{ | ||
1679 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1680 | - rm -f conftest.$ac_objext | ||
1681 | - if { { ac_try="$ac_compile" | ||
1682 | -case "(($ac_try" in | ||
1683 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1684 | - *) ac_try_echo=$ac_try;; | ||
1685 | -esac | ||
1686 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1687 | -$as_echo "$ac_try_echo"; } >&5 | ||
1688 | - (eval "$ac_compile") 2>conftest.err | ||
1689 | - ac_status=$? | ||
1690 | - if test -s conftest.err; then | ||
1691 | - grep -v '^ *+' conftest.err >conftest.er1 | ||
1692 | - cat conftest.er1 >&5 | ||
1693 | - mv -f conftest.er1 conftest.err | ||
1694 | - fi | ||
1695 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1696 | - test $ac_status = 0; } && { | ||
1697 | - test -z "$ac_c_werror_flag" || | ||
1698 | - test ! -s conftest.err | ||
1699 | - } && test -s conftest.$ac_objext; then : | ||
1700 | - ac_retval=0 | ||
1701 | -else | ||
1702 | - $as_echo "$as_me: failed program was:" >&5 | ||
1703 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
1704 | - | ||
1705 | - ac_retval=1 | ||
1706 | -fi | ||
1707 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1708 | - as_fn_set_status $ac_retval | ||
1709 | +It was created by $as_me, which was | ||
1710 | +generated by GNU Autoconf 2.61. Invocation command line was | ||
1711 | |||
1712 | -} # ac_fn_c_try_compile | ||
1713 | + $ $0 $@ | ||
1714 | |||
1715 | -# ac_fn_c_try_cpp LINENO | ||
1716 | -# ---------------------- | ||
1717 | -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. | ||
1718 | -ac_fn_c_try_cpp () | ||
1719 | +_ACEOF | ||
1720 | +exec 5>>config.log | ||
1721 | { | ||
1722 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1723 | - if { { ac_try="$ac_cpp conftest.$ac_ext" | ||
1724 | -case "(($ac_try" in | ||
1725 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1726 | - *) ac_try_echo=$ac_try;; | ||
1727 | -esac | ||
1728 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1729 | -$as_echo "$ac_try_echo"; } >&5 | ||
1730 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err | ||
1731 | - ac_status=$? | ||
1732 | - if test -s conftest.err; then | ||
1733 | - grep -v '^ *+' conftest.err >conftest.er1 | ||
1734 | - cat conftest.er1 >&5 | ||
1735 | - mv -f conftest.er1 conftest.err | ||
1736 | - fi | ||
1737 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1738 | - test $ac_status = 0; } > conftest.i && { | ||
1739 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
1740 | - test ! -s conftest.err | ||
1741 | - }; then : | ||
1742 | - ac_retval=0 | ||
1743 | -else | ||
1744 | - $as_echo "$as_me: failed program was:" >&5 | ||
1745 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
1746 | +cat <<_ASUNAME | ||
1747 | +## --------- ## | ||
1748 | +## Platform. ## | ||
1749 | +## --------- ## | ||
1750 | |||
1751 | - ac_retval=1 | ||
1752 | -fi | ||
1753 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1754 | - as_fn_set_status $ac_retval | ||
1755 | +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` | ||
1756 | +uname -m = `(uname -m) 2>/dev/null || echo unknown` | ||
1757 | +uname -r = `(uname -r) 2>/dev/null || echo unknown` | ||
1758 | +uname -s = `(uname -s) 2>/dev/null || echo unknown` | ||
1759 | +uname -v = `(uname -v) 2>/dev/null || echo unknown` | ||
1760 | |||
1761 | -} # ac_fn_c_try_cpp | ||
1762 | +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` | ||
1763 | +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` | ||
1764 | |||
1765 | -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES | ||
1766 | -# ------------------------------------------------------- | ||
1767 | -# Tests whether HEADER exists, giving a warning if it cannot be compiled using | ||
1768 | -# the include files in INCLUDES and setting the cache variable VAR | ||
1769 | -# accordingly. | ||
1770 | -ac_fn_c_check_header_mongrel () | ||
1771 | -{ | ||
1772 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1773 | - if eval "test \"\${$3+set}\"" = set; then : | ||
1774 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
1775 | -$as_echo_n "checking for $2... " >&6; } | ||
1776 | -if eval "test \"\${$3+set}\"" = set; then : | ||
1777 | - $as_echo_n "(cached) " >&6 | ||
1778 | -fi | ||
1779 | -eval ac_res=\$$3 | ||
1780 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
1781 | -$as_echo "$ac_res" >&6; } | ||
1782 | -else | ||
1783 | - # Is the header compilable? | ||
1784 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 | ||
1785 | -$as_echo_n "checking $2 usability... " >&6; } | ||
1786 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1787 | -/* end confdefs.h. */ | ||
1788 | -$4 | ||
1789 | -#include <$2> | ||
1790 | -_ACEOF | ||
1791 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
1792 | - ac_header_compiler=yes | ||
1793 | -else | ||
1794 | - ac_header_compiler=no | ||
1795 | -fi | ||
1796 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1797 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 | ||
1798 | -$as_echo "$ac_header_compiler" >&6; } | ||
1799 | +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` | ||
1800 | +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` | ||
1801 | +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` | ||
1802 | +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` | ||
1803 | +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` | ||
1804 | +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` | ||
1805 | +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` | ||
1806 | |||
1807 | -# Is the header present? | ||
1808 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 | ||
1809 | -$as_echo_n "checking $2 presence... " >&6; } | ||
1810 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1811 | -/* end confdefs.h. */ | ||
1812 | -#include <$2> | ||
1813 | -_ACEOF | ||
1814 | -if ac_fn_c_try_cpp "$LINENO"; then : | ||
1815 | - ac_header_preproc=yes | ||
1816 | -else | ||
1817 | - ac_header_preproc=no | ||
1818 | -fi | ||
1819 | -rm -f conftest.err conftest.i conftest.$ac_ext | ||
1820 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 | ||
1821 | -$as_echo "$ac_header_preproc" >&6; } | ||
1822 | +_ASUNAME | ||
1823 | |||
1824 | -# So? What about this header? | ||
1825 | -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( | ||
1826 | - yes:no: ) | ||
1827 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
1828 | -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
1829 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
1830 | -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
1831 | - ;; | ||
1832 | - no:yes:* ) | ||
1833 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 | ||
1834 | -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} | ||
1835 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 | ||
1836 | -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} | ||
1837 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 | ||
1838 | -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} | ||
1839 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 | ||
1840 | -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} | ||
1841 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
1842 | -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
1843 | - ;; | ||
1844 | -esac | ||
1845 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
1846 | -$as_echo_n "checking for $2... " >&6; } | ||
1847 | -if eval "test \"\${$3+set}\"" = set; then : | ||
1848 | - $as_echo_n "(cached) " >&6 | ||
1849 | -else | ||
1850 | - eval "$3=\$ac_header_compiler" | ||
1851 | -fi | ||
1852 | -eval ac_res=\$$3 | ||
1853 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
1854 | -$as_echo "$ac_res" >&6; } | ||
1855 | -fi | ||
1856 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1857 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1858 | +for as_dir in $PATH | ||
1859 | +do | ||
1860 | + IFS=$as_save_IFS | ||
1861 | + test -z "$as_dir" && as_dir=. | ||
1862 | + echo "PATH: $as_dir" | ||
1863 | +done | ||
1864 | +IFS=$as_save_IFS | ||
1865 | |||
1866 | -} # ac_fn_c_check_header_mongrel | ||
1867 | +} >&5 | ||
1868 | |||
1869 | -# ac_fn_c_try_run LINENO | ||
1870 | -# ---------------------- | ||
1871 | -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes | ||
1872 | -# that executables *can* be run. | ||
1873 | -ac_fn_c_try_run () | ||
1874 | -{ | ||
1875 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1876 | - if { { ac_try="$ac_link" | ||
1877 | -case "(($ac_try" in | ||
1878 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1879 | - *) ac_try_echo=$ac_try;; | ||
1880 | -esac | ||
1881 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1882 | -$as_echo "$ac_try_echo"; } >&5 | ||
1883 | - (eval "$ac_link") 2>&5 | ||
1884 | - ac_status=$? | ||
1885 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1886 | - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' | ||
1887 | - { { case "(($ac_try" in | ||
1888 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1889 | - *) ac_try_echo=$ac_try;; | ||
1890 | -esac | ||
1891 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1892 | -$as_echo "$ac_try_echo"; } >&5 | ||
1893 | - (eval "$ac_try") 2>&5 | ||
1894 | - ac_status=$? | ||
1895 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1896 | - test $ac_status = 0; }; }; then : | ||
1897 | - ac_retval=0 | ||
1898 | -else | ||
1899 | - $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
1900 | - $as_echo "$as_me: failed program was:" >&5 | ||
1901 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
1902 | +cat >&5 <<_ACEOF | ||
1903 | |||
1904 | - ac_retval=$ac_status | ||
1905 | -fi | ||
1906 | - rm -rf conftest.dSYM conftest_ipa8_conftest.oo | ||
1907 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1908 | - as_fn_set_status $ac_retval | ||
1909 | |||
1910 | -} # ac_fn_c_try_run | ||
1911 | - | ||
1912 | -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES | ||
1913 | -# ------------------------------------------------------- | ||
1914 | -# Tests whether HEADER exists and can be compiled using the include files in | ||
1915 | -# INCLUDES, setting the cache variable VAR accordingly. | ||
1916 | -ac_fn_c_check_header_compile () | ||
1917 | -{ | ||
1918 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1919 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
1920 | -$as_echo_n "checking for $2... " >&6; } | ||
1921 | -if eval "test \"\${$3+set}\"" = set; then : | ||
1922 | - $as_echo_n "(cached) " >&6 | ||
1923 | -else | ||
1924 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1925 | -/* end confdefs.h. */ | ||
1926 | -$4 | ||
1927 | -#include <$2> | ||
1928 | -_ACEOF | ||
1929 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
1930 | - eval "$3=yes" | ||
1931 | -else | ||
1932 | - eval "$3=no" | ||
1933 | -fi | ||
1934 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1935 | -fi | ||
1936 | -eval ac_res=\$$3 | ||
1937 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
1938 | -$as_echo "$ac_res" >&6; } | ||
1939 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1940 | - | ||
1941 | -} # ac_fn_c_check_header_compile | ||
1942 | - | ||
1943 | -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES | ||
1944 | -# ------------------------------------------- | ||
1945 | -# Tests whether TYPE exists after having included INCLUDES, setting cache | ||
1946 | -# variable VAR accordingly. | ||
1947 | -ac_fn_c_check_type () | ||
1948 | -{ | ||
1949 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1950 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
1951 | -$as_echo_n "checking for $2... " >&6; } | ||
1952 | -if eval "test \"\${$3+set}\"" = set; then : | ||
1953 | - $as_echo_n "(cached) " >&6 | ||
1954 | -else | ||
1955 | - eval "$3=no" | ||
1956 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1957 | -/* end confdefs.h. */ | ||
1958 | -$4 | ||
1959 | -int | ||
1960 | -main () | ||
1961 | -{ | ||
1962 | -if (sizeof ($2)) | ||
1963 | - return 0; | ||
1964 | - ; | ||
1965 | - return 0; | ||
1966 | -} | ||
1967 | -_ACEOF | ||
1968 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
1969 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1970 | -/* end confdefs.h. */ | ||
1971 | -$4 | ||
1972 | -int | ||
1973 | -main () | ||
1974 | -{ | ||
1975 | -if (sizeof (($2))) | ||
1976 | - return 0; | ||
1977 | - ; | ||
1978 | - return 0; | ||
1979 | -} | ||
1980 | -_ACEOF | ||
1981 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
1982 | - | ||
1983 | -else | ||
1984 | - eval "$3=yes" | ||
1985 | -fi | ||
1986 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1987 | -fi | ||
1988 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1989 | -fi | ||
1990 | -eval ac_res=\$$3 | ||
1991 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
1992 | -$as_echo "$ac_res" >&6; } | ||
1993 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1994 | - | ||
1995 | -} # ac_fn_c_check_type | ||
1996 | - | ||
1997 | -# ac_fn_c_try_link LINENO | ||
1998 | -# ----------------------- | ||
1999 | -# Try to link conftest.$ac_ext, and return whether this succeeded. | ||
2000 | -ac_fn_c_try_link () | ||
2001 | -{ | ||
2002 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2003 | - rm -f conftest.$ac_objext conftest$ac_exeext | ||
2004 | - if { { ac_try="$ac_link" | ||
2005 | -case "(($ac_try" in | ||
2006 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2007 | - *) ac_try_echo=$ac_try;; | ||
2008 | -esac | ||
2009 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
2010 | -$as_echo "$ac_try_echo"; } >&5 | ||
2011 | - (eval "$ac_link") 2>conftest.err | ||
2012 | - ac_status=$? | ||
2013 | - if test -s conftest.err; then | ||
2014 | - grep -v '^ *+' conftest.err >conftest.er1 | ||
2015 | - cat conftest.er1 >&5 | ||
2016 | - mv -f conftest.er1 conftest.err | ||
2017 | - fi | ||
2018 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2019 | - test $ac_status = 0; } && { | ||
2020 | - test -z "$ac_c_werror_flag" || | ||
2021 | - test ! -s conftest.err | ||
2022 | - } && test -s conftest$ac_exeext && { | ||
2023 | - test "$cross_compiling" = yes || | ||
2024 | - $as_test_x conftest$ac_exeext | ||
2025 | - }; then : | ||
2026 | - ac_retval=0 | ||
2027 | -else | ||
2028 | - $as_echo "$as_me: failed program was:" >&5 | ||
2029 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2030 | - | ||
2031 | - ac_retval=1 | ||
2032 | -fi | ||
2033 | - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information | ||
2034 | - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would | ||
2035 | - # interfere with the next link command; also delete a directory that is | ||
2036 | - # left behind by Apple's compiler. We do this before executing the actions. | ||
2037 | - rm -rf conftest.dSYM conftest_ipa8_conftest.oo | ||
2038 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2039 | - as_fn_set_status $ac_retval | ||
2040 | - | ||
2041 | -} # ac_fn_c_try_link | ||
2042 | - | ||
2043 | -# ac_fn_c_check_func LINENO FUNC VAR | ||
2044 | -# ---------------------------------- | ||
2045 | -# Tests whether FUNC exists, setting the cache variable VAR accordingly | ||
2046 | -ac_fn_c_check_func () | ||
2047 | -{ | ||
2048 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2049 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2050 | -$as_echo_n "checking for $2... " >&6; } | ||
2051 | -if eval "test \"\${$3+set}\"" = set; then : | ||
2052 | - $as_echo_n "(cached) " >&6 | ||
2053 | -else | ||
2054 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2055 | -/* end confdefs.h. */ | ||
2056 | -/* Define $2 to an innocuous variant, in case <limits.h> declares $2. | ||
2057 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
2058 | -#define $2 innocuous_$2 | ||
2059 | - | ||
2060 | -/* System header to define __stub macros and hopefully few prototypes, | ||
2061 | - which can conflict with char $2 (); below. | ||
2062 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
2063 | - <limits.h> exists even on freestanding compilers. */ | ||
2064 | - | ||
2065 | -#ifdef __STDC__ | ||
2066 | -# include <limits.h> | ||
2067 | -#else | ||
2068 | -# include <assert.h> | ||
2069 | -#endif | ||
2070 | - | ||
2071 | -#undef $2 | ||
2072 | - | ||
2073 | -/* Override any GCC internal prototype to avoid an error. | ||
2074 | - Use char because int might match the return type of a GCC | ||
2075 | - builtin and then its argument prototype would still apply. */ | ||
2076 | -#ifdef __cplusplus | ||
2077 | -extern "C" | ||
2078 | -#endif | ||
2079 | -char $2 (); | ||
2080 | -/* The GNU C library defines this for functions which it implements | ||
2081 | - to always fail with ENOSYS. Some functions are actually named | ||
2082 | - something starting with __ and the normal name is an alias. */ | ||
2083 | -#if defined __stub_$2 || defined __stub___$2 | ||
2084 | -choke me | ||
2085 | -#endif | ||
2086 | - | ||
2087 | -int | ||
2088 | -main () | ||
2089 | -{ | ||
2090 | -return $2 (); | ||
2091 | - ; | ||
2092 | - return 0; | ||
2093 | -} | ||
2094 | -_ACEOF | ||
2095 | -if ac_fn_c_try_link "$LINENO"; then : | ||
2096 | - eval "$3=yes" | ||
2097 | -else | ||
2098 | - eval "$3=no" | ||
2099 | -fi | ||
2100 | -rm -f core conftest.err conftest.$ac_objext \ | ||
2101 | - conftest$ac_exeext conftest.$ac_ext | ||
2102 | -fi | ||
2103 | -eval ac_res=\$$3 | ||
2104 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2105 | -$as_echo "$ac_res" >&6; } | ||
2106 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2107 | - | ||
2108 | -} # ac_fn_c_check_func | ||
2109 | - | ||
2110 | -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES | ||
2111 | -# --------------------------------------------- | ||
2112 | -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR | ||
2113 | -# accordingly. | ||
2114 | -ac_fn_c_check_decl () | ||
2115 | -{ | ||
2116 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2117 | - as_decl_name=`echo $2|sed 's/ *(.*//'` | ||
2118 | - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` | ||
2119 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 | ||
2120 | -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } | ||
2121 | -if eval "test \"\${$3+set}\"" = set; then : | ||
2122 | - $as_echo_n "(cached) " >&6 | ||
2123 | -else | ||
2124 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2125 | -/* end confdefs.h. */ | ||
2126 | -$4 | ||
2127 | -int | ||
2128 | -main () | ||
2129 | -{ | ||
2130 | -#ifndef $as_decl_name | ||
2131 | -#ifdef __cplusplus | ||
2132 | - (void) $as_decl_use; | ||
2133 | -#else | ||
2134 | - (void) $as_decl_name; | ||
2135 | -#endif | ||
2136 | -#endif | ||
2137 | - | ||
2138 | - ; | ||
2139 | - return 0; | ||
2140 | -} | ||
2141 | -_ACEOF | ||
2142 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
2143 | - eval "$3=yes" | ||
2144 | -else | ||
2145 | - eval "$3=no" | ||
2146 | -fi | ||
2147 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2148 | -fi | ||
2149 | -eval ac_res=\$$3 | ||
2150 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2151 | -$as_echo "$ac_res" >&6; } | ||
2152 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2153 | - | ||
2154 | -} # ac_fn_c_check_decl | ||
2155 | -cat >config.log <<_ACEOF | ||
2156 | -This file contains any messages produced by compilers while | ||
2157 | -running configure, to aid debugging if configure makes a mistake. | ||
2158 | - | ||
2159 | -It was created by $as_me, which was | ||
2160 | -generated by GNU Autoconf 2.67. Invocation command line was | ||
2161 | - | ||
2162 | - $ $0 $@ | ||
2163 | - | ||
2164 | -_ACEOF | ||
2165 | -exec 5>>config.log | ||
2166 | -{ | ||
2167 | -cat <<_ASUNAME | ||
2168 | -## --------- ## | ||
2169 | -## Platform. ## | ||
2170 | -## --------- ## | ||
2171 | - | ||
2172 | -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` | ||
2173 | -uname -m = `(uname -m) 2>/dev/null || echo unknown` | ||
2174 | -uname -r = `(uname -r) 2>/dev/null || echo unknown` | ||
2175 | -uname -s = `(uname -s) 2>/dev/null || echo unknown` | ||
2176 | -uname -v = `(uname -v) 2>/dev/null || echo unknown` | ||
2177 | - | ||
2178 | -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` | ||
2179 | -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` | ||
2180 | - | ||
2181 | -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` | ||
2182 | -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` | ||
2183 | -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` | ||
2184 | -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` | ||
2185 | -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` | ||
2186 | -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` | ||
2187 | -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` | ||
2188 | - | ||
2189 | -_ASUNAME | ||
2190 | - | ||
2191 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2192 | -for as_dir in $PATH | ||
2193 | -do | ||
2194 | - IFS=$as_save_IFS | ||
2195 | - test -z "$as_dir" && as_dir=. | ||
2196 | - $as_echo "PATH: $as_dir" | ||
2197 | - done | ||
2198 | -IFS=$as_save_IFS | ||
2199 | - | ||
2200 | -} >&5 | ||
2201 | - | ||
2202 | -cat >&5 <<_ACEOF | ||
2203 | - | ||
2204 | - | ||
2205 | -## ----------- ## | ||
2206 | -## Core tests. ## | ||
2207 | -## ----------- ## | ||
2208 | +## ----------- ## | ||
2209 | +## Core tests. ## | ||
2210 | +## ----------- ## | ||
2211 | |||
2212 | _ACEOF | ||
2213 | |||
2214 | @@ -1988,12 +1490,12 @@ do | ||
2215 | | -silent | --silent | --silen | --sile | --sil) | ||
2216 | continue ;; | ||
2217 | *\'*) | ||
2218 | - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
2219 | + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
2220 | esac | ||
2221 | case $ac_pass in | ||
2222 | - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; | ||
2223 | + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; | ||
2224 | 2) | ||
2225 | - as_fn_append ac_configure_args1 " '$ac_arg'" | ||
2226 | + ac_configure_args1="$ac_configure_args1 '$ac_arg'" | ||
2227 | if test $ac_must_keep_next = true; then | ||
2228 | ac_must_keep_next=false # Got value, back to normal. | ||
2229 | else | ||
2230 | @@ -2009,13 +1511,13 @@ do | ||
2231 | -* ) ac_must_keep_next=true ;; | ||
2232 | esac | ||
2233 | fi | ||
2234 | - as_fn_append ac_configure_args " '$ac_arg'" | ||
2235 | + ac_configure_args="$ac_configure_args '$ac_arg'" | ||
2236 | ;; | ||
2237 | esac | ||
2238 | done | ||
2239 | done | ||
2240 | -{ ac_configure_args0=; unset ac_configure_args0;} | ||
2241 | -{ ac_configure_args1=; unset ac_configure_args1;} | ||
2242 | +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } | ||
2243 | +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } | ||
2244 | |||
2245 | # When interrupted or exit'd, cleanup temporary files, and complete | ||
2246 | # config.log. We remove comments because anyway the quotes in there | ||
2247 | @@ -2027,9 +1529,11 @@ trap 'exit_status=$? | ||
2248 | { | ||
2249 | echo | ||
2250 | |||
2251 | - $as_echo "## ---------------- ## | ||
2252 | + cat <<\_ASBOX | ||
2253 | +## ---------------- ## | ||
2254 | ## Cache variables. ## | ||
2255 | -## ---------------- ##" | ||
2256 | +## ---------------- ## | ||
2257 | +_ASBOX | ||
2258 | echo | ||
2259 | # The following way of writing the cache mishandles newlines in values, | ||
2260 | ( | ||
2261 | @@ -2038,13 +1542,12 @@ trap 'exit_status=$? | ||
2262 | case $ac_val in #( | ||
2263 | *${as_nl}*) | ||
2264 | case $ac_var in #( | ||
2265 | - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 | ||
2266 | -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | ||
2267 | + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | ||
2268 | +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | ||
2269 | esac | ||
2270 | case $ac_var in #( | ||
2271 | _ | IFS | as_nl) ;; #( | ||
2272 | - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( | ||
2273 | - *) { eval $ac_var=; unset $ac_var;} ;; | ||
2274 | + *) $as_unset $ac_var ;; | ||
2275 | esac ;; | ||
2276 | esac | ||
2277 | done | ||
2278 | @@ -2063,136 +1566,128 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | ||
2279 | ) | ||
2280 | echo | ||
2281 | |||
2282 | - $as_echo "## ----------------- ## | ||
2283 | + cat <<\_ASBOX | ||
2284 | +## ----------------- ## | ||
2285 | ## Output variables. ## | ||
2286 | -## ----------------- ##" | ||
2287 | +## ----------------- ## | ||
2288 | +_ASBOX | ||
2289 | echo | ||
2290 | for ac_var in $ac_subst_vars | ||
2291 | do | ||
2292 | eval ac_val=\$$ac_var | ||
2293 | case $ac_val in | ||
2294 | - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
2295 | + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
2296 | esac | ||
2297 | - $as_echo "$ac_var='\''$ac_val'\''" | ||
2298 | + echo "$ac_var='\''$ac_val'\''" | ||
2299 | done | sort | ||
2300 | echo | ||
2301 | |||
2302 | if test -n "$ac_subst_files"; then | ||
2303 | - $as_echo "## ------------------- ## | ||
2304 | + cat <<\_ASBOX | ||
2305 | +## ------------------- ## | ||
2306 | ## File substitutions. ## | ||
2307 | -## ------------------- ##" | ||
2308 | +## ------------------- ## | ||
2309 | +_ASBOX | ||
2310 | echo | ||
2311 | for ac_var in $ac_subst_files | ||
2312 | do | ||
2313 | eval ac_val=\$$ac_var | ||
2314 | case $ac_val in | ||
2315 | - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
2316 | + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
2317 | esac | ||
2318 | - $as_echo "$ac_var='\''$ac_val'\''" | ||
2319 | + echo "$ac_var='\''$ac_val'\''" | ||
2320 | done | sort | ||
2321 | echo | ||
2322 | fi | ||
2323 | |||
2324 | if test -s confdefs.h; then | ||
2325 | - $as_echo "## ----------- ## | ||
2326 | + cat <<\_ASBOX | ||
2327 | +## ----------- ## | ||
2328 | ## confdefs.h. ## | ||
2329 | -## ----------- ##" | ||
2330 | +## ----------- ## | ||
2331 | +_ASBOX | ||
2332 | echo | ||
2333 | cat confdefs.h | ||
2334 | echo | ||
2335 | fi | ||
2336 | test "$ac_signal" != 0 && | ||
2337 | - $as_echo "$as_me: caught signal $ac_signal" | ||
2338 | - $as_echo "$as_me: exit $exit_status" | ||
2339 | + echo "$as_me: caught signal $ac_signal" | ||
2340 | + echo "$as_me: exit $exit_status" | ||
2341 | } >&5 | ||
2342 | rm -f core *.core core.conftest.* && | ||
2343 | rm -f -r conftest* confdefs* conf$$* $ac_clean_files && | ||
2344 | exit $exit_status | ||
2345 | ' 0 | ||
2346 | for ac_signal in 1 2 13 15; do | ||
2347 | - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal | ||
2348 | + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal | ||
2349 | done | ||
2350 | ac_signal=0 | ||
2351 | |||
2352 | # confdefs.h avoids OS command line length limits that DEFS can exceed. | ||
2353 | rm -f -r conftest* confdefs.h | ||
2354 | |||
2355 | -$as_echo "/* confdefs.h */" > confdefs.h | ||
2356 | - | ||
2357 | # Predefined preprocessor variables. | ||
2358 | |||
2359 | cat >>confdefs.h <<_ACEOF | ||
2360 | #define PACKAGE_NAME "$PACKAGE_NAME" | ||
2361 | _ACEOF | ||
2362 | |||
2363 | + | ||
2364 | cat >>confdefs.h <<_ACEOF | ||
2365 | #define PACKAGE_TARNAME "$PACKAGE_TARNAME" | ||
2366 | _ACEOF | ||
2367 | |||
2368 | + | ||
2369 | cat >>confdefs.h <<_ACEOF | ||
2370 | #define PACKAGE_VERSION "$PACKAGE_VERSION" | ||
2371 | _ACEOF | ||
2372 | |||
2373 | + | ||
2374 | cat >>confdefs.h <<_ACEOF | ||
2375 | #define PACKAGE_STRING "$PACKAGE_STRING" | ||
2376 | _ACEOF | ||
2377 | |||
2378 | -cat >>confdefs.h <<_ACEOF | ||
2379 | -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" | ||
2380 | -_ACEOF | ||
2381 | |||
2382 | cat >>confdefs.h <<_ACEOF | ||
2383 | -#define PACKAGE_URL "$PACKAGE_URL" | ||
2384 | +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" | ||
2385 | _ACEOF | ||
2386 | |||
2387 | |||
2388 | # Let the site file select an alternate cache file if it wants to. | ||
2389 | -# Prefer an explicitly selected file to automatically selected ones. | ||
2390 | -ac_site_file1=NONE | ||
2391 | -ac_site_file2=NONE | ||
2392 | +# Prefer explicitly selected file to automatically selected ones. | ||
2393 | if test -n "$CONFIG_SITE"; then | ||
2394 | - # We do not want a PATH search for config.site. | ||
2395 | - case $CONFIG_SITE in #(( | ||
2396 | - -*) ac_site_file1=./$CONFIG_SITE;; | ||
2397 | - */*) ac_site_file1=$CONFIG_SITE;; | ||
2398 | - *) ac_site_file1=./$CONFIG_SITE;; | ||
2399 | - esac | ||
2400 | + set x "$CONFIG_SITE" | ||
2401 | elif test "x$prefix" != xNONE; then | ||
2402 | - ac_site_file1=$prefix/share/config.site | ||
2403 | - ac_site_file2=$prefix/etc/config.site | ||
2404 | + set x "$prefix/share/config.site" "$prefix/etc/config.site" | ||
2405 | else | ||
2406 | - ac_site_file1=$ac_default_prefix/share/config.site | ||
2407 | - ac_site_file2=$ac_default_prefix/etc/config.site | ||
2408 | + set x "$ac_default_prefix/share/config.site" \ | ||
2409 | + "$ac_default_prefix/etc/config.site" | ||
2410 | fi | ||
2411 | -for ac_site_file in "$ac_site_file1" "$ac_site_file2" | ||
2412 | +shift | ||
2413 | +for ac_site_file | ||
2414 | do | ||
2415 | - test "x$ac_site_file" = xNONE && continue | ||
2416 | - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then | ||
2417 | - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 | ||
2418 | -$as_echo "$as_me: loading site script $ac_site_file" >&6;} | ||
2419 | + if test -r "$ac_site_file"; then | ||
2420 | + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | ||
2421 | +echo "$as_me: loading site script $ac_site_file" >&6;} | ||
2422 | sed 's/^/| /' "$ac_site_file" >&5 | ||
2423 | - . "$ac_site_file" \ | ||
2424 | - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
2425 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
2426 | -as_fn_error $? "failed to load site script $ac_site_file | ||
2427 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
2428 | + . "$ac_site_file" | ||
2429 | fi | ||
2430 | done | ||
2431 | |||
2432 | if test -r "$cache_file"; then | ||
2433 | - # Some versions of bash will fail to source /dev/null (special files | ||
2434 | - # actually), so we avoid doing that. DJGPP emulates it as a regular file. | ||
2435 | - if test /dev/null != "$cache_file" && test -f "$cache_file"; then | ||
2436 | - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 | ||
2437 | -$as_echo "$as_me: loading cache $cache_file" >&6;} | ||
2438 | + # Some versions of bash will fail to source /dev/null (special | ||
2439 | + # files actually), so we avoid doing that. | ||
2440 | + if test -f "$cache_file"; then | ||
2441 | + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 | ||
2442 | +echo "$as_me: loading cache $cache_file" >&6;} | ||
2443 | case $cache_file in | ||
2444 | [\\/]* | ?:[\\/]* ) . "$cache_file";; | ||
2445 | *) . "./$cache_file";; | ||
2446 | esac | ||
2447 | fi | ||
2448 | else | ||
2449 | - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 | ||
2450 | -$as_echo "$as_me: creating cache $cache_file" >&6;} | ||
2451 | + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 | ||
2452 | +echo "$as_me: creating cache $cache_file" >&6;} | ||
2453 | >$cache_file | ||
2454 | fi | ||
2455 | |||
2456 | @@ -2206,56 +1701,60 @@ for ac_var in $ac_precious_vars; do | ||
2457 | eval ac_new_val=\$ac_env_${ac_var}_value | ||
2458 | case $ac_old_set,$ac_new_set in | ||
2459 | set,) | ||
2460 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
2461 | -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | ||
2462 | + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
2463 | +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | ||
2464 | ac_cache_corrupted=: ;; | ||
2465 | ,set) | ||
2466 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 | ||
2467 | -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | ||
2468 | + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 | ||
2469 | +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | ||
2470 | ac_cache_corrupted=: ;; | ||
2471 | ,);; | ||
2472 | *) | ||
2473 | if test "x$ac_old_val" != "x$ac_new_val"; then | ||
2474 | - # differences in whitespace do not lead to failure. | ||
2475 | - ac_old_val_w=`echo x $ac_old_val` | ||
2476 | - ac_new_val_w=`echo x $ac_new_val` | ||
2477 | - if test "$ac_old_val_w" != "$ac_new_val_w"; then | ||
2478 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2479 | -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
2480 | - ac_cache_corrupted=: | ||
2481 | - else | ||
2482 | - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 | ||
2483 | -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} | ||
2484 | - eval $ac_var=\$ac_old_val | ||
2485 | - fi | ||
2486 | - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 | ||
2487 | -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} | ||
2488 | - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 | ||
2489 | -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} | ||
2490 | + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
2491 | +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
2492 | + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
2493 | +echo "$as_me: former value: $ac_old_val" >&2;} | ||
2494 | + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
2495 | +echo "$as_me: current value: $ac_new_val" >&2;} | ||
2496 | + ac_cache_corrupted=: | ||
2497 | fi;; | ||
2498 | esac | ||
2499 | # Pass precious variables to config.status. | ||
2500 | if test "$ac_new_set" = set; then | ||
2501 | case $ac_new_val in | ||
2502 | - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
2503 | + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
2504 | *) ac_arg=$ac_var=$ac_new_val ;; | ||
2505 | esac | ||
2506 | case " $ac_configure_args " in | ||
2507 | *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. | ||
2508 | - *) as_fn_append ac_configure_args " '$ac_arg'" ;; | ||
2509 | + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; | ||
2510 | esac | ||
2511 | fi | ||
2512 | done | ||
2513 | if $ac_cache_corrupted; then | ||
2514 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
2515 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
2516 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 | ||
2517 | -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} | ||
2518 | - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 | ||
2519 | + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 | ||
2520 | +echo "$as_me: error: changes in the environment can compromise the build" >&2;} | ||
2521 | + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | ||
2522 | +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | ||
2523 | + { (exit 1); exit 1; }; } | ||
2524 | fi | ||
2525 | -## -------------------- ## | ||
2526 | -## Main body of script. ## | ||
2527 | -## -------------------- ## | ||
2528 | + | ||
2529 | + | ||
2530 | + | ||
2531 | + | ||
2532 | + | ||
2533 | + | ||
2534 | + | ||
2535 | + | ||
2536 | + | ||
2537 | + | ||
2538 | + | ||
2539 | + | ||
2540 | + | ||
2541 | + | ||
2542 | + | ||
2543 | + | ||
2544 | |||
2545 | ac_ext=c | ||
2546 | ac_cpp='$CPP $CPPFLAGS' | ||
2547 | @@ -2282,7 +1781,9 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | ||
2548 | fi | ||
2549 | done | ||
2550 | if test -z "$ac_aux_dir"; then | ||
2551 | - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 | ||
2552 | + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 | ||
2553 | +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} | ||
2554 | + { (exit 1); exit 1; }; } | ||
2555 | fi | ||
2556 | |||
2557 | # These three variables are undocumented and unsupported, | ||
2558 | @@ -2296,27 +1797,35 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. | ||
2559 | |||
2560 | # Make sure we can run config.sub. | ||
2561 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | ||
2562 | - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 | ||
2563 | + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | ||
2564 | +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | ||
2565 | + { (exit 1); exit 1; }; } | ||
2566 | |||
2567 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 | ||
2568 | -$as_echo_n "checking build system type... " >&6; } | ||
2569 | -if test "${ac_cv_build+set}" = set; then : | ||
2570 | - $as_echo_n "(cached) " >&6 | ||
2571 | +{ echo "$as_me:$LINENO: checking build system type" >&5 | ||
2572 | +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } | ||
2573 | +if test "${ac_cv_build+set}" = set; then | ||
2574 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2575 | else | ||
2576 | ac_build_alias=$build_alias | ||
2577 | test "x$ac_build_alias" = x && | ||
2578 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | ||
2579 | test "x$ac_build_alias" = x && | ||
2580 | - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 | ||
2581 | + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | ||
2582 | +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
2583 | + { (exit 1); exit 1; }; } | ||
2584 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | ||
2585 | - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 | ||
2586 | + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | ||
2587 | +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | ||
2588 | + { (exit 1); exit 1; }; } | ||
2589 | |||
2590 | fi | ||
2591 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 | ||
2592 | -$as_echo "$ac_cv_build" >&6; } | ||
2593 | +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | ||
2594 | +echo "${ECHO_T}$ac_cv_build" >&6; } | ||
2595 | case $ac_cv_build in | ||
2596 | *-*-*) ;; | ||
2597 | -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; | ||
2598 | +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | ||
2599 | +echo "$as_me: error: invalid value of canonical build" >&2;} | ||
2600 | + { (exit 1); exit 1; }; };; | ||
2601 | esac | ||
2602 | build=$ac_cv_build | ||
2603 | ac_save_IFS=$IFS; IFS='-' | ||
2604 | @@ -2332,24 +1841,28 @@ IFS=$ac_save_IFS | ||
2605 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
2606 | |||
2607 | |||
2608 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 | ||
2609 | -$as_echo_n "checking host system type... " >&6; } | ||
2610 | -if test "${ac_cv_host+set}" = set; then : | ||
2611 | - $as_echo_n "(cached) " >&6 | ||
2612 | +{ echo "$as_me:$LINENO: checking host system type" >&5 | ||
2613 | +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } | ||
2614 | +if test "${ac_cv_host+set}" = set; then | ||
2615 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2616 | else | ||
2617 | if test "x$host_alias" = x; then | ||
2618 | ac_cv_host=$ac_cv_build | ||
2619 | else | ||
2620 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | ||
2621 | - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 | ||
2622 | + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | ||
2623 | +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | ||
2624 | + { (exit 1); exit 1; }; } | ||
2625 | fi | ||
2626 | |||
2627 | fi | ||
2628 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 | ||
2629 | -$as_echo "$ac_cv_host" >&6; } | ||
2630 | +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | ||
2631 | +echo "${ECHO_T}$ac_cv_host" >&6; } | ||
2632 | case $ac_cv_host in | ||
2633 | *-*-*) ;; | ||
2634 | -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; | ||
2635 | +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | ||
2636 | +echo "$as_me: error: invalid value of canonical host" >&2;} | ||
2637 | + { (exit 1); exit 1; }; };; | ||
2638 | esac | ||
2639 | host=$ac_cv_host | ||
2640 | ac_save_IFS=$IFS; IFS='-' | ||
2641 | @@ -2365,24 +1878,28 @@ IFS=$ac_save_IFS | ||
2642 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | ||
2643 | |||
2644 | |||
2645 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 | ||
2646 | -$as_echo_n "checking target system type... " >&6; } | ||
2647 | -if test "${ac_cv_target+set}" = set; then : | ||
2648 | - $as_echo_n "(cached) " >&6 | ||
2649 | +{ echo "$as_me:$LINENO: checking target system type" >&5 | ||
2650 | +echo $ECHO_N "checking target system type... $ECHO_C" >&6; } | ||
2651 | +if test "${ac_cv_target+set}" = set; then | ||
2652 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2653 | else | ||
2654 | if test "x$target_alias" = x; then | ||
2655 | ac_cv_target=$ac_cv_host | ||
2656 | else | ||
2657 | ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || | ||
2658 | - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 | ||
2659 | + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 | ||
2660 | +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} | ||
2661 | + { (exit 1); exit 1; }; } | ||
2662 | fi | ||
2663 | |||
2664 | fi | ||
2665 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 | ||
2666 | -$as_echo "$ac_cv_target" >&6; } | ||
2667 | +{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 | ||
2668 | +echo "${ECHO_T}$ac_cv_target" >&6; } | ||
2669 | case $ac_cv_target in | ||
2670 | *-*-*) ;; | ||
2671 | -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; | ||
2672 | +*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 | ||
2673 | +echo "$as_me: error: invalid value of canonical target" >&2;} | ||
2674 | + { (exit 1); exit 1; }; };; | ||
2675 | esac | ||
2676 | target=$ac_cv_target | ||
2677 | ac_save_IFS=$IFS; IFS='-' | ||
2678 | @@ -2411,9 +1928,8 @@ test -n "$target_alias" && | ||
2679 | |||
2680 | |||
2681 | |||
2682 | - | ||
2683 | # Check whether --with-gcc was given. | ||
2684 | -if test "${with_gcc+set}" = set; then : | ||
2685 | +if test "${with_gcc+set}" = set; then | ||
2686 | withval=$with_gcc; | ||
2687 | fi | ||
2688 | |||
2689 | @@ -2431,10 +1947,10 @@ fi | ||
2690 | bsdi*) | ||
2691 | # Extract the first word of "shlicc2", so it can be a program name with args. | ||
2692 | set dummy shlicc2; ac_word=$2 | ||
2693 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2694 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
2695 | -if test "${ac_cv_prog_SHLICC2+set}" = set; then : | ||
2696 | - $as_echo_n "(cached) " >&6 | ||
2697 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2698 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2699 | +if test "${ac_cv_prog_SHLICC2+set}" = set; then | ||
2700 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2701 | else | ||
2702 | if test -n "$SHLICC2"; then | ||
2703 | ac_cv_prog_SHLICC2="$SHLICC2" # Let the user override the test. | ||
2704 | @@ -2444,14 +1960,14 @@ for as_dir in $PATH | ||
2705 | do | ||
2706 | IFS=$as_save_IFS | ||
2707 | test -z "$as_dir" && as_dir=. | ||
2708 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2709 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2710 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2711 | ac_cv_prog_SHLICC2="yes" | ||
2712 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2713 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2714 | break 2 | ||
2715 | fi | ||
2716 | done | ||
2717 | - done | ||
2718 | +done | ||
2719 | IFS=$as_save_IFS | ||
2720 | |||
2721 | test -z "$ac_cv_prog_SHLICC2" && ac_cv_prog_SHLICC2="no" | ||
2722 | @@ -2459,11 +1975,11 @@ fi | ||
2723 | fi | ||
2724 | SHLICC2=$ac_cv_prog_SHLICC2 | ||
2725 | if test -n "$SHLICC2"; then | ||
2726 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLICC2" >&5 | ||
2727 | -$as_echo "$SHLICC2" >&6; } | ||
2728 | + { echo "$as_me:$LINENO: result: $SHLICC2" >&5 | ||
2729 | +echo "${ECHO_T}$SHLICC2" >&6; } | ||
2730 | else | ||
2731 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2732 | -$as_echo "no" >&6; } | ||
2733 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2734 | +echo "${ECHO_T}no" >&6; } | ||
2735 | fi | ||
2736 | |||
2737 | |||
2738 | @@ -2487,10 +2003,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
2739 | if test -n "$ac_tool_prefix"; then | ||
2740 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | ||
2741 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | ||
2742 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2743 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
2744 | -if test "${ac_cv_prog_CC+set}" = set; then : | ||
2745 | - $as_echo_n "(cached) " >&6 | ||
2746 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2747 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2748 | +if test "${ac_cv_prog_CC+set}" = set; then | ||
2749 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2750 | else | ||
2751 | if test -n "$CC"; then | ||
2752 | ac_cv_prog_CC="$CC" # Let the user override the test. | ||
2753 | @@ -2500,25 +2016,25 @@ for as_dir in $PATH | ||
2754 | do | ||
2755 | IFS=$as_save_IFS | ||
2756 | test -z "$as_dir" && as_dir=. | ||
2757 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2758 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2759 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2760 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | ||
2761 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2762 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2763 | break 2 | ||
2764 | fi | ||
2765 | done | ||
2766 | - done | ||
2767 | +done | ||
2768 | IFS=$as_save_IFS | ||
2769 | |||
2770 | fi | ||
2771 | fi | ||
2772 | CC=$ac_cv_prog_CC | ||
2773 | if test -n "$CC"; then | ||
2774 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
2775 | -$as_echo "$CC" >&6; } | ||
2776 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2777 | +echo "${ECHO_T}$CC" >&6; } | ||
2778 | else | ||
2779 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2780 | -$as_echo "no" >&6; } | ||
2781 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2782 | +echo "${ECHO_T}no" >&6; } | ||
2783 | fi | ||
2784 | |||
2785 | |||
2786 | @@ -2527,10 +2043,10 @@ if test -z "$ac_cv_prog_CC"; then | ||
2787 | ac_ct_CC=$CC | ||
2788 | # Extract the first word of "gcc", so it can be a program name with args. | ||
2789 | set dummy gcc; ac_word=$2 | ||
2790 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2791 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
2792 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : | ||
2793 | - $as_echo_n "(cached) " >&6 | ||
2794 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2795 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2796 | +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
2797 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2798 | else | ||
2799 | if test -n "$ac_ct_CC"; then | ||
2800 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
2801 | @@ -2540,25 +2056,25 @@ for as_dir in $PATH | ||
2802 | do | ||
2803 | IFS=$as_save_IFS | ||
2804 | test -z "$as_dir" && as_dir=. | ||
2805 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2806 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2807 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2808 | ac_cv_prog_ac_ct_CC="gcc" | ||
2809 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2810 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2811 | break 2 | ||
2812 | fi | ||
2813 | done | ||
2814 | - done | ||
2815 | +done | ||
2816 | IFS=$as_save_IFS | ||
2817 | |||
2818 | fi | ||
2819 | fi | ||
2820 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
2821 | if test -n "$ac_ct_CC"; then | ||
2822 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 | ||
2823 | -$as_echo "$ac_ct_CC" >&6; } | ||
2824 | + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
2825 | +echo "${ECHO_T}$ac_ct_CC" >&6; } | ||
2826 | else | ||
2827 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2828 | -$as_echo "no" >&6; } | ||
2829 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2830 | +echo "${ECHO_T}no" >&6; } | ||
2831 | fi | ||
2832 | |||
2833 | if test "x$ac_ct_CC" = x; then | ||
2834 | @@ -2566,8 +2082,12 @@ fi | ||
2835 | else | ||
2836 | case $cross_compiling:$ac_tool_warned in | ||
2837 | yes:) | ||
2838 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2839 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2840 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
2841 | +whose name does not start with the host triplet. If you think this | ||
2842 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
2843 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
2844 | +whose name does not start with the host triplet. If you think this | ||
2845 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
2846 | ac_tool_warned=yes ;; | ||
2847 | esac | ||
2848 | CC=$ac_ct_CC | ||
2849 | @@ -2580,10 +2100,10 @@ if test -z "$CC"; then | ||
2850 | if test -n "$ac_tool_prefix"; then | ||
2851 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
2852 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | ||
2853 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2854 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
2855 | -if test "${ac_cv_prog_CC+set}" = set; then : | ||
2856 | - $as_echo_n "(cached) " >&6 | ||
2857 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2858 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2859 | +if test "${ac_cv_prog_CC+set}" = set; then | ||
2860 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2861 | else | ||
2862 | if test -n "$CC"; then | ||
2863 | ac_cv_prog_CC="$CC" # Let the user override the test. | ||
2864 | @@ -2593,25 +2113,25 @@ for as_dir in $PATH | ||
2865 | do | ||
2866 | IFS=$as_save_IFS | ||
2867 | test -z "$as_dir" && as_dir=. | ||
2868 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2869 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2870 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2871 | ac_cv_prog_CC="${ac_tool_prefix}cc" | ||
2872 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2873 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2874 | break 2 | ||
2875 | fi | ||
2876 | done | ||
2877 | - done | ||
2878 | +done | ||
2879 | IFS=$as_save_IFS | ||
2880 | |||
2881 | fi | ||
2882 | fi | ||
2883 | CC=$ac_cv_prog_CC | ||
2884 | if test -n "$CC"; then | ||
2885 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
2886 | -$as_echo "$CC" >&6; } | ||
2887 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2888 | +echo "${ECHO_T}$CC" >&6; } | ||
2889 | else | ||
2890 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2891 | -$as_echo "no" >&6; } | ||
2892 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2893 | +echo "${ECHO_T}no" >&6; } | ||
2894 | fi | ||
2895 | |||
2896 | |||
2897 | @@ -2620,10 +2140,10 @@ fi | ||
2898 | if test -z "$CC"; then | ||
2899 | # Extract the first word of "cc", so it can be a program name with args. | ||
2900 | set dummy cc; ac_word=$2 | ||
2901 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2902 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
2903 | -if test "${ac_cv_prog_CC+set}" = set; then : | ||
2904 | - $as_echo_n "(cached) " >&6 | ||
2905 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2906 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2907 | +if test "${ac_cv_prog_CC+set}" = set; then | ||
2908 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2909 | else | ||
2910 | if test -n "$CC"; then | ||
2911 | ac_cv_prog_CC="$CC" # Let the user override the test. | ||
2912 | @@ -2634,18 +2154,18 @@ for as_dir in $PATH | ||
2913 | do | ||
2914 | IFS=$as_save_IFS | ||
2915 | test -z "$as_dir" && as_dir=. | ||
2916 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2917 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2918 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2919 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | ||
2920 | ac_prog_rejected=yes | ||
2921 | continue | ||
2922 | fi | ||
2923 | ac_cv_prog_CC="cc" | ||
2924 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2925 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2926 | break 2 | ||
2927 | fi | ||
2928 | done | ||
2929 | - done | ||
2930 | +done | ||
2931 | IFS=$as_save_IFS | ||
2932 | |||
2933 | if test $ac_prog_rejected = yes; then | ||
2934 | @@ -2664,11 +2184,11 @@ fi | ||
2935 | fi | ||
2936 | CC=$ac_cv_prog_CC | ||
2937 | if test -n "$CC"; then | ||
2938 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
2939 | -$as_echo "$CC" >&6; } | ||
2940 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2941 | +echo "${ECHO_T}$CC" >&6; } | ||
2942 | else | ||
2943 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2944 | -$as_echo "no" >&6; } | ||
2945 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2946 | +echo "${ECHO_T}no" >&6; } | ||
2947 | fi | ||
2948 | |||
2949 | |||
2950 | @@ -2679,10 +2199,10 @@ if test -z "$CC"; then | ||
2951 | do | ||
2952 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
2953 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
2954 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2955 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
2956 | -if test "${ac_cv_prog_CC+set}" = set; then : | ||
2957 | - $as_echo_n "(cached) " >&6 | ||
2958 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2959 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2960 | +if test "${ac_cv_prog_CC+set}" = set; then | ||
2961 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2962 | else | ||
2963 | if test -n "$CC"; then | ||
2964 | ac_cv_prog_CC="$CC" # Let the user override the test. | ||
2965 | @@ -2692,25 +2212,25 @@ for as_dir in $PATH | ||
2966 | do | ||
2967 | IFS=$as_save_IFS | ||
2968 | test -z "$as_dir" && as_dir=. | ||
2969 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2970 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
2971 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2972 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | ||
2973 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2974 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2975 | break 2 | ||
2976 | fi | ||
2977 | done | ||
2978 | - done | ||
2979 | +done | ||
2980 | IFS=$as_save_IFS | ||
2981 | |||
2982 | fi | ||
2983 | fi | ||
2984 | CC=$ac_cv_prog_CC | ||
2985 | if test -n "$CC"; then | ||
2986 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 | ||
2987 | -$as_echo "$CC" >&6; } | ||
2988 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2989 | +echo "${ECHO_T}$CC" >&6; } | ||
2990 | else | ||
2991 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2992 | -$as_echo "no" >&6; } | ||
2993 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2994 | +echo "${ECHO_T}no" >&6; } | ||
2995 | fi | ||
2996 | |||
2997 | |||
2998 | @@ -2723,10 +2243,10 @@ if test -z "$CC"; then | ||
2999 | do | ||
3000 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
3001 | set dummy $ac_prog; ac_word=$2 | ||
3002 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3003 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
3004 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : | ||
3005 | - $as_echo_n "(cached) " >&6 | ||
3006 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3007 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
3008 | +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
3009 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3010 | else | ||
3011 | if test -n "$ac_ct_CC"; then | ||
3012 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
3013 | @@ -2736,25 +2256,25 @@ for as_dir in $PATH | ||
3014 | do | ||
3015 | IFS=$as_save_IFS | ||
3016 | test -z "$as_dir" && as_dir=. | ||
3017 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
3018 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
3019 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
3020 | ac_cv_prog_ac_ct_CC="$ac_prog" | ||
3021 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3022 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3023 | break 2 | ||
3024 | fi | ||
3025 | done | ||
3026 | - done | ||
3027 | +done | ||
3028 | IFS=$as_save_IFS | ||
3029 | |||
3030 | fi | ||
3031 | fi | ||
3032 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
3033 | if test -n "$ac_ct_CC"; then | ||
3034 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 | ||
3035 | -$as_echo "$ac_ct_CC" >&6; } | ||
3036 | + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
3037 | +echo "${ECHO_T}$ac_ct_CC" >&6; } | ||
3038 | else | ||
3039 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3040 | -$as_echo "no" >&6; } | ||
3041 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
3042 | +echo "${ECHO_T}no" >&6; } | ||
3043 | fi | ||
3044 | |||
3045 | |||
3046 | @@ -2766,8 +2286,12 @@ done | ||
3047 | else | ||
3048 | case $cross_compiling:$ac_tool_warned in | ||
3049 | yes:) | ||
3050 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
3051 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
3052 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
3053 | +whose name does not start with the host triplet. If you think this | ||
3054 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
3055 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
3056 | +whose name does not start with the host triplet. If you think this | ||
3057 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
3058 | ac_tool_warned=yes ;; | ||
3059 | esac | ||
3060 | CC=$ac_ct_CC | ||
3061 | @@ -2777,37 +2301,51 @@ fi | ||
3062 | fi | ||
3063 | |||
3064 | |||
3065 | -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3066 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3067 | -as_fn_error $? "no acceptable C compiler found in \$PATH | ||
3068 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
3069 | +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | ||
3070 | +See \`config.log' for more details." >&5 | ||
3071 | +echo "$as_me: error: no acceptable C compiler found in \$PATH | ||
3072 | +See \`config.log' for more details." >&2;} | ||
3073 | + { (exit 1); exit 1; }; } | ||
3074 | |||
3075 | # Provide some information about the compiler. | ||
3076 | -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 | ||
3077 | -set X $ac_compile | ||
3078 | -ac_compiler=$2 | ||
3079 | -for ac_option in --version -v -V -qversion; do | ||
3080 | - { { ac_try="$ac_compiler $ac_option >&5" | ||
3081 | +echo "$as_me:$LINENO: checking for C compiler version" >&5 | ||
3082 | +ac_compiler=`set X $ac_compile; echo $2` | ||
3083 | +{ (ac_try="$ac_compiler --version >&5" | ||
3084 | case "(($ac_try" in | ||
3085 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3086 | *) ac_try_echo=$ac_try;; | ||
3087 | esac | ||
3088 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3089 | -$as_echo "$ac_try_echo"; } >&5 | ||
3090 | - (eval "$ac_compiler $ac_option >&5") 2>conftest.err | ||
3091 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3092 | + (eval "$ac_compiler --version >&5") 2>&5 | ||
3093 | ac_status=$? | ||
3094 | - if test -s conftest.err; then | ||
3095 | - sed '10a\ | ||
3096 | -... rest of stderr output deleted ... | ||
3097 | - 10q' conftest.err >conftest.er1 | ||
3098 | - cat conftest.er1 >&5 | ||
3099 | - fi | ||
3100 | - rm -f conftest.er1 conftest.err | ||
3101 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3102 | - test $ac_status = 0; } | ||
3103 | -done | ||
3104 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3105 | + (exit $ac_status); } | ||
3106 | +{ (ac_try="$ac_compiler -v >&5" | ||
3107 | +case "(($ac_try" in | ||
3108 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3109 | + *) ac_try_echo=$ac_try;; | ||
3110 | +esac | ||
3111 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3112 | + (eval "$ac_compiler -v >&5") 2>&5 | ||
3113 | + ac_status=$? | ||
3114 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3115 | + (exit $ac_status); } | ||
3116 | +{ (ac_try="$ac_compiler -V >&5" | ||
3117 | +case "(($ac_try" in | ||
3118 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3119 | + *) ac_try_echo=$ac_try;; | ||
3120 | +esac | ||
3121 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3122 | + (eval "$ac_compiler -V >&5") 2>&5 | ||
3123 | + ac_status=$? | ||
3124 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3125 | + (exit $ac_status); } | ||
3126 | |||
3127 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3128 | +cat >conftest.$ac_ext <<_ACEOF | ||
3129 | +/* confdefs.h. */ | ||
3130 | +_ACEOF | ||
3131 | +cat confdefs.h >>conftest.$ac_ext | ||
3132 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3133 | /* end confdefs.h. */ | ||
3134 | |||
3135 | int | ||
3136 | @@ -2819,38 +2357,42 @@ main () | ||
3137 | } | ||
3138 | _ACEOF | ||
3139 | ac_clean_files_save=$ac_clean_files | ||
3140 | -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" | ||
3141 | +ac_clean_files="$ac_clean_files a.out a.exe b.out" | ||
3142 | # Try to create an executable without -o first, disregard a.out. | ||
3143 | # It will help us diagnose broken compilers, and finding out an intuition | ||
3144 | # of exeext. | ||
3145 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 | ||
3146 | -$as_echo_n "checking whether the C compiler works... " >&6; } | ||
3147 | -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
3148 | - | ||
3149 | -# The possible output files: | ||
3150 | -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" | ||
3151 | - | ||
3152 | +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | ||
3153 | +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } | ||
3154 | +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
3155 | +# | ||
3156 | +# List of possible output files, starting from the most likely. | ||
3157 | +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) | ||
3158 | +# only as a last resort. b.out is created by i960 compilers. | ||
3159 | +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' | ||
3160 | +# | ||
3161 | +# The IRIX 6 linker writes into existing files which may not be | ||
3162 | +# executable, retaining their permissions. Remove them first so a | ||
3163 | +# subsequent execution test works. | ||
3164 | ac_rmfiles= | ||
3165 | for ac_file in $ac_files | ||
3166 | do | ||
3167 | case $ac_file in | ||
3168 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; | ||
3169 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | ||
3170 | * ) ac_rmfiles="$ac_rmfiles $ac_file";; | ||
3171 | esac | ||
3172 | done | ||
3173 | rm -f $ac_rmfiles | ||
3174 | |||
3175 | -if { { ac_try="$ac_link_default" | ||
3176 | +if { (ac_try="$ac_link_default" | ||
3177 | case "(($ac_try" in | ||
3178 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3179 | *) ac_try_echo=$ac_try;; | ||
3180 | esac | ||
3181 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3182 | -$as_echo "$ac_try_echo"; } >&5 | ||
3183 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3184 | (eval "$ac_link_default") 2>&5 | ||
3185 | ac_status=$? | ||
3186 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3187 | - test $ac_status = 0; }; then : | ||
3188 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3189 | + (exit $ac_status); }; then | ||
3190 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. | ||
3191 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' | ||
3192 | # in a Makefile. We should not override ac_cv_exeext if it was cached, | ||
3193 | @@ -2860,14 +2402,14 @@ for ac_file in $ac_files '' | ||
3194 | do | ||
3195 | test -f "$ac_file" || continue | ||
3196 | case $ac_file in | ||
3197 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) | ||
3198 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) | ||
3199 | ;; | ||
3200 | [ab].out ) | ||
3201 | # We found the default executable, but exeext='' is most | ||
3202 | # certainly right. | ||
3203 | break;; | ||
3204 | *.* ) | ||
3205 | - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | ||
3206 | + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | ||
3207 | then :; else | ||
3208 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
3209 | fi | ||
3210 | @@ -2886,41 +2428,78 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= | ||
3211 | else | ||
3212 | ac_file='' | ||
3213 | fi | ||
3214 | -if test -z "$ac_file"; then : | ||
3215 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3216 | -$as_echo "no" >&6; } | ||
3217 | -$as_echo "$as_me: failed program was:" >&5 | ||
3218 | + | ||
3219 | +{ echo "$as_me:$LINENO: result: $ac_file" >&5 | ||
3220 | +echo "${ECHO_T}$ac_file" >&6; } | ||
3221 | +if test -z "$ac_file"; then | ||
3222 | + echo "$as_me: failed program was:" >&5 | ||
3223 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3224 | |||
3225 | -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3226 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3227 | -as_fn_error 77 "C compiler cannot create executables | ||
3228 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
3229 | -else | ||
3230 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3231 | -$as_echo "yes" >&6; } | ||
3232 | +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables | ||
3233 | +See \`config.log' for more details." >&5 | ||
3234 | +echo "$as_me: error: C compiler cannot create executables | ||
3235 | +See \`config.log' for more details." >&2;} | ||
3236 | + { (exit 77); exit 77; }; } | ||
3237 | fi | ||
3238 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 | ||
3239 | -$as_echo_n "checking for C compiler default output file name... " >&6; } | ||
3240 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 | ||
3241 | -$as_echo "$ac_file" >&6; } | ||
3242 | + | ||
3243 | ac_exeext=$ac_cv_exeext | ||
3244 | |||
3245 | -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out | ||
3246 | +# Check that the compiler produces executables we can run. If not, either | ||
3247 | +# the compiler is broken, or we cross compile. | ||
3248 | +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | ||
3249 | +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | ||
3250 | +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | ||
3251 | +# If not cross compiling, check that we can run a simple program. | ||
3252 | +if test "$cross_compiling" != yes; then | ||
3253 | + if { ac_try='./$ac_file' | ||
3254 | + { (case "(($ac_try" in | ||
3255 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3256 | + *) ac_try_echo=$ac_try;; | ||
3257 | +esac | ||
3258 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3259 | + (eval "$ac_try") 2>&5 | ||
3260 | + ac_status=$? | ||
3261 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3262 | + (exit $ac_status); }; }; then | ||
3263 | + cross_compiling=no | ||
3264 | + else | ||
3265 | + if test "$cross_compiling" = maybe; then | ||
3266 | + cross_compiling=yes | ||
3267 | + else | ||
3268 | + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. | ||
3269 | +If you meant to cross compile, use \`--host'. | ||
3270 | +See \`config.log' for more details." >&5 | ||
3271 | +echo "$as_me: error: cannot run C compiled programs. | ||
3272 | +If you meant to cross compile, use \`--host'. | ||
3273 | +See \`config.log' for more details." >&2;} | ||
3274 | + { (exit 1); exit 1; }; } | ||
3275 | + fi | ||
3276 | + fi | ||
3277 | +fi | ||
3278 | +{ echo "$as_me:$LINENO: result: yes" >&5 | ||
3279 | +echo "${ECHO_T}yes" >&6; } | ||
3280 | + | ||
3281 | +rm -f a.out a.exe conftest$ac_cv_exeext b.out | ||
3282 | ac_clean_files=$ac_clean_files_save | ||
3283 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 | ||
3284 | -$as_echo_n "checking for suffix of executables... " >&6; } | ||
3285 | -if { { ac_try="$ac_link" | ||
3286 | +# Check that the compiler produces executables we can run. If not, either | ||
3287 | +# the compiler is broken, or we cross compile. | ||
3288 | +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | ||
3289 | +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } | ||
3290 | +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 | ||
3291 | +echo "${ECHO_T}$cross_compiling" >&6; } | ||
3292 | + | ||
3293 | +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 | ||
3294 | +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } | ||
3295 | +if { (ac_try="$ac_link" | ||
3296 | case "(($ac_try" in | ||
3297 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3298 | *) ac_try_echo=$ac_try;; | ||
3299 | esac | ||
3300 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3301 | -$as_echo "$ac_try_echo"; } >&5 | ||
3302 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3303 | (eval "$ac_link") 2>&5 | ||
3304 | ac_status=$? | ||
3305 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3306 | - test $ac_status = 0; }; then : | ||
3307 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3308 | + (exit $ac_status); }; then | ||
3309 | # If both `conftest.exe' and `conftest' are `present' (well, observable) | ||
3310 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will | ||
3311 | # work properly (i.e., refer to `conftest.exe'), while it won't with | ||
3312 | @@ -2928,141 +2507,93 @@ $as_echo "$ac_try_echo"; } >&5 | ||
3313 | for ac_file in conftest.exe conftest conftest.*; do | ||
3314 | test -f "$ac_file" || continue | ||
3315 | case $ac_file in | ||
3316 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; | ||
3317 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | ||
3318 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
3319 | break;; | ||
3320 | * ) break;; | ||
3321 | esac | ||
3322 | done | ||
3323 | else | ||
3324 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3325 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3326 | -as_fn_error $? "cannot compute suffix of executables: cannot compile and link | ||
3327 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
3328 | + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | ||
3329 | +See \`config.log' for more details." >&5 | ||
3330 | +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | ||
3331 | +See \`config.log' for more details." >&2;} | ||
3332 | + { (exit 1); exit 1; }; } | ||
3333 | fi | ||
3334 | -rm -f conftest conftest$ac_cv_exeext | ||
3335 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 | ||
3336 | -$as_echo "$ac_cv_exeext" >&6; } | ||
3337 | + | ||
3338 | +rm -f conftest$ac_cv_exeext | ||
3339 | +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | ||
3340 | +echo "${ECHO_T}$ac_cv_exeext" >&6; } | ||
3341 | |||
3342 | rm -f conftest.$ac_ext | ||
3343 | EXEEXT=$ac_cv_exeext | ||
3344 | ac_exeext=$EXEEXT | ||
3345 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3346 | +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 | ||
3347 | +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } | ||
3348 | +if test "${ac_cv_objext+set}" = set; then | ||
3349 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3350 | +else | ||
3351 | + cat >conftest.$ac_ext <<_ACEOF | ||
3352 | +/* confdefs.h. */ | ||
3353 | +_ACEOF | ||
3354 | +cat confdefs.h >>conftest.$ac_ext | ||
3355 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3356 | /* end confdefs.h. */ | ||
3357 | -#include <stdio.h> | ||
3358 | + | ||
3359 | int | ||
3360 | main () | ||
3361 | { | ||
3362 | -FILE *f = fopen ("conftest.out", "w"); | ||
3363 | - return ferror (f) || fclose (f) != 0; | ||
3364 | |||
3365 | ; | ||
3366 | return 0; | ||
3367 | } | ||
3368 | _ACEOF | ||
3369 | -ac_clean_files="$ac_clean_files conftest.out" | ||
3370 | -# Check that the compiler produces executables we can run. If not, either | ||
3371 | -# the compiler is broken, or we cross compile. | ||
3372 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 | ||
3373 | -$as_echo_n "checking whether we are cross compiling... " >&6; } | ||
3374 | -if test "$cross_compiling" != yes; then | ||
3375 | - { { ac_try="$ac_link" | ||
3376 | +rm -f conftest.o conftest.obj | ||
3377 | +if { (ac_try="$ac_compile" | ||
3378 | case "(($ac_try" in | ||
3379 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3380 | *) ac_try_echo=$ac_try;; | ||
3381 | esac | ||
3382 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3383 | -$as_echo "$ac_try_echo"; } >&5 | ||
3384 | - (eval "$ac_link") 2>&5 | ||
3385 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3386 | + (eval "$ac_compile") 2>&5 | ||
3387 | ac_status=$? | ||
3388 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3389 | - test $ac_status = 0; } | ||
3390 | - if { ac_try='./conftest$ac_cv_exeext' | ||
3391 | - { { case "(($ac_try" in | ||
3392 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3393 | - *) ac_try_echo=$ac_try;; | ||
3394 | -esac | ||
3395 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3396 | -$as_echo "$ac_try_echo"; } >&5 | ||
3397 | - (eval "$ac_try") 2>&5 | ||
3398 | - ac_status=$? | ||
3399 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3400 | - test $ac_status = 0; }; }; then | ||
3401 | - cross_compiling=no | ||
3402 | - else | ||
3403 | - if test "$cross_compiling" = maybe; then | ||
3404 | - cross_compiling=yes | ||
3405 | - else | ||
3406 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3407 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3408 | -as_fn_error $? "cannot run C compiled programs. | ||
3409 | -If you meant to cross compile, use \`--host'. | ||
3410 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
3411 | - fi | ||
3412 | - fi | ||
3413 | -fi | ||
3414 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 | ||
3415 | -$as_echo "$cross_compiling" >&6; } | ||
3416 | - | ||
3417 | -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out | ||
3418 | -ac_clean_files=$ac_clean_files_save | ||
3419 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 | ||
3420 | -$as_echo_n "checking for suffix of object files... " >&6; } | ||
3421 | -if test "${ac_cv_objext+set}" = set; then : | ||
3422 | - $as_echo_n "(cached) " >&6 | ||
3423 | -else | ||
3424 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3425 | -/* end confdefs.h. */ | ||
3426 | - | ||
3427 | -int | ||
3428 | -main () | ||
3429 | -{ | ||
3430 | - | ||
3431 | - ; | ||
3432 | - return 0; | ||
3433 | -} | ||
3434 | -_ACEOF | ||
3435 | -rm -f conftest.o conftest.obj | ||
3436 | -if { { ac_try="$ac_compile" | ||
3437 | -case "(($ac_try" in | ||
3438 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3439 | - *) ac_try_echo=$ac_try;; | ||
3440 | -esac | ||
3441 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3442 | -$as_echo "$ac_try_echo"; } >&5 | ||
3443 | - (eval "$ac_compile") 2>&5 | ||
3444 | - ac_status=$? | ||
3445 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3446 | - test $ac_status = 0; }; then : | ||
3447 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3448 | + (exit $ac_status); }; then | ||
3449 | for ac_file in conftest.o conftest.obj conftest.*; do | ||
3450 | test -f "$ac_file" || continue; | ||
3451 | case $ac_file in | ||
3452 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; | ||
3453 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; | ||
3454 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | ||
3455 | break;; | ||
3456 | esac | ||
3457 | done | ||
3458 | else | ||
3459 | - $as_echo "$as_me: failed program was:" >&5 | ||
3460 | + echo "$as_me: failed program was:" >&5 | ||
3461 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3462 | |||
3463 | -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3464 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3465 | -as_fn_error $? "cannot compute suffix of object files: cannot compile | ||
3466 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
3467 | +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile | ||
3468 | +See \`config.log' for more details." >&5 | ||
3469 | +echo "$as_me: error: cannot compute suffix of object files: cannot compile | ||
3470 | +See \`config.log' for more details." >&2;} | ||
3471 | + { (exit 1); exit 1; }; } | ||
3472 | fi | ||
3473 | + | ||
3474 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | ||
3475 | fi | ||
3476 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 | ||
3477 | -$as_echo "$ac_cv_objext" >&6; } | ||
3478 | +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | ||
3479 | +echo "${ECHO_T}$ac_cv_objext" >&6; } | ||
3480 | OBJEXT=$ac_cv_objext | ||
3481 | ac_objext=$OBJEXT | ||
3482 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 | ||
3483 | -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } | ||
3484 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : | ||
3485 | - $as_echo_n "(cached) " >&6 | ||
3486 | +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | ||
3487 | +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | ||
3488 | +if test "${ac_cv_c_compiler_gnu+set}" = set; then | ||
3489 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3490 | else | ||
3491 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3492 | + cat >conftest.$ac_ext <<_ACEOF | ||
3493 | +/* confdefs.h. */ | ||
3494 | +_ACEOF | ||
3495 | +cat confdefs.h >>conftest.$ac_ext | ||
3496 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3497 | /* end confdefs.h. */ | ||
3498 | |||
3499 | int | ||
3500 | @@ -3076,34 +2607,54 @@ main () | ||
3501 | return 0; | ||
3502 | } | ||
3503 | _ACEOF | ||
3504 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
3505 | +rm -f conftest.$ac_objext | ||
3506 | +if { (ac_try="$ac_compile" | ||
3507 | +case "(($ac_try" in | ||
3508 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3509 | + *) ac_try_echo=$ac_try;; | ||
3510 | +esac | ||
3511 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3512 | + (eval "$ac_compile") 2>conftest.er1 | ||
3513 | + ac_status=$? | ||
3514 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3515 | + rm -f conftest.er1 | ||
3516 | + cat conftest.err >&5 | ||
3517 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3518 | + (exit $ac_status); } && { | ||
3519 | + test -z "$ac_c_werror_flag" || | ||
3520 | + test ! -s conftest.err | ||
3521 | + } && test -s conftest.$ac_objext; then | ||
3522 | ac_compiler_gnu=yes | ||
3523 | else | ||
3524 | - ac_compiler_gnu=no | ||
3525 | + echo "$as_me: failed program was:" >&5 | ||
3526 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3527 | + | ||
3528 | + ac_compiler_gnu=no | ||
3529 | fi | ||
3530 | + | ||
3531 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3532 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
3533 | |||
3534 | fi | ||
3535 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 | ||
3536 | -$as_echo "$ac_cv_c_compiler_gnu" >&6; } | ||
3537 | -if test $ac_compiler_gnu = yes; then | ||
3538 | - GCC=yes | ||
3539 | -else | ||
3540 | - GCC= | ||
3541 | -fi | ||
3542 | +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | ||
3543 | +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | ||
3544 | +GCC=`test $ac_compiler_gnu = yes && echo yes` | ||
3545 | ac_test_CFLAGS=${CFLAGS+set} | ||
3546 | ac_save_CFLAGS=$CFLAGS | ||
3547 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 | ||
3548 | -$as_echo_n "checking whether $CC accepts -g... " >&6; } | ||
3549 | -if test "${ac_cv_prog_cc_g+set}" = set; then : | ||
3550 | - $as_echo_n "(cached) " >&6 | ||
3551 | +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | ||
3552 | +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | ||
3553 | +if test "${ac_cv_prog_cc_g+set}" = set; then | ||
3554 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3555 | else | ||
3556 | ac_save_c_werror_flag=$ac_c_werror_flag | ||
3557 | ac_c_werror_flag=yes | ||
3558 | ac_cv_prog_cc_g=no | ||
3559 | CFLAGS="-g" | ||
3560 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3561 | + cat >conftest.$ac_ext <<_ACEOF | ||
3562 | +/* confdefs.h. */ | ||
3563 | +_ACEOF | ||
3564 | +cat confdefs.h >>conftest.$ac_ext | ||
3565 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3566 | /* end confdefs.h. */ | ||
3567 | |||
3568 | int | ||
3569 | @@ -3114,11 +2665,34 @@ main () | ||
3570 | return 0; | ||
3571 | } | ||
3572 | _ACEOF | ||
3573 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
3574 | +rm -f conftest.$ac_objext | ||
3575 | +if { (ac_try="$ac_compile" | ||
3576 | +case "(($ac_try" in | ||
3577 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3578 | + *) ac_try_echo=$ac_try;; | ||
3579 | +esac | ||
3580 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3581 | + (eval "$ac_compile") 2>conftest.er1 | ||
3582 | + ac_status=$? | ||
3583 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3584 | + rm -f conftest.er1 | ||
3585 | + cat conftest.err >&5 | ||
3586 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3587 | + (exit $ac_status); } && { | ||
3588 | + test -z "$ac_c_werror_flag" || | ||
3589 | + test ! -s conftest.err | ||
3590 | + } && test -s conftest.$ac_objext; then | ||
3591 | ac_cv_prog_cc_g=yes | ||
3592 | else | ||
3593 | - CFLAGS="" | ||
3594 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3595 | + echo "$as_me: failed program was:" >&5 | ||
3596 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3597 | + | ||
3598 | + CFLAGS="" | ||
3599 | + cat >conftest.$ac_ext <<_ACEOF | ||
3600 | +/* confdefs.h. */ | ||
3601 | +_ACEOF | ||
3602 | +cat confdefs.h >>conftest.$ac_ext | ||
3603 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3604 | /* end confdefs.h. */ | ||
3605 | |||
3606 | int | ||
3607 | @@ -3129,12 +2703,35 @@ main () | ||
3608 | return 0; | ||
3609 | } | ||
3610 | _ACEOF | ||
3611 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
3612 | - | ||
3613 | +rm -f conftest.$ac_objext | ||
3614 | +if { (ac_try="$ac_compile" | ||
3615 | +case "(($ac_try" in | ||
3616 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3617 | + *) ac_try_echo=$ac_try;; | ||
3618 | +esac | ||
3619 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3620 | + (eval "$ac_compile") 2>conftest.er1 | ||
3621 | + ac_status=$? | ||
3622 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3623 | + rm -f conftest.er1 | ||
3624 | + cat conftest.err >&5 | ||
3625 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3626 | + (exit $ac_status); } && { | ||
3627 | + test -z "$ac_c_werror_flag" || | ||
3628 | + test ! -s conftest.err | ||
3629 | + } && test -s conftest.$ac_objext; then | ||
3630 | + : | ||
3631 | else | ||
3632 | - ac_c_werror_flag=$ac_save_c_werror_flag | ||
3633 | + echo "$as_me: failed program was:" >&5 | ||
3634 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3635 | + | ||
3636 | + ac_c_werror_flag=$ac_save_c_werror_flag | ||
3637 | CFLAGS="-g" | ||
3638 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3639 | + cat >conftest.$ac_ext <<_ACEOF | ||
3640 | +/* confdefs.h. */ | ||
3641 | +_ACEOF | ||
3642 | +cat confdefs.h >>conftest.$ac_ext | ||
3643 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3644 | /* end confdefs.h. */ | ||
3645 | |||
3646 | int | ||
3647 | @@ -3145,18 +2742,42 @@ main () | ||
3648 | return 0; | ||
3649 | } | ||
3650 | _ACEOF | ||
3651 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
3652 | +rm -f conftest.$ac_objext | ||
3653 | +if { (ac_try="$ac_compile" | ||
3654 | +case "(($ac_try" in | ||
3655 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3656 | + *) ac_try_echo=$ac_try;; | ||
3657 | +esac | ||
3658 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3659 | + (eval "$ac_compile") 2>conftest.er1 | ||
3660 | + ac_status=$? | ||
3661 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3662 | + rm -f conftest.er1 | ||
3663 | + cat conftest.err >&5 | ||
3664 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3665 | + (exit $ac_status); } && { | ||
3666 | + test -z "$ac_c_werror_flag" || | ||
3667 | + test ! -s conftest.err | ||
3668 | + } && test -s conftest.$ac_objext; then | ||
3669 | ac_cv_prog_cc_g=yes | ||
3670 | +else | ||
3671 | + echo "$as_me: failed program was:" >&5 | ||
3672 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3673 | + | ||
3674 | + | ||
3675 | fi | ||
3676 | + | ||
3677 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3678 | fi | ||
3679 | + | ||
3680 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3681 | fi | ||
3682 | + | ||
3683 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3684 | ac_c_werror_flag=$ac_save_c_werror_flag | ||
3685 | fi | ||
3686 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 | ||
3687 | -$as_echo "$ac_cv_prog_cc_g" >&6; } | ||
3688 | +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
3689 | +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | ||
3690 | if test "$ac_test_CFLAGS" = set; then | ||
3691 | CFLAGS=$ac_save_CFLAGS | ||
3692 | elif test $ac_cv_prog_cc_g = yes; then | ||
3693 | @@ -3172,14 +2793,18 @@ else | ||
3694 | CFLAGS= | ||
3695 | fi | ||
3696 | fi | ||
3697 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 | ||
3698 | -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } | ||
3699 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : | ||
3700 | - $as_echo_n "(cached) " >&6 | ||
3701 | +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | ||
3702 | +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | ||
3703 | +if test "${ac_cv_prog_cc_c89+set}" = set; then | ||
3704 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3705 | else | ||
3706 | ac_cv_prog_cc_c89=no | ||
3707 | ac_save_CC=$CC | ||
3708 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3709 | +cat >conftest.$ac_ext <<_ACEOF | ||
3710 | +/* confdefs.h. */ | ||
3711 | +_ACEOF | ||
3712 | +cat confdefs.h >>conftest.$ac_ext | ||
3713 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3714 | /* end confdefs.h. */ | ||
3715 | #include <stdarg.h> | ||
3716 | #include <stdio.h> | ||
3717 | @@ -3236,9 +2861,31 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ | ||
3718 | -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
3719 | do | ||
3720 | CC="$ac_save_CC $ac_arg" | ||
3721 | - if ac_fn_c_try_compile "$LINENO"; then : | ||
3722 | + rm -f conftest.$ac_objext | ||
3723 | +if { (ac_try="$ac_compile" | ||
3724 | +case "(($ac_try" in | ||
3725 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3726 | + *) ac_try_echo=$ac_try;; | ||
3727 | +esac | ||
3728 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3729 | + (eval "$ac_compile") 2>conftest.er1 | ||
3730 | + ac_status=$? | ||
3731 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3732 | + rm -f conftest.er1 | ||
3733 | + cat conftest.err >&5 | ||
3734 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3735 | + (exit $ac_status); } && { | ||
3736 | + test -z "$ac_c_werror_flag" || | ||
3737 | + test ! -s conftest.err | ||
3738 | + } && test -s conftest.$ac_objext; then | ||
3739 | ac_cv_prog_cc_c89=$ac_arg | ||
3740 | +else | ||
3741 | + echo "$as_me: failed program was:" >&5 | ||
3742 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3743 | + | ||
3744 | + | ||
3745 | fi | ||
3746 | + | ||
3747 | rm -f core conftest.err conftest.$ac_objext | ||
3748 | test "x$ac_cv_prog_cc_c89" != "xno" && break | ||
3749 | done | ||
3750 | @@ -3249,19 +2896,17 @@ fi | ||
3751 | # AC_CACHE_VAL | ||
3752 | case "x$ac_cv_prog_cc_c89" in | ||
3753 | x) | ||
3754 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 | ||
3755 | -$as_echo "none needed" >&6; } ;; | ||
3756 | + { echo "$as_me:$LINENO: result: none needed" >&5 | ||
3757 | +echo "${ECHO_T}none needed" >&6; } ;; | ||
3758 | xno) | ||
3759 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 | ||
3760 | -$as_echo "unsupported" >&6; } ;; | ||
3761 | + { echo "$as_me:$LINENO: result: unsupported" >&5 | ||
3762 | +echo "${ECHO_T}unsupported" >&6; } ;; | ||
3763 | *) | ||
3764 | CC="$CC $ac_cv_prog_cc_c89" | ||
3765 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 | ||
3766 | -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; | ||
3767 | + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | ||
3768 | +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | ||
3769 | esac | ||
3770 | -if test "x$ac_cv_prog_cc_c89" != xno; then : | ||
3771 | |||
3772 | -fi | ||
3773 | |||
3774 | ac_ext=c | ||
3775 | ac_cpp='$CPP $CPPFLAGS' | ||
3776 | @@ -3278,10 +2923,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
3777 | ac_cv_lbl_gcc_vers=2 | ||
3778 | V_CCOPT="-O2" | ||
3779 | else | ||
3780 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5 | ||
3781 | -$as_echo_n "checking gcc version... " >&6; } | ||
3782 | - if test "${ac_cv_lbl_gcc_vers+set}" = set; then : | ||
3783 | - $as_echo_n "(cached) " >&6 | ||
3784 | + { echo "$as_me:$LINENO: checking gcc version" >&5 | ||
3785 | +echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } | ||
3786 | + if test "${ac_cv_lbl_gcc_vers+set}" = set; then | ||
3787 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3788 | else | ||
3789 | ac_cv_lbl_gcc_vers=`$CC -v 2>&1 | \ | ||
3790 | sed -e '/^gcc version /!d' \ | ||
3791 | @@ -3290,20 +2935,24 @@ else | ||
3792 | -e 's/\..*//'` | ||
3793 | fi | ||
3794 | |||
3795 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_gcc_vers" >&5 | ||
3796 | -$as_echo "$ac_cv_lbl_gcc_vers" >&6; } | ||
3797 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 | ||
3798 | +echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } | ||
3799 | if test $ac_cv_lbl_gcc_vers -gt 1 ; then | ||
3800 | V_CCOPT="-O2" | ||
3801 | fi | ||
3802 | fi | ||
3803 | else | ||
3804 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking that $CC handles ansi prototypes" >&5 | ||
3805 | -$as_echo_n "checking that $CC handles ansi prototypes... " >&6; } | ||
3806 | - if test "${ac_cv_lbl_cc_ansi_prototypes+set}" = set; then : | ||
3807 | - $as_echo_n "(cached) " >&6 | ||
3808 | + { echo "$as_me:$LINENO: checking that $CC handles ansi prototypes" >&5 | ||
3809 | +echo $ECHO_N "checking that $CC handles ansi prototypes... $ECHO_C" >&6; } | ||
3810 | + if test "${ac_cv_lbl_cc_ansi_prototypes+set}" = set; then | ||
3811 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3812 | else | ||
3813 | |||
3814 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3815 | +cat >conftest.$ac_ext <<_ACEOF | ||
3816 | +/* confdefs.h. */ | ||
3817 | +_ACEOF | ||
3818 | +cat confdefs.h >>conftest.$ac_ext | ||
3819 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3820 | /* end confdefs.h. */ | ||
3821 | #include <sys/types.h> | ||
3822 | int | ||
3823 | @@ -3314,28 +2963,52 @@ int frob(int, char *) | ||
3824 | return 0; | ||
3825 | } | ||
3826 | _ACEOF | ||
3827 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
3828 | +rm -f conftest.$ac_objext | ||
3829 | +if { (ac_try="$ac_compile" | ||
3830 | +case "(($ac_try" in | ||
3831 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3832 | + *) ac_try_echo=$ac_try;; | ||
3833 | +esac | ||
3834 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3835 | + (eval "$ac_compile") 2>conftest.er1 | ||
3836 | + ac_status=$? | ||
3837 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3838 | + rm -f conftest.er1 | ||
3839 | + cat conftest.err >&5 | ||
3840 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3841 | + (exit $ac_status); } && { | ||
3842 | + test -z "$ac_c_werror_flag" || | ||
3843 | + test ! -s conftest.err | ||
3844 | + } && test -s conftest.$ac_objext; then | ||
3845 | ac_cv_lbl_cc_ansi_prototypes=yes | ||
3846 | else | ||
3847 | - ac_cv_lbl_cc_ansi_prototypes=no | ||
3848 | + echo "$as_me: failed program was:" >&5 | ||
3849 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3850 | + | ||
3851 | + ac_cv_lbl_cc_ansi_prototypes=no | ||
3852 | fi | ||
3853 | + | ||
3854 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3855 | fi | ||
3856 | |||
3857 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_cc_ansi_prototypes" >&5 | ||
3858 | -$as_echo "$ac_cv_lbl_cc_ansi_prototypes" >&6; } | ||
3859 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_cc_ansi_prototypes" >&5 | ||
3860 | +echo "${ECHO_T}$ac_cv_lbl_cc_ansi_prototypes" >&6; } | ||
3861 | if test $ac_cv_lbl_cc_ansi_prototypes = no ; then | ||
3862 | case "$host_os" in | ||
3863 | |||
3864 | hpux*) | ||
3865 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HP-UX ansi compiler ($CC -Aa -D_HPUX_SOURCE)" >&5 | ||
3866 | -$as_echo_n "checking for HP-UX ansi compiler ($CC -Aa -D_HPUX_SOURCE)... " >&6; } | ||
3867 | + { echo "$as_me:$LINENO: checking for HP-UX ansi compiler ($CC -Aa -D_HPUX_SOURCE)" >&5 | ||
3868 | +echo $ECHO_N "checking for HP-UX ansi compiler ($CC -Aa -D_HPUX_SOURCE)... $ECHO_C" >&6; } | ||
3869 | savedcflags="$CFLAGS" | ||
3870 | CFLAGS="-Aa -D_HPUX_SOURCE $CFLAGS" | ||
3871 | - if test "${ac_cv_lbl_cc_hpux_cc_aa+set}" = set; then : | ||
3872 | - $as_echo_n "(cached) " >&6 | ||
3873 | + if test "${ac_cv_lbl_cc_hpux_cc_aa+set}" = set; then | ||
3874 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3875 | else | ||
3876 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3877 | + cat >conftest.$ac_ext <<_ACEOF | ||
3878 | +/* confdefs.h. */ | ||
3879 | +_ACEOF | ||
3880 | +cat confdefs.h >>conftest.$ac_ext | ||
3881 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3882 | /* end confdefs.h. */ | ||
3883 | #include <sys/types.h> | ||
3884 | int | ||
3885 | @@ -3346,35 +3019,63 @@ int frob(int, char *) | ||
3886 | return 0; | ||
3887 | } | ||
3888 | _ACEOF | ||
3889 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
3890 | +rm -f conftest.$ac_objext | ||
3891 | +if { (ac_try="$ac_compile" | ||
3892 | +case "(($ac_try" in | ||
3893 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3894 | + *) ac_try_echo=$ac_try;; | ||
3895 | +esac | ||
3896 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3897 | + (eval "$ac_compile") 2>conftest.er1 | ||
3898 | + ac_status=$? | ||
3899 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3900 | + rm -f conftest.er1 | ||
3901 | + cat conftest.err >&5 | ||
3902 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3903 | + (exit $ac_status); } && { | ||
3904 | + test -z "$ac_c_werror_flag" || | ||
3905 | + test ! -s conftest.err | ||
3906 | + } && test -s conftest.$ac_objext; then | ||
3907 | ac_cv_lbl_cc_hpux_cc_aa=yes | ||
3908 | else | ||
3909 | - ac_cv_lbl_cc_hpux_cc_aa=no | ||
3910 | + echo "$as_me: failed program was:" >&5 | ||
3911 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3912 | + | ||
3913 | + ac_cv_lbl_cc_hpux_cc_aa=no | ||
3914 | fi | ||
3915 | + | ||
3916 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3917 | fi | ||
3918 | |||
3919 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_cc_hpux_cc_aa" >&5 | ||
3920 | -$as_echo "$ac_cv_lbl_cc_hpux_cc_aa" >&6; } | ||
3921 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_cc_hpux_cc_aa" >&5 | ||
3922 | +echo "${ECHO_T}$ac_cv_lbl_cc_hpux_cc_aa" >&6; } | ||
3923 | if test $ac_cv_lbl_cc_hpux_cc_aa = no ; then | ||
3924 | - as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 5 | ||
3925 | + { { echo "$as_me:$LINENO: error: see the INSTALL doc for more info" >&5 | ||
3926 | +echo "$as_me: error: see the INSTALL doc for more info" >&2;} | ||
3927 | + { (exit 1); exit 1; }; } | ||
3928 | fi | ||
3929 | CFLAGS="$savedcflags" | ||
3930 | V_CCOPT="-Aa $V_CCOPT" | ||
3931 | |||
3932 | -$as_echo "#define _HPUX_SOURCE 1" >>confdefs.h | ||
3933 | +cat >>confdefs.h <<\_ACEOF | ||
3934 | +#define _HPUX_SOURCE 1 | ||
3935 | +_ACEOF | ||
3936 | |||
3937 | ;; | ||
3938 | |||
3939 | osf*) | ||
3940 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ansi mode in DEC compiler ($CC -std1)" >&5 | ||
3941 | -$as_echo_n "checking for ansi mode in DEC compiler ($CC -std1)... " >&6; } | ||
3942 | + { echo "$as_me:$LINENO: checking for ansi mode in DEC compiler ($CC -std1)" >&5 | ||
3943 | +echo $ECHO_N "checking for ansi mode in DEC compiler ($CC -std1)... $ECHO_C" >&6; } | ||
3944 | savedcflags="$CFLAGS" | ||
3945 | CFLAGS="-std1" | ||
3946 | - if test "${ac_cv_lbl_cc_osf1_cc_std1+set}" = set; then : | ||
3947 | - $as_echo_n "(cached) " >&6 | ||
3948 | + if test "${ac_cv_lbl_cc_osf1_cc_std1+set}" = set; then | ||
3949 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3950 | else | ||
3951 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3952 | + cat >conftest.$ac_ext <<_ACEOF | ||
3953 | +/* confdefs.h. */ | ||
3954 | +_ACEOF | ||
3955 | +cat confdefs.h >>conftest.$ac_ext | ||
3956 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3957 | /* end confdefs.h. */ | ||
3958 | #include <sys/types.h> | ||
3959 | int | ||
3960 | @@ -3385,25 +3086,49 @@ int frob(int, char *) | ||
3961 | return 0; | ||
3962 | } | ||
3963 | _ACEOF | ||
3964 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
3965 | +rm -f conftest.$ac_objext | ||
3966 | +if { (ac_try="$ac_compile" | ||
3967 | +case "(($ac_try" in | ||
3968 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3969 | + *) ac_try_echo=$ac_try;; | ||
3970 | +esac | ||
3971 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3972 | + (eval "$ac_compile") 2>conftest.er1 | ||
3973 | + ac_status=$? | ||
3974 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3975 | + rm -f conftest.er1 | ||
3976 | + cat conftest.err >&5 | ||
3977 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3978 | + (exit $ac_status); } && { | ||
3979 | + test -z "$ac_c_werror_flag" || | ||
3980 | + test ! -s conftest.err | ||
3981 | + } && test -s conftest.$ac_objext; then | ||
3982 | ac_cv_lbl_cc_osf1_cc_std1=yes | ||
3983 | else | ||
3984 | - ac_cv_lbl_cc_osf1_cc_std1=no | ||
3985 | + echo "$as_me: failed program was:" >&5 | ||
3986 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3987 | + | ||
3988 | + ac_cv_lbl_cc_osf1_cc_std1=no | ||
3989 | fi | ||
3990 | + | ||
3991 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3992 | fi | ||
3993 | |||
3994 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_cc_osf1_cc_std1" >&5 | ||
3995 | -$as_echo "$ac_cv_lbl_cc_osf1_cc_std1" >&6; } | ||
3996 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_cc_osf1_cc_std1" >&5 | ||
3997 | +echo "${ECHO_T}$ac_cv_lbl_cc_osf1_cc_std1" >&6; } | ||
3998 | if test $ac_cv_lbl_cc_osf1_cc_std1 = no ; then | ||
3999 | - as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 5 | ||
4000 | + { { echo "$as_me:$LINENO: error: see the INSTALL doc for more info" >&5 | ||
4001 | +echo "$as_me: error: see the INSTALL doc for more info" >&2;} | ||
4002 | + { (exit 1); exit 1; }; } | ||
4003 | fi | ||
4004 | CFLAGS="$savedcflags" | ||
4005 | V_CCOPT="-std1 $V_CCOPT" | ||
4006 | ;; | ||
4007 | |||
4008 | *) | ||
4009 | - as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 5 | ||
4010 | + { { echo "$as_me:$LINENO: error: see the INSTALL doc for more info" >&5 | ||
4011 | +echo "$as_me: error: see the INSTALL doc for more info" >&2;} | ||
4012 | + { (exit 1); exit 1; }; } | ||
4013 | ;; | ||
4014 | esac | ||
4015 | fi | ||
4016 | @@ -3425,12 +3150,16 @@ $as_echo "$ac_cv_lbl_cc_osf1_cc_std1" >&6; } | ||
4017 | ;; | ||
4018 | |||
4019 | ultrix*) | ||
4020 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking that Ultrix $CC hacks const in prototypes" >&5 | ||
4021 | -$as_echo_n "checking that Ultrix $CC hacks const in prototypes... " >&6; } | ||
4022 | - if test "${ac_cv_lbl_cc_const_proto+set}" = set; then : | ||
4023 | - $as_echo_n "(cached) " >&6 | ||
4024 | + { echo "$as_me:$LINENO: checking that Ultrix $CC hacks const in prototypes" >&5 | ||
4025 | +echo $ECHO_N "checking that Ultrix $CC hacks const in prototypes... $ECHO_C" >&6; } | ||
4026 | + if test "${ac_cv_lbl_cc_const_proto+set}" = set; then | ||
4027 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4028 | else | ||
4029 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4030 | + cat >conftest.$ac_ext <<_ACEOF | ||
4031 | +/* confdefs.h. */ | ||
4032 | +_ACEOF | ||
4033 | +cat confdefs.h >>conftest.$ac_ext | ||
4034 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4035 | /* end confdefs.h. */ | ||
4036 | #include <sys/types.h> | ||
4037 | int | ||
4038 | @@ -3442,19 +3171,41 @@ struct a { int b; }; | ||
4039 | return 0; | ||
4040 | } | ||
4041 | _ACEOF | ||
4042 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
4043 | +rm -f conftest.$ac_objext | ||
4044 | +if { (ac_try="$ac_compile" | ||
4045 | +case "(($ac_try" in | ||
4046 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4047 | + *) ac_try_echo=$ac_try;; | ||
4048 | +esac | ||
4049 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4050 | + (eval "$ac_compile") 2>conftest.er1 | ||
4051 | + ac_status=$? | ||
4052 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4053 | + rm -f conftest.er1 | ||
4054 | + cat conftest.err >&5 | ||
4055 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4056 | + (exit $ac_status); } && { | ||
4057 | + test -z "$ac_c_werror_flag" || | ||
4058 | + test ! -s conftest.err | ||
4059 | + } && test -s conftest.$ac_objext; then | ||
4060 | ac_cv_lbl_cc_const_proto=yes | ||
4061 | else | ||
4062 | - ac_cv_lbl_cc_const_proto=no | ||
4063 | + echo "$as_me: failed program was:" >&5 | ||
4064 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4065 | + | ||
4066 | + ac_cv_lbl_cc_const_proto=no | ||
4067 | fi | ||
4068 | + | ||
4069 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4070 | fi | ||
4071 | |||
4072 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_cc_const_proto" >&5 | ||
4073 | -$as_echo "$ac_cv_lbl_cc_const_proto" >&6; } | ||
4074 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_cc_const_proto" >&5 | ||
4075 | +echo "${ECHO_T}$ac_cv_lbl_cc_const_proto" >&6; } | ||
4076 | if test $ac_cv_lbl_cc_const_proto = no ; then | ||
4077 | |||
4078 | -$as_echo "#define const /**/" >>confdefs.h | ||
4079 | +cat >>confdefs.h <<\_ACEOF | ||
4080 | +#define const | ||
4081 | +_ACEOF | ||
4082 | |||
4083 | fi | ||
4084 | ;; | ||
4085 | @@ -3608,19 +3359,23 @@ $as_echo "#define const /**/" >>confdefs.h | ||
4086 | esac | ||
4087 | fi | ||
4088 | |||
4089 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 | ||
4090 | -$as_echo_n "checking for inline... " >&6; } | ||
4091 | +{ echo "$as_me:$LINENO: checking for inline" >&5 | ||
4092 | +echo $ECHO_N "checking for inline... $ECHO_C" >&6; } | ||
4093 | save_CFLAGS="$CFLAGS" | ||
4094 | CFLAGS="$V_CCOPT" | ||
4095 | - if test "${ac_cv_lbl_inline+set}" = set; then : | ||
4096 | - $as_echo_n "(cached) " >&6 | ||
4097 | + if test "${ac_cv_lbl_inline+set}" = set; then | ||
4098 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4099 | else | ||
4100 | |||
4101 | ac_cv_lbl_inline="" | ||
4102 | ac_lbl_cc_inline=no | ||
4103 | for ac_lbl_inline in inline __inline__ __inline | ||
4104 | do | ||
4105 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4106 | + cat >conftest.$ac_ext <<_ACEOF | ||
4107 | +/* confdefs.h. */ | ||
4108 | +_ACEOF | ||
4109 | +cat confdefs.h >>conftest.$ac_ext | ||
4110 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4111 | /* end confdefs.h. */ | ||
4112 | #define inline $ac_lbl_inline | ||
4113 | static inline struct iltest *foo(void); | ||
4114 | @@ -3644,9 +3399,31 @@ main () | ||
4115 | return 0; | ||
4116 | } | ||
4117 | _ACEOF | ||
4118 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
4119 | +rm -f conftest.$ac_objext | ||
4120 | +if { (ac_try="$ac_compile" | ||
4121 | +case "(($ac_try" in | ||
4122 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4123 | + *) ac_try_echo=$ac_try;; | ||
4124 | +esac | ||
4125 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4126 | + (eval "$ac_compile") 2>conftest.er1 | ||
4127 | + ac_status=$? | ||
4128 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4129 | + rm -f conftest.er1 | ||
4130 | + cat conftest.err >&5 | ||
4131 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4132 | + (exit $ac_status); } && { | ||
4133 | + test -z "$ac_c_werror_flag" || | ||
4134 | + test ! -s conftest.err | ||
4135 | + } && test -s conftest.$ac_objext; then | ||
4136 | ac_lbl_cc_inline=yes | ||
4137 | +else | ||
4138 | + echo "$as_me: failed program was:" >&5 | ||
4139 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4140 | + | ||
4141 | + | ||
4142 | fi | ||
4143 | + | ||
4144 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4145 | if test "$ac_lbl_cc_inline" = yes ; then | ||
4146 | break; | ||
4147 | @@ -3659,11 +3436,11 @@ fi | ||
4148 | |||
4149 | CFLAGS="$save_CFLAGS" | ||
4150 | if test ! -z "$ac_cv_lbl_inline" ; then | ||
4151 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_inline" >&5 | ||
4152 | -$as_echo "$ac_cv_lbl_inline" >&6; } | ||
4153 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_inline" >&5 | ||
4154 | +echo "${ECHO_T}$ac_cv_lbl_inline" >&6; } | ||
4155 | else | ||
4156 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4157 | -$as_echo "no" >&6; } | ||
4158 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
4159 | +echo "${ECHO_T}no" >&6; } | ||
4160 | fi | ||
4161 | |||
4162 | cat >>confdefs.h <<_ACEOF | ||
4163 | @@ -3671,13 +3448,17 @@ cat >>confdefs.h <<_ACEOF | ||
4164 | _ACEOF | ||
4165 | |||
4166 | |||
4167 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5 | ||
4168 | -$as_echo_n "checking for __attribute__... " >&6; } | ||
4169 | -if test "${ac_cv___attribute__+set}" = set; then : | ||
4170 | - $as_echo_n "(cached) " >&6 | ||
4171 | +{ echo "$as_me:$LINENO: checking for __attribute__" >&5 | ||
4172 | +echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; } | ||
4173 | +if test "${ac_cv___attribute__+set}" = set; then | ||
4174 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4175 | else | ||
4176 | |||
4177 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4178 | +cat >conftest.$ac_ext <<_ACEOF | ||
4179 | +/* confdefs.h. */ | ||
4180 | +_ACEOF | ||
4181 | +cat confdefs.h >>conftest.$ac_ext | ||
4182 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4183 | /* end confdefs.h. */ | ||
4184 | |||
4185 | #include <stdlib.h> | ||
4186 | @@ -3697,24 +3478,46 @@ main(int argc, char **argv) | ||
4187 | } | ||
4188 | |||
4189 | _ACEOF | ||
4190 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
4191 | +rm -f conftest.$ac_objext | ||
4192 | +if { (ac_try="$ac_compile" | ||
4193 | +case "(($ac_try" in | ||
4194 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4195 | + *) ac_try_echo=$ac_try;; | ||
4196 | +esac | ||
4197 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4198 | + (eval "$ac_compile") 2>conftest.er1 | ||
4199 | + ac_status=$? | ||
4200 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4201 | + rm -f conftest.er1 | ||
4202 | + cat conftest.err >&5 | ||
4203 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4204 | + (exit $ac_status); } && { | ||
4205 | + test -z "$ac_c_werror_flag" || | ||
4206 | + test ! -s conftest.err | ||
4207 | + } && test -s conftest.$ac_objext; then | ||
4208 | ac_cv___attribute__=yes | ||
4209 | else | ||
4210 | - ac_cv___attribute__=no | ||
4211 | + echo "$as_me: failed program was:" >&5 | ||
4212 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4213 | + | ||
4214 | + ac_cv___attribute__=no | ||
4215 | fi | ||
4216 | + | ||
4217 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4218 | fi | ||
4219 | |||
4220 | if test "$ac_cv___attribute__" = "yes"; then | ||
4221 | |||
4222 | -$as_echo "#define HAVE___ATTRIBUTE__ 1" >>confdefs.h | ||
4223 | +cat >>confdefs.h <<\_ACEOF | ||
4224 | +#define HAVE___ATTRIBUTE__ 1 | ||
4225 | +_ACEOF | ||
4226 | |||
4227 | V_DEFS="$V_DEFS -D_U_=\"__attribute__((unused))\"" | ||
4228 | else | ||
4229 | V_DEFS="$V_DEFS -D_U_=\"\"" | ||
4230 | fi | ||
4231 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute__" >&5 | ||
4232 | -$as_echo "$ac_cv___attribute__" >&6; } | ||
4233 | +{ echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5 | ||
4234 | +echo "${ECHO_T}$ac_cv___attribute__" >&6; } | ||
4235 | |||
4236 | |||
4237 | ac_ext=c | ||
4238 | @@ -3722,15 +3525,15 @@ ac_cpp='$CPP $CPPFLAGS' | ||
4239 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
4240 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
4241 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
4242 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 | ||
4243 | -$as_echo_n "checking how to run the C preprocessor... " >&6; } | ||
4244 | +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | ||
4245 | +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } | ||
4246 | # On Suns, sometimes $CPP names a directory. | ||
4247 | if test -n "$CPP" && test -d "$CPP"; then | ||
4248 | CPP= | ||
4249 | fi | ||
4250 | if test -z "$CPP"; then | ||
4251 | - if test "${ac_cv_prog_CPP+set}" = set; then : | ||
4252 | - $as_echo_n "(cached) " >&6 | ||
4253 | + if test "${ac_cv_prog_CPP+set}" = set; then | ||
4254 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4255 | else | ||
4256 | # Double quotes because CPP needs to be expanded | ||
4257 | for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" | ||
4258 | @@ -3744,7 +3547,11 @@ do | ||
4259 | # <limits.h> exists even on freestanding compilers. | ||
4260 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
4261 | # not just through cpp. "Syntax error" is here to catch this case. | ||
4262 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4263 | + cat >conftest.$ac_ext <<_ACEOF | ||
4264 | +/* confdefs.h. */ | ||
4265 | +_ACEOF | ||
4266 | +cat confdefs.h >>conftest.$ac_ext | ||
4267 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4268 | /* end confdefs.h. */ | ||
4269 | #ifdef __STDC__ | ||
4270 | # include <limits.h> | ||
4271 | @@ -3753,34 +3560,76 @@ do | ||
4272 | #endif | ||
4273 | Syntax error | ||
4274 | _ACEOF | ||
4275 | -if ac_fn_c_try_cpp "$LINENO"; then : | ||
4276 | - | ||
4277 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4278 | +case "(($ac_try" in | ||
4279 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4280 | + *) ac_try_echo=$ac_try;; | ||
4281 | +esac | ||
4282 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4283 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4284 | + ac_status=$? | ||
4285 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4286 | + rm -f conftest.er1 | ||
4287 | + cat conftest.err >&5 | ||
4288 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4289 | + (exit $ac_status); } >/dev/null && { | ||
4290 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4291 | + test ! -s conftest.err | ||
4292 | + }; then | ||
4293 | + : | ||
4294 | else | ||
4295 | + echo "$as_me: failed program was:" >&5 | ||
4296 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4297 | + | ||
4298 | # Broken: fails on valid input. | ||
4299 | continue | ||
4300 | fi | ||
4301 | -rm -f conftest.err conftest.i conftest.$ac_ext | ||
4302 | + | ||
4303 | +rm -f conftest.err conftest.$ac_ext | ||
4304 | |||
4305 | # OK, works on sane cases. Now check whether nonexistent headers | ||
4306 | # can be detected and how. | ||
4307 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4308 | + cat >conftest.$ac_ext <<_ACEOF | ||
4309 | +/* confdefs.h. */ | ||
4310 | +_ACEOF | ||
4311 | +cat confdefs.h >>conftest.$ac_ext | ||
4312 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4313 | /* end confdefs.h. */ | ||
4314 | #include <ac_nonexistent.h> | ||
4315 | _ACEOF | ||
4316 | -if ac_fn_c_try_cpp "$LINENO"; then : | ||
4317 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4318 | +case "(($ac_try" in | ||
4319 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4320 | + *) ac_try_echo=$ac_try;; | ||
4321 | +esac | ||
4322 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4323 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4324 | + ac_status=$? | ||
4325 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4326 | + rm -f conftest.er1 | ||
4327 | + cat conftest.err >&5 | ||
4328 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4329 | + (exit $ac_status); } >/dev/null && { | ||
4330 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4331 | + test ! -s conftest.err | ||
4332 | + }; then | ||
4333 | # Broken: success on invalid input. | ||
4334 | continue | ||
4335 | else | ||
4336 | + echo "$as_me: failed program was:" >&5 | ||
4337 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4338 | + | ||
4339 | # Passes both tests. | ||
4340 | ac_preproc_ok=: | ||
4341 | break | ||
4342 | fi | ||
4343 | -rm -f conftest.err conftest.i conftest.$ac_ext | ||
4344 | + | ||
4345 | +rm -f conftest.err conftest.$ac_ext | ||
4346 | |||
4347 | done | ||
4348 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | ||
4349 | -rm -f conftest.i conftest.err conftest.$ac_ext | ||
4350 | -if $ac_preproc_ok; then : | ||
4351 | +rm -f conftest.err conftest.$ac_ext | ||
4352 | +if $ac_preproc_ok; then | ||
4353 | break | ||
4354 | fi | ||
4355 | |||
4356 | @@ -3792,8 +3641,8 @@ fi | ||
4357 | else | ||
4358 | ac_cv_prog_CPP=$CPP | ||
4359 | fi | ||
4360 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 | ||
4361 | -$as_echo "$CPP" >&6; } | ||
4362 | +{ echo "$as_me:$LINENO: result: $CPP" >&5 | ||
4363 | +echo "${ECHO_T}$CPP" >&6; } | ||
4364 | ac_preproc_ok=false | ||
4365 | for ac_c_preproc_warn_flag in '' yes | ||
4366 | do | ||
4367 | @@ -3803,7 +3652,11 @@ do | ||
4368 | # <limits.h> exists even on freestanding compilers. | ||
4369 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
4370 | # not just through cpp. "Syntax error" is here to catch this case. | ||
4371 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4372 | + cat >conftest.$ac_ext <<_ACEOF | ||
4373 | +/* confdefs.h. */ | ||
4374 | +_ACEOF | ||
4375 | +cat confdefs.h >>conftest.$ac_ext | ||
4376 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4377 | /* end confdefs.h. */ | ||
4378 | #ifdef __STDC__ | ||
4379 | # include <limits.h> | ||
4380 | @@ -3812,40 +3665,83 @@ do | ||
4381 | #endif | ||
4382 | Syntax error | ||
4383 | _ACEOF | ||
4384 | -if ac_fn_c_try_cpp "$LINENO"; then : | ||
4385 | - | ||
4386 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4387 | +case "(($ac_try" in | ||
4388 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4389 | + *) ac_try_echo=$ac_try;; | ||
4390 | +esac | ||
4391 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4392 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4393 | + ac_status=$? | ||
4394 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4395 | + rm -f conftest.er1 | ||
4396 | + cat conftest.err >&5 | ||
4397 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4398 | + (exit $ac_status); } >/dev/null && { | ||
4399 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4400 | + test ! -s conftest.err | ||
4401 | + }; then | ||
4402 | + : | ||
4403 | else | ||
4404 | + echo "$as_me: failed program was:" >&5 | ||
4405 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4406 | + | ||
4407 | # Broken: fails on valid input. | ||
4408 | continue | ||
4409 | fi | ||
4410 | -rm -f conftest.err conftest.i conftest.$ac_ext | ||
4411 | + | ||
4412 | +rm -f conftest.err conftest.$ac_ext | ||
4413 | |||
4414 | # OK, works on sane cases. Now check whether nonexistent headers | ||
4415 | # can be detected and how. | ||
4416 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
4417 | + cat >conftest.$ac_ext <<_ACEOF | ||
4418 | +/* confdefs.h. */ | ||
4419 | +_ACEOF | ||
4420 | +cat confdefs.h >>conftest.$ac_ext | ||
4421 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4422 | /* end confdefs.h. */ | ||
4423 | #include <ac_nonexistent.h> | ||
4424 | _ACEOF | ||
4425 | -if ac_fn_c_try_cpp "$LINENO"; then : | ||
4426 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4427 | +case "(($ac_try" in | ||
4428 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4429 | + *) ac_try_echo=$ac_try;; | ||
4430 | +esac | ||
4431 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4432 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4433 | + ac_status=$? | ||
4434 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4435 | + rm -f conftest.er1 | ||
4436 | + cat conftest.err >&5 | ||
4437 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4438 | + (exit $ac_status); } >/dev/null && { | ||
4439 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4440 | + test ! -s conftest.err | ||
4441 | + }; then | ||
4442 | # Broken: success on invalid input. | ||
4443 | continue | ||
4444 | else | ||
4445 | + echo "$as_me: failed program was:" >&5 | ||
4446 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4447 | + | ||
4448 | # Passes both tests. | ||
4449 | ac_preproc_ok=: | ||
4450 | break | ||
4451 | fi | ||
4452 | -rm -f conftest.err conftest.i conftest.$ac_ext | ||
4453 | + | ||
4454 | +rm -f conftest.err conftest.$ac_ext | ||
4455 | |||
4456 | done | ||
4457 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | ||
4458 | -rm -f conftest.i conftest.err conftest.$ac_ext | ||
4459 | -if $ac_preproc_ok; then : | ||
4460 | - | ||
4461 | +rm -f conftest.err conftest.$ac_ext | ||
4462 | +if $ac_preproc_ok; then | ||
4463 | + : | ||
4464 | else | ||
4465 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
4466 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
4467 | -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check | ||
4468 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
4469 | + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | ||
4470 | +See \`config.log' for more details." >&5 | ||
4471 | +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | ||
4472 | +See \`config.log' for more details." >&2;} | ||
4473 | + { (exit 1); exit 1; }; } | ||
4474 | fi | ||
4475 | |||
4476 | ac_ext=c | ||
4477 | @@ -3855,40 +3751,45 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ | ||
4478 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
4479 | |||
4480 | |||
4481 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 | ||
4482 | -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } | ||
4483 | -if test "${ac_cv_path_GREP+set}" = set; then : | ||
4484 | - $as_echo_n "(cached) " >&6 | ||
4485 | +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | ||
4486 | +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } | ||
4487 | +if test "${ac_cv_path_GREP+set}" = set; then | ||
4488 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4489 | +else | ||
4490 | + # Extract the first word of "grep ggrep" to use in msg output | ||
4491 | +if test -z "$GREP"; then | ||
4492 | +set dummy grep ggrep; ac_prog_name=$2 | ||
4493 | +if test "${ac_cv_path_GREP+set}" = set; then | ||
4494 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4495 | else | ||
4496 | - if test -z "$GREP"; then | ||
4497 | ac_path_GREP_found=false | ||
4498 | - # Loop through the user's path and test for each of PROGNAME-LIST | ||
4499 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4500 | +# Loop through the user's path and test for each of PROGNAME-LIST | ||
4501 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4502 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | ||
4503 | do | ||
4504 | IFS=$as_save_IFS | ||
4505 | test -z "$as_dir" && as_dir=. | ||
4506 | - for ac_prog in grep ggrep; do | ||
4507 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4508 | - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | ||
4509 | - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | ||
4510 | -# Check for GNU ac_path_GREP and select it if it is found. | ||
4511 | + for ac_prog in grep ggrep; do | ||
4512 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4513 | + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | ||
4514 | + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | ||
4515 | + # Check for GNU ac_path_GREP and select it if it is found. | ||
4516 | # Check for GNU $ac_path_GREP | ||
4517 | case `"$ac_path_GREP" --version 2>&1` in | ||
4518 | *GNU*) | ||
4519 | ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; | ||
4520 | *) | ||
4521 | ac_count=0 | ||
4522 | - $as_echo_n 0123456789 >"conftest.in" | ||
4523 | + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | ||
4524 | while : | ||
4525 | do | ||
4526 | cat "conftest.in" "conftest.in" >"conftest.tmp" | ||
4527 | mv "conftest.tmp" "conftest.in" | ||
4528 | cp "conftest.in" "conftest.nl" | ||
4529 | - $as_echo 'GREP' >> "conftest.nl" | ||
4530 | + echo 'GREP' >> "conftest.nl" | ||
4531 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
4532 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
4533 | - as_fn_arith $ac_count + 1 && ac_count=$as_val | ||
4534 | + ac_count=`expr $ac_count + 1` | ||
4535 | if test $ac_count -gt ${ac_path_GREP_max-0}; then | ||
4536 | # Best one so far, save it but keep looking for a better one | ||
4537 | ac_cv_path_GREP="$ac_path_GREP" | ||
4538 | @@ -3900,61 +3801,77 @@ case `"$ac_path_GREP" --version 2>&1` in | ||
4539 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | ||
4540 | esac | ||
4541 | |||
4542 | - $ac_path_GREP_found && break 3 | ||
4543 | - done | ||
4544 | - done | ||
4545 | + | ||
4546 | + $ac_path_GREP_found && break 3 | ||
4547 | done | ||
4548 | +done | ||
4549 | + | ||
4550 | +done | ||
4551 | IFS=$as_save_IFS | ||
4552 | - if test -z "$ac_cv_path_GREP"; then | ||
4553 | - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | ||
4554 | - fi | ||
4555 | + | ||
4556 | + | ||
4557 | +fi | ||
4558 | + | ||
4559 | +GREP="$ac_cv_path_GREP" | ||
4560 | +if test -z "$GREP"; then | ||
4561 | + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4562 | +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4563 | + { (exit 1); exit 1; }; } | ||
4564 | +fi | ||
4565 | + | ||
4566 | else | ||
4567 | ac_cv_path_GREP=$GREP | ||
4568 | fi | ||
4569 | |||
4570 | + | ||
4571 | fi | ||
4572 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 | ||
4573 | -$as_echo "$ac_cv_path_GREP" >&6; } | ||
4574 | +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | ||
4575 | +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } | ||
4576 | GREP="$ac_cv_path_GREP" | ||
4577 | |||
4578 | |||
4579 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 | ||
4580 | -$as_echo_n "checking for egrep... " >&6; } | ||
4581 | -if test "${ac_cv_path_EGREP+set}" = set; then : | ||
4582 | - $as_echo_n "(cached) " >&6 | ||
4583 | +{ echo "$as_me:$LINENO: checking for egrep" >&5 | ||
4584 | +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } | ||
4585 | +if test "${ac_cv_path_EGREP+set}" = set; then | ||
4586 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4587 | else | ||
4588 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | ||
4589 | then ac_cv_path_EGREP="$GREP -E" | ||
4590 | else | ||
4591 | - if test -z "$EGREP"; then | ||
4592 | + # Extract the first word of "egrep" to use in msg output | ||
4593 | +if test -z "$EGREP"; then | ||
4594 | +set dummy egrep; ac_prog_name=$2 | ||
4595 | +if test "${ac_cv_path_EGREP+set}" = set; then | ||
4596 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4597 | +else | ||
4598 | ac_path_EGREP_found=false | ||
4599 | - # Loop through the user's path and test for each of PROGNAME-LIST | ||
4600 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4601 | +# Loop through the user's path and test for each of PROGNAME-LIST | ||
4602 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4603 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | ||
4604 | do | ||
4605 | IFS=$as_save_IFS | ||
4606 | test -z "$as_dir" && as_dir=. | ||
4607 | - for ac_prog in egrep; do | ||
4608 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
4609 | - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | ||
4610 | - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | ||
4611 | -# Check for GNU ac_path_EGREP and select it if it is found. | ||
4612 | + for ac_prog in egrep; do | ||
4613 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4614 | + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | ||
4615 | + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | ||
4616 | + # Check for GNU ac_path_EGREP and select it if it is found. | ||
4617 | # Check for GNU $ac_path_EGREP | ||
4618 | case `"$ac_path_EGREP" --version 2>&1` in | ||
4619 | *GNU*) | ||
4620 | ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; | ||
4621 | *) | ||
4622 | ac_count=0 | ||
4623 | - $as_echo_n 0123456789 >"conftest.in" | ||
4624 | + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | ||
4625 | while : | ||
4626 | do | ||
4627 | cat "conftest.in" "conftest.in" >"conftest.tmp" | ||
4628 | mv "conftest.tmp" "conftest.in" | ||
4629 | cp "conftest.in" "conftest.nl" | ||
4630 | - $as_echo 'EGREP' >> "conftest.nl" | ||
4631 | + echo 'EGREP' >> "conftest.nl" | ||
4632 | "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
4633 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
4634 | - as_fn_arith $ac_count + 1 && ac_count=$as_val | ||
4635 | + ac_count=`expr $ac_count + 1` | ||
4636 | if test $ac_count -gt ${ac_path_EGREP_max-0}; then | ||
4637 | # Best one so far, save it but keep looking for a better one | ||
4638 | ac_cv_path_EGREP="$ac_path_EGREP" | ||
4639 | @@ -3966,268 +3883,953 @@ case `"$ac_path_EGREP" --version 2>&1` in | ||
4640 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | ||
4641 | esac | ||
4642 | |||
4643 | - $ac_path_EGREP_found && break 3 | ||
4644 | - done | ||
4645 | - done | ||
4646 | + | ||
4647 | + $ac_path_EGREP_found && break 3 | ||
4648 | done | ||
4649 | +done | ||
4650 | + | ||
4651 | +done | ||
4652 | IFS=$as_save_IFS | ||
4653 | - if test -z "$ac_cv_path_EGREP"; then | ||
4654 | - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | ||
4655 | - fi | ||
4656 | + | ||
4657 | + | ||
4658 | +fi | ||
4659 | + | ||
4660 | +EGREP="$ac_cv_path_EGREP" | ||
4661 | +if test -z "$EGREP"; then | ||
4662 | + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4663 | +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4664 | + { (exit 1); exit 1; }; } | ||
4665 | +fi | ||
4666 | + | ||
4667 | +else | ||
4668 | + ac_cv_path_EGREP=$EGREP | ||
4669 | +fi | ||
4670 | + | ||
4671 | + | ||
4672 | + fi | ||
4673 | +fi | ||
4674 | +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | ||
4675 | +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } | ||
4676 | + EGREP="$ac_cv_path_EGREP" | ||
4677 | + | ||
4678 | + | ||
4679 | +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | ||
4680 | +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } | ||
4681 | +if test "${ac_cv_header_stdc+set}" = set; then | ||
4682 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4683 | +else | ||
4684 | + cat >conftest.$ac_ext <<_ACEOF | ||
4685 | +/* confdefs.h. */ | ||
4686 | +_ACEOF | ||
4687 | +cat confdefs.h >>conftest.$ac_ext | ||
4688 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4689 | +/* end confdefs.h. */ | ||
4690 | +#include <stdlib.h> | ||
4691 | +#include <stdarg.h> | ||
4692 | +#include <string.h> | ||
4693 | +#include <float.h> | ||
4694 | + | ||
4695 | +int | ||
4696 | +main () | ||
4697 | +{ | ||
4698 | + | ||
4699 | + ; | ||
4700 | + return 0; | ||
4701 | +} | ||
4702 | +_ACEOF | ||
4703 | +rm -f conftest.$ac_objext | ||
4704 | +if { (ac_try="$ac_compile" | ||
4705 | +case "(($ac_try" in | ||
4706 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4707 | + *) ac_try_echo=$ac_try;; | ||
4708 | +esac | ||
4709 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4710 | + (eval "$ac_compile") 2>conftest.er1 | ||
4711 | + ac_status=$? | ||
4712 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4713 | + rm -f conftest.er1 | ||
4714 | + cat conftest.err >&5 | ||
4715 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4716 | + (exit $ac_status); } && { | ||
4717 | + test -z "$ac_c_werror_flag" || | ||
4718 | + test ! -s conftest.err | ||
4719 | + } && test -s conftest.$ac_objext; then | ||
4720 | + ac_cv_header_stdc=yes | ||
4721 | +else | ||
4722 | + echo "$as_me: failed program was:" >&5 | ||
4723 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4724 | + | ||
4725 | + ac_cv_header_stdc=no | ||
4726 | +fi | ||
4727 | + | ||
4728 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4729 | + | ||
4730 | +if test $ac_cv_header_stdc = yes; then | ||
4731 | + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
4732 | + cat >conftest.$ac_ext <<_ACEOF | ||
4733 | +/* confdefs.h. */ | ||
4734 | +_ACEOF | ||
4735 | +cat confdefs.h >>conftest.$ac_ext | ||
4736 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4737 | +/* end confdefs.h. */ | ||
4738 | +#include <string.h> | ||
4739 | + | ||
4740 | +_ACEOF | ||
4741 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
4742 | + $EGREP "memchr" >/dev/null 2>&1; then | ||
4743 | + : | ||
4744 | +else | ||
4745 | + ac_cv_header_stdc=no | ||
4746 | +fi | ||
4747 | +rm -f -r conftest* | ||
4748 | + | ||
4749 | +fi | ||
4750 | + | ||
4751 | +if test $ac_cv_header_stdc = yes; then | ||
4752 | + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
4753 | + cat >conftest.$ac_ext <<_ACEOF | ||
4754 | +/* confdefs.h. */ | ||
4755 | +_ACEOF | ||
4756 | +cat confdefs.h >>conftest.$ac_ext | ||
4757 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4758 | +/* end confdefs.h. */ | ||
4759 | +#include <stdlib.h> | ||
4760 | + | ||
4761 | +_ACEOF | ||
4762 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
4763 | + $EGREP "free" >/dev/null 2>&1; then | ||
4764 | + : | ||
4765 | +else | ||
4766 | + ac_cv_header_stdc=no | ||
4767 | +fi | ||
4768 | +rm -f -r conftest* | ||
4769 | + | ||
4770 | +fi | ||
4771 | + | ||
4772 | +if test $ac_cv_header_stdc = yes; then | ||
4773 | + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
4774 | + if test "$cross_compiling" = yes; then | ||
4775 | + : | ||
4776 | +else | ||
4777 | + cat >conftest.$ac_ext <<_ACEOF | ||
4778 | +/* confdefs.h. */ | ||
4779 | +_ACEOF | ||
4780 | +cat confdefs.h >>conftest.$ac_ext | ||
4781 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4782 | +/* end confdefs.h. */ | ||
4783 | +#include <ctype.h> | ||
4784 | +#include <stdlib.h> | ||
4785 | +#if ((' ' & 0x0FF) == 0x020) | ||
4786 | +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
4787 | +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
4788 | +#else | ||
4789 | +# define ISLOWER(c) \ | ||
4790 | + (('a' <= (c) && (c) <= 'i') \ | ||
4791 | + || ('j' <= (c) && (c) <= 'r') \ | ||
4792 | + || ('s' <= (c) && (c) <= 'z')) | ||
4793 | +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
4794 | +#endif | ||
4795 | + | ||
4796 | +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) | ||
4797 | +int | ||
4798 | +main () | ||
4799 | +{ | ||
4800 | + int i; | ||
4801 | + for (i = 0; i < 256; i++) | ||
4802 | + if (XOR (islower (i), ISLOWER (i)) | ||
4803 | + || toupper (i) != TOUPPER (i)) | ||
4804 | + return 2; | ||
4805 | + return 0; | ||
4806 | +} | ||
4807 | +_ACEOF | ||
4808 | +rm -f conftest$ac_exeext | ||
4809 | +if { (ac_try="$ac_link" | ||
4810 | +case "(($ac_try" in | ||
4811 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4812 | + *) ac_try_echo=$ac_try;; | ||
4813 | +esac | ||
4814 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4815 | + (eval "$ac_link") 2>&5 | ||
4816 | + ac_status=$? | ||
4817 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4818 | + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
4819 | + { (case "(($ac_try" in | ||
4820 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4821 | + *) ac_try_echo=$ac_try;; | ||
4822 | +esac | ||
4823 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4824 | + (eval "$ac_try") 2>&5 | ||
4825 | + ac_status=$? | ||
4826 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4827 | + (exit $ac_status); }; }; then | ||
4828 | + : | ||
4829 | +else | ||
4830 | + echo "$as_me: program exited with status $ac_status" >&5 | ||
4831 | +echo "$as_me: failed program was:" >&5 | ||
4832 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4833 | + | ||
4834 | +( exit $ac_status ) | ||
4835 | +ac_cv_header_stdc=no | ||
4836 | +fi | ||
4837 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4838 | +fi | ||
4839 | + | ||
4840 | + | ||
4841 | +fi | ||
4842 | +fi | ||
4843 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | ||
4844 | +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } | ||
4845 | +if test $ac_cv_header_stdc = yes; then | ||
4846 | + | ||
4847 | +cat >>confdefs.h <<\_ACEOF | ||
4848 | +#define STDC_HEADERS 1 | ||
4849 | +_ACEOF | ||
4850 | + | ||
4851 | +fi | ||
4852 | + | ||
4853 | +# On IRIX 5.3, sys/types and inttypes.h are conflicting. | ||
4854 | + | ||
4855 | + | ||
4856 | + | ||
4857 | + | ||
4858 | + | ||
4859 | + | ||
4860 | + | ||
4861 | + | ||
4862 | + | ||
4863 | +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
4864 | + inttypes.h stdint.h unistd.h | ||
4865 | +do | ||
4866 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
4867 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4868 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
4869 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4870 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4871 | +else | ||
4872 | + cat >conftest.$ac_ext <<_ACEOF | ||
4873 | +/* confdefs.h. */ | ||
4874 | +_ACEOF | ||
4875 | +cat confdefs.h >>conftest.$ac_ext | ||
4876 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4877 | +/* end confdefs.h. */ | ||
4878 | +$ac_includes_default | ||
4879 | + | ||
4880 | +#include <$ac_header> | ||
4881 | +_ACEOF | ||
4882 | +rm -f conftest.$ac_objext | ||
4883 | +if { (ac_try="$ac_compile" | ||
4884 | +case "(($ac_try" in | ||
4885 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4886 | + *) ac_try_echo=$ac_try;; | ||
4887 | +esac | ||
4888 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4889 | + (eval "$ac_compile") 2>conftest.er1 | ||
4890 | + ac_status=$? | ||
4891 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4892 | + rm -f conftest.er1 | ||
4893 | + cat conftest.err >&5 | ||
4894 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4895 | + (exit $ac_status); } && { | ||
4896 | + test -z "$ac_c_werror_flag" || | ||
4897 | + test ! -s conftest.err | ||
4898 | + } && test -s conftest.$ac_objext; then | ||
4899 | + eval "$as_ac_Header=yes" | ||
4900 | +else | ||
4901 | + echo "$as_me: failed program was:" >&5 | ||
4902 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4903 | + | ||
4904 | + eval "$as_ac_Header=no" | ||
4905 | +fi | ||
4906 | + | ||
4907 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4908 | +fi | ||
4909 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
4910 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
4911 | +echo "${ECHO_T}$ac_res" >&6; } | ||
4912 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
4913 | + cat >>confdefs.h <<_ACEOF | ||
4914 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
4915 | +_ACEOF | ||
4916 | + | ||
4917 | +fi | ||
4918 | + | ||
4919 | +done | ||
4920 | + | ||
4921 | + | ||
4922 | + | ||
4923 | +for ac_header in sys/bitypes.h | ||
4924 | +do | ||
4925 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
4926 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4927 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4928 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
4929 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4930 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4931 | +fi | ||
4932 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
4933 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
4934 | +echo "${ECHO_T}$ac_res" >&6; } | ||
4935 | +else | ||
4936 | + # Is the header compilable? | ||
4937 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4938 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
4939 | +cat >conftest.$ac_ext <<_ACEOF | ||
4940 | +/* confdefs.h. */ | ||
4941 | +_ACEOF | ||
4942 | +cat confdefs.h >>conftest.$ac_ext | ||
4943 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4944 | +/* end confdefs.h. */ | ||
4945 | +$ac_includes_default | ||
4946 | +#include <$ac_header> | ||
4947 | +_ACEOF | ||
4948 | +rm -f conftest.$ac_objext | ||
4949 | +if { (ac_try="$ac_compile" | ||
4950 | +case "(($ac_try" in | ||
4951 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4952 | + *) ac_try_echo=$ac_try;; | ||
4953 | +esac | ||
4954 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4955 | + (eval "$ac_compile") 2>conftest.er1 | ||
4956 | + ac_status=$? | ||
4957 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4958 | + rm -f conftest.er1 | ||
4959 | + cat conftest.err >&5 | ||
4960 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4961 | + (exit $ac_status); } && { | ||
4962 | + test -z "$ac_c_werror_flag" || | ||
4963 | + test ! -s conftest.err | ||
4964 | + } && test -s conftest.$ac_objext; then | ||
4965 | + ac_header_compiler=yes | ||
4966 | +else | ||
4967 | + echo "$as_me: failed program was:" >&5 | ||
4968 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
4969 | + | ||
4970 | + ac_header_compiler=no | ||
4971 | +fi | ||
4972 | + | ||
4973 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4974 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4975 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
4976 | + | ||
4977 | +# Is the header present? | ||
4978 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4979 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
4980 | +cat >conftest.$ac_ext <<_ACEOF | ||
4981 | +/* confdefs.h. */ | ||
4982 | +_ACEOF | ||
4983 | +cat confdefs.h >>conftest.$ac_ext | ||
4984 | +cat >>conftest.$ac_ext <<_ACEOF | ||
4985 | +/* end confdefs.h. */ | ||
4986 | +#include <$ac_header> | ||
4987 | +_ACEOF | ||
4988 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4989 | +case "(($ac_try" in | ||
4990 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4991 | + *) ac_try_echo=$ac_try;; | ||
4992 | +esac | ||
4993 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4994 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4995 | + ac_status=$? | ||
4996 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
4997 | + rm -f conftest.er1 | ||
4998 | + cat conftest.err >&5 | ||
4999 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5000 | + (exit $ac_status); } >/dev/null && { | ||
5001 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
5002 | + test ! -s conftest.err | ||
5003 | + }; then | ||
5004 | + ac_header_preproc=yes | ||
5005 | +else | ||
5006 | + echo "$as_me: failed program was:" >&5 | ||
5007 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5008 | + | ||
5009 | + ac_header_preproc=no | ||
5010 | +fi | ||
5011 | + | ||
5012 | +rm -f conftest.err conftest.$ac_ext | ||
5013 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
5014 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
5015 | + | ||
5016 | +# So? What about this header? | ||
5017 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
5018 | + yes:no: ) | ||
5019 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
5020 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
5021 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
5022 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
5023 | + ac_header_preproc=yes | ||
5024 | + ;; | ||
5025 | + no:yes:* ) | ||
5026 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
5027 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
5028 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
5029 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
5030 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
5031 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
5032 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
5033 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
5034 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
5035 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
5036 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
5037 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
5038 | + | ||
5039 | + ;; | ||
5040 | +esac | ||
5041 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
5042 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
5043 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
5044 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5045 | +else | ||
5046 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
5047 | +fi | ||
5048 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
5049 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
5050 | +echo "${ECHO_T}$ac_res" >&6; } | ||
5051 | + | ||
5052 | +fi | ||
5053 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
5054 | + cat >>confdefs.h <<_ACEOF | ||
5055 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
5056 | +_ACEOF | ||
5057 | + | ||
5058 | +fi | ||
5059 | + | ||
5060 | +done | ||
5061 | + | ||
5062 | + | ||
5063 | +{ echo "$as_me:$LINENO: checking for int8_t" >&5 | ||
5064 | +echo $ECHO_N "checking for int8_t... $ECHO_C" >&6; } | ||
5065 | +if test "${ac_cv_type_int8_t+set}" = set; then | ||
5066 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5067 | +else | ||
5068 | + cat >conftest.$ac_ext <<_ACEOF | ||
5069 | +/* confdefs.h. */ | ||
5070 | +_ACEOF | ||
5071 | +cat confdefs.h >>conftest.$ac_ext | ||
5072 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5073 | +/* end confdefs.h. */ | ||
5074 | +$ac_includes_default | ||
5075 | +#ifdef HAVE_SYS_BITYPES_H | ||
5076 | +#include <sys/bitypes.h> | ||
5077 | +#endif | ||
5078 | + | ||
5079 | +typedef int8_t ac__type_new_; | ||
5080 | +int | ||
5081 | +main () | ||
5082 | +{ | ||
5083 | +if ((ac__type_new_ *) 0) | ||
5084 | + return 0; | ||
5085 | +if (sizeof (ac__type_new_)) | ||
5086 | + return 0; | ||
5087 | + ; | ||
5088 | + return 0; | ||
5089 | +} | ||
5090 | +_ACEOF | ||
5091 | +rm -f conftest.$ac_objext | ||
5092 | +if { (ac_try="$ac_compile" | ||
5093 | +case "(($ac_try" in | ||
5094 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5095 | + *) ac_try_echo=$ac_try;; | ||
5096 | +esac | ||
5097 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5098 | + (eval "$ac_compile") 2>conftest.er1 | ||
5099 | + ac_status=$? | ||
5100 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5101 | + rm -f conftest.er1 | ||
5102 | + cat conftest.err >&5 | ||
5103 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5104 | + (exit $ac_status); } && { | ||
5105 | + test -z "$ac_c_werror_flag" || | ||
5106 | + test ! -s conftest.err | ||
5107 | + } && test -s conftest.$ac_objext; then | ||
5108 | + ac_cv_type_int8_t=yes | ||
5109 | +else | ||
5110 | + echo "$as_me: failed program was:" >&5 | ||
5111 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5112 | + | ||
5113 | + ac_cv_type_int8_t=no | ||
5114 | +fi | ||
5115 | + | ||
5116 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5117 | +fi | ||
5118 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5 | ||
5119 | +echo "${ECHO_T}$ac_cv_type_int8_t" >&6; } | ||
5120 | +if test $ac_cv_type_int8_t = yes; then | ||
5121 | + : | ||
5122 | +else | ||
5123 | + | ||
5124 | +cat >>confdefs.h <<\_ACEOF | ||
5125 | +#define int8_t signed char | ||
5126 | +_ACEOF | ||
5127 | + | ||
5128 | +fi | ||
5129 | + | ||
5130 | +{ echo "$as_me:$LINENO: checking for u_int8_t" >&5 | ||
5131 | +echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6; } | ||
5132 | +if test "${ac_cv_type_u_int8_t+set}" = set; then | ||
5133 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5134 | +else | ||
5135 | + cat >conftest.$ac_ext <<_ACEOF | ||
5136 | +/* confdefs.h. */ | ||
5137 | +_ACEOF | ||
5138 | +cat confdefs.h >>conftest.$ac_ext | ||
5139 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5140 | +/* end confdefs.h. */ | ||
5141 | +$ac_includes_default | ||
5142 | +#ifdef HAVE_SYS_BITYPES_H | ||
5143 | +#include <sys/bitypes.h> | ||
5144 | +#endif | ||
5145 | + | ||
5146 | +typedef u_int8_t ac__type_new_; | ||
5147 | +int | ||
5148 | +main () | ||
5149 | +{ | ||
5150 | +if ((ac__type_new_ *) 0) | ||
5151 | + return 0; | ||
5152 | +if (sizeof (ac__type_new_)) | ||
5153 | + return 0; | ||
5154 | + ; | ||
5155 | + return 0; | ||
5156 | +} | ||
5157 | +_ACEOF | ||
5158 | +rm -f conftest.$ac_objext | ||
5159 | +if { (ac_try="$ac_compile" | ||
5160 | +case "(($ac_try" in | ||
5161 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5162 | + *) ac_try_echo=$ac_try;; | ||
5163 | +esac | ||
5164 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5165 | + (eval "$ac_compile") 2>conftest.er1 | ||
5166 | + ac_status=$? | ||
5167 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5168 | + rm -f conftest.er1 | ||
5169 | + cat conftest.err >&5 | ||
5170 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5171 | + (exit $ac_status); } && { | ||
5172 | + test -z "$ac_c_werror_flag" || | ||
5173 | + test ! -s conftest.err | ||
5174 | + } && test -s conftest.$ac_objext; then | ||
5175 | + ac_cv_type_u_int8_t=yes | ||
5176 | else | ||
5177 | - ac_cv_path_EGREP=$EGREP | ||
5178 | + echo "$as_me: failed program was:" >&5 | ||
5179 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5180 | + | ||
5181 | + ac_cv_type_u_int8_t=no | ||
5182 | fi | ||
5183 | |||
5184 | - fi | ||
5185 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5186 | fi | ||
5187 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 | ||
5188 | -$as_echo "$ac_cv_path_EGREP" >&6; } | ||
5189 | - EGREP="$ac_cv_path_EGREP" | ||
5190 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5 | ||
5191 | +echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6; } | ||
5192 | +if test $ac_cv_type_u_int8_t = yes; then | ||
5193 | + : | ||
5194 | +else | ||
5195 | + | ||
5196 | +cat >>confdefs.h <<\_ACEOF | ||
5197 | +#define u_int8_t unsigned char | ||
5198 | +_ACEOF | ||
5199 | |||
5200 | +fi | ||
5201 | |||
5202 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 | ||
5203 | -$as_echo_n "checking for ANSI C header files... " >&6; } | ||
5204 | -if test "${ac_cv_header_stdc+set}" = set; then : | ||
5205 | - $as_echo_n "(cached) " >&6 | ||
5206 | +{ echo "$as_me:$LINENO: checking for int16_t" >&5 | ||
5207 | +echo $ECHO_N "checking for int16_t... $ECHO_C" >&6; } | ||
5208 | +if test "${ac_cv_type_int16_t+set}" = set; then | ||
5209 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5210 | else | ||
5211 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5212 | + cat >conftest.$ac_ext <<_ACEOF | ||
5213 | +/* confdefs.h. */ | ||
5214 | +_ACEOF | ||
5215 | +cat confdefs.h >>conftest.$ac_ext | ||
5216 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5217 | /* end confdefs.h. */ | ||
5218 | -#include <stdlib.h> | ||
5219 | -#include <stdarg.h> | ||
5220 | -#include <string.h> | ||
5221 | -#include <float.h> | ||
5222 | - | ||
5223 | +$ac_includes_default | ||
5224 | +typedef int16_t ac__type_new_; | ||
5225 | int | ||
5226 | main () | ||
5227 | { | ||
5228 | - | ||
5229 | +if ((ac__type_new_ *) 0) | ||
5230 | + return 0; | ||
5231 | +if (sizeof (ac__type_new_)) | ||
5232 | + return 0; | ||
5233 | ; | ||
5234 | return 0; | ||
5235 | } | ||
5236 | _ACEOF | ||
5237 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
5238 | - ac_cv_header_stdc=yes | ||
5239 | +rm -f conftest.$ac_objext | ||
5240 | +if { (ac_try="$ac_compile" | ||
5241 | +case "(($ac_try" in | ||
5242 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5243 | + *) ac_try_echo=$ac_try;; | ||
5244 | +esac | ||
5245 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5246 | + (eval "$ac_compile") 2>conftest.er1 | ||
5247 | + ac_status=$? | ||
5248 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5249 | + rm -f conftest.er1 | ||
5250 | + cat conftest.err >&5 | ||
5251 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5252 | + (exit $ac_status); } && { | ||
5253 | + test -z "$ac_c_werror_flag" || | ||
5254 | + test ! -s conftest.err | ||
5255 | + } && test -s conftest.$ac_objext; then | ||
5256 | + ac_cv_type_int16_t=yes | ||
5257 | else | ||
5258 | - ac_cv_header_stdc=no | ||
5259 | -fi | ||
5260 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5261 | - | ||
5262 | -if test $ac_cv_header_stdc = yes; then | ||
5263 | - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
5264 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5265 | -/* end confdefs.h. */ | ||
5266 | -#include <string.h> | ||
5267 | - | ||
5268 | -_ACEOF | ||
5269 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
5270 | - $EGREP "memchr" >/dev/null 2>&1; then : | ||
5271 | + echo "$as_me: failed program was:" >&5 | ||
5272 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5273 | |||
5274 | -else | ||
5275 | - ac_cv_header_stdc=no | ||
5276 | + ac_cv_type_int16_t=no | ||
5277 | fi | ||
5278 | -rm -f conftest* | ||
5279 | |||
5280 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5281 | fi | ||
5282 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5 | ||
5283 | +echo "${ECHO_T}$ac_cv_type_int16_t" >&6; } | ||
5284 | +if test $ac_cv_type_int16_t = yes; then | ||
5285 | + : | ||
5286 | +else | ||
5287 | |||
5288 | -if test $ac_cv_header_stdc = yes; then | ||
5289 | - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
5290 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5291 | -/* end confdefs.h. */ | ||
5292 | -#include <stdlib.h> | ||
5293 | - | ||
5294 | +cat >>confdefs.h <<\_ACEOF | ||
5295 | +#define int16_t short | ||
5296 | _ACEOF | ||
5297 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
5298 | - $EGREP "free" >/dev/null 2>&1; then : | ||
5299 | - | ||
5300 | -else | ||
5301 | - ac_cv_header_stdc=no | ||
5302 | -fi | ||
5303 | -rm -f conftest* | ||
5304 | |||
5305 | + $ac_includes_default | ||
5306 | +#ifdef HAVE_SYS_BITYPES_H | ||
5307 | +#include <sys/bitypes.h> | ||
5308 | +#endif | ||
5309 | fi | ||
5310 | |||
5311 | -if test $ac_cv_header_stdc = yes; then | ||
5312 | - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
5313 | - if test "$cross_compiling" = yes; then : | ||
5314 | - : | ||
5315 | +{ echo "$as_me:$LINENO: checking for u_int16_t" >&5 | ||
5316 | +echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6; } | ||
5317 | +if test "${ac_cv_type_u_int16_t+set}" = set; then | ||
5318 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5319 | else | ||
5320 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5321 | + cat >conftest.$ac_ext <<_ACEOF | ||
5322 | +/* confdefs.h. */ | ||
5323 | +_ACEOF | ||
5324 | +cat confdefs.h >>conftest.$ac_ext | ||
5325 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5326 | /* end confdefs.h. */ | ||
5327 | -#include <ctype.h> | ||
5328 | -#include <stdlib.h> | ||
5329 | -#if ((' ' & 0x0FF) == 0x020) | ||
5330 | -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
5331 | -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
5332 | -#else | ||
5333 | -# define ISLOWER(c) \ | ||
5334 | - (('a' <= (c) && (c) <= 'i') \ | ||
5335 | - || ('j' <= (c) && (c) <= 'r') \ | ||
5336 | - || ('s' <= (c) && (c) <= 'z')) | ||
5337 | -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
5338 | +$ac_includes_default | ||
5339 | +#ifdef HAVE_SYS_BITYPES_H | ||
5340 | +#include <sys/bitypes.h> | ||
5341 | #endif | ||
5342 | |||
5343 | -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) | ||
5344 | +typedef u_int16_t ac__type_new_; | ||
5345 | int | ||
5346 | main () | ||
5347 | { | ||
5348 | - int i; | ||
5349 | - for (i = 0; i < 256; i++) | ||
5350 | - if (XOR (islower (i), ISLOWER (i)) | ||
5351 | - || toupper (i) != TOUPPER (i)) | ||
5352 | - return 2; | ||
5353 | +if ((ac__type_new_ *) 0) | ||
5354 | + return 0; | ||
5355 | +if (sizeof (ac__type_new_)) | ||
5356 | + return 0; | ||
5357 | + ; | ||
5358 | return 0; | ||
5359 | } | ||
5360 | _ACEOF | ||
5361 | -if ac_fn_c_try_run "$LINENO"; then : | ||
5362 | - | ||
5363 | +rm -f conftest.$ac_objext | ||
5364 | +if { (ac_try="$ac_compile" | ||
5365 | +case "(($ac_try" in | ||
5366 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5367 | + *) ac_try_echo=$ac_try;; | ||
5368 | +esac | ||
5369 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5370 | + (eval "$ac_compile") 2>conftest.er1 | ||
5371 | + ac_status=$? | ||
5372 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5373 | + rm -f conftest.er1 | ||
5374 | + cat conftest.err >&5 | ||
5375 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5376 | + (exit $ac_status); } && { | ||
5377 | + test -z "$ac_c_werror_flag" || | ||
5378 | + test ! -s conftest.err | ||
5379 | + } && test -s conftest.$ac_objext; then | ||
5380 | + ac_cv_type_u_int16_t=yes | ||
5381 | else | ||
5382 | - ac_cv_header_stdc=no | ||
5383 | -fi | ||
5384 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
5385 | - conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
5386 | -fi | ||
5387 | + echo "$as_me: failed program was:" >&5 | ||
5388 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5389 | |||
5390 | + ac_cv_type_u_int16_t=no | ||
5391 | fi | ||
5392 | -fi | ||
5393 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 | ||
5394 | -$as_echo "$ac_cv_header_stdc" >&6; } | ||
5395 | -if test $ac_cv_header_stdc = yes; then | ||
5396 | - | ||
5397 | -$as_echo "#define STDC_HEADERS 1" >>confdefs.h | ||
5398 | |||
5399 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5400 | fi | ||
5401 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5 | ||
5402 | +echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6; } | ||
5403 | +if test $ac_cv_type_u_int16_t = yes; then | ||
5404 | + : | ||
5405 | +else | ||
5406 | |||
5407 | -# On IRIX 5.3, sys/types and inttypes.h are conflicting. | ||
5408 | -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
5409 | - inttypes.h stdint.h unistd.h | ||
5410 | -do : | ||
5411 | - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
5412 | -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default | ||
5413 | -" | ||
5414 | -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | ||
5415 | - cat >>confdefs.h <<_ACEOF | ||
5416 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
5417 | +cat >>confdefs.h <<\_ACEOF | ||
5418 | +#define u_int16_t unsigned short | ||
5419 | _ACEOF | ||
5420 | |||
5421 | fi | ||
5422 | |||
5423 | -done | ||
5424 | - | ||
5425 | - | ||
5426 | -for ac_header in sys/bitypes.h | ||
5427 | -do : | ||
5428 | - ac_fn_c_check_header_mongrel "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default" | ||
5429 | -if test "x$ac_cv_header_sys_bitypes_h" = x""yes; then : | ||
5430 | - cat >>confdefs.h <<_ACEOF | ||
5431 | -#define HAVE_SYS_BITYPES_H 1 | ||
5432 | +{ echo "$as_me:$LINENO: checking for int32_t" >&5 | ||
5433 | +echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; } | ||
5434 | +if test "${ac_cv_type_int32_t+set}" = set; then | ||
5435 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5436 | +else | ||
5437 | + cat >conftest.$ac_ext <<_ACEOF | ||
5438 | +/* confdefs.h. */ | ||
5439 | _ACEOF | ||
5440 | - | ||
5441 | -fi | ||
5442 | - | ||
5443 | -done | ||
5444 | - | ||
5445 | - | ||
5446 | -ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default | ||
5447 | +cat confdefs.h >>conftest.$ac_ext | ||
5448 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5449 | +/* end confdefs.h. */ | ||
5450 | +$ac_includes_default | ||
5451 | #ifdef HAVE_SYS_BITYPES_H | ||
5452 | #include <sys/bitypes.h> | ||
5453 | #endif | ||
5454 | -" | ||
5455 | -if test "x$ac_cv_type_int8_t" = x""yes; then : | ||
5456 | |||
5457 | +typedef int32_t ac__type_new_; | ||
5458 | +int | ||
5459 | +main () | ||
5460 | +{ | ||
5461 | +if ((ac__type_new_ *) 0) | ||
5462 | + return 0; | ||
5463 | +if (sizeof (ac__type_new_)) | ||
5464 | + return 0; | ||
5465 | + ; | ||
5466 | + return 0; | ||
5467 | +} | ||
5468 | +_ACEOF | ||
5469 | +rm -f conftest.$ac_objext | ||
5470 | +if { (ac_try="$ac_compile" | ||
5471 | +case "(($ac_try" in | ||
5472 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5473 | + *) ac_try_echo=$ac_try;; | ||
5474 | +esac | ||
5475 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5476 | + (eval "$ac_compile") 2>conftest.er1 | ||
5477 | + ac_status=$? | ||
5478 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5479 | + rm -f conftest.er1 | ||
5480 | + cat conftest.err >&5 | ||
5481 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5482 | + (exit $ac_status); } && { | ||
5483 | + test -z "$ac_c_werror_flag" || | ||
5484 | + test ! -s conftest.err | ||
5485 | + } && test -s conftest.$ac_objext; then | ||
5486 | + ac_cv_type_int32_t=yes | ||
5487 | else | ||
5488 | + echo "$as_me: failed program was:" >&5 | ||
5489 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5490 | |||
5491 | -$as_echo "#define int8_t signed char" >>confdefs.h | ||
5492 | - | ||
5493 | + ac_cv_type_int32_t=no | ||
5494 | fi | ||
5495 | |||
5496 | -ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default | ||
5497 | -#ifdef HAVE_SYS_BITYPES_H | ||
5498 | -#include <sys/bitypes.h> | ||
5499 | -#endif | ||
5500 | -" | ||
5501 | -if test "x$ac_cv_type_u_int8_t" = x""yes; then : | ||
5502 | - | ||
5503 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5504 | +fi | ||
5505 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5 | ||
5506 | +echo "${ECHO_T}$ac_cv_type_int32_t" >&6; } | ||
5507 | +if test $ac_cv_type_int32_t = yes; then | ||
5508 | + : | ||
5509 | else | ||
5510 | |||
5511 | -$as_echo "#define u_int8_t unsigned char" >>confdefs.h | ||
5512 | +cat >>confdefs.h <<\_ACEOF | ||
5513 | +#define int32_t int | ||
5514 | +_ACEOF | ||
5515 | |||
5516 | fi | ||
5517 | |||
5518 | -ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default" | ||
5519 | -if test "x$ac_cv_type_int16_t" = x""yes; then : | ||
5520 | - | ||
5521 | +{ echo "$as_me:$LINENO: checking for u_int32_t" >&5 | ||
5522 | +echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6; } | ||
5523 | +if test "${ac_cv_type_u_int32_t+set}" = set; then | ||
5524 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5525 | else | ||
5526 | - | ||
5527 | -$as_echo "#define int16_t short" >>confdefs.h | ||
5528 | - | ||
5529 | - $ac_includes_default | ||
5530 | + cat >conftest.$ac_ext <<_ACEOF | ||
5531 | +/* confdefs.h. */ | ||
5532 | +_ACEOF | ||
5533 | +cat confdefs.h >>conftest.$ac_ext | ||
5534 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5535 | +/* end confdefs.h. */ | ||
5536 | +$ac_includes_default | ||
5537 | #ifdef HAVE_SYS_BITYPES_H | ||
5538 | #include <sys/bitypes.h> | ||
5539 | #endif | ||
5540 | -fi | ||
5541 | |||
5542 | -ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default | ||
5543 | -#ifdef HAVE_SYS_BITYPES_H | ||
5544 | -#include <sys/bitypes.h> | ||
5545 | -#endif | ||
5546 | -" | ||
5547 | -if test "x$ac_cv_type_u_int16_t" = x""yes; then : | ||
5548 | +typedef u_int32_t ac__type_new_; | ||
5549 | +int | ||
5550 | +main () | ||
5551 | +{ | ||
5552 | +if ((ac__type_new_ *) 0) | ||
5553 | + return 0; | ||
5554 | +if (sizeof (ac__type_new_)) | ||
5555 | + return 0; | ||
5556 | + ; | ||
5557 | + return 0; | ||
5558 | +} | ||
5559 | +_ACEOF | ||
5560 | +rm -f conftest.$ac_objext | ||
5561 | +if { (ac_try="$ac_compile" | ||
5562 | +case "(($ac_try" in | ||
5563 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5564 | + *) ac_try_echo=$ac_try;; | ||
5565 | +esac | ||
5566 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5567 | + (eval "$ac_compile") 2>conftest.er1 | ||
5568 | + ac_status=$? | ||
5569 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5570 | + rm -f conftest.er1 | ||
5571 | + cat conftest.err >&5 | ||
5572 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5573 | + (exit $ac_status); } && { | ||
5574 | + test -z "$ac_c_werror_flag" || | ||
5575 | + test ! -s conftest.err | ||
5576 | + } && test -s conftest.$ac_objext; then | ||
5577 | + ac_cv_type_u_int32_t=yes | ||
5578 | +else | ||
5579 | + echo "$as_me: failed program was:" >&5 | ||
5580 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5581 | + | ||
5582 | + ac_cv_type_u_int32_t=no | ||
5583 | +fi | ||
5584 | |||
5585 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5586 | +fi | ||
5587 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 | ||
5588 | +echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6; } | ||
5589 | +if test $ac_cv_type_u_int32_t = yes; then | ||
5590 | + : | ||
5591 | else | ||
5592 | |||
5593 | -$as_echo "#define u_int16_t unsigned short" >>confdefs.h | ||
5594 | +cat >>confdefs.h <<\_ACEOF | ||
5595 | +#define u_int32_t unsigned int | ||
5596 | +_ACEOF | ||
5597 | |||
5598 | fi | ||
5599 | |||
5600 | -ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default | ||
5601 | +{ echo "$as_me:$LINENO: checking for int64_t" >&5 | ||
5602 | +echo $ECHO_N "checking for int64_t... $ECHO_C" >&6; } | ||
5603 | +if test "${ac_cv_type_int64_t+set}" = set; then | ||
5604 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5605 | +else | ||
5606 | + cat >conftest.$ac_ext <<_ACEOF | ||
5607 | +/* confdefs.h. */ | ||
5608 | +_ACEOF | ||
5609 | +cat confdefs.h >>conftest.$ac_ext | ||
5610 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5611 | +/* end confdefs.h. */ | ||
5612 | +$ac_includes_default | ||
5613 | #ifdef HAVE_SYS_BITYPES_H | ||
5614 | #include <sys/bitypes.h> | ||
5615 | #endif | ||
5616 | -" | ||
5617 | -if test "x$ac_cv_type_int32_t" = x""yes; then : | ||
5618 | |||
5619 | +typedef int64_t ac__type_new_; | ||
5620 | +int | ||
5621 | +main () | ||
5622 | +{ | ||
5623 | +if ((ac__type_new_ *) 0) | ||
5624 | + return 0; | ||
5625 | +if (sizeof (ac__type_new_)) | ||
5626 | + return 0; | ||
5627 | + ; | ||
5628 | + return 0; | ||
5629 | +} | ||
5630 | +_ACEOF | ||
5631 | +rm -f conftest.$ac_objext | ||
5632 | +if { (ac_try="$ac_compile" | ||
5633 | +case "(($ac_try" in | ||
5634 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5635 | + *) ac_try_echo=$ac_try;; | ||
5636 | +esac | ||
5637 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5638 | + (eval "$ac_compile") 2>conftest.er1 | ||
5639 | + ac_status=$? | ||
5640 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5641 | + rm -f conftest.er1 | ||
5642 | + cat conftest.err >&5 | ||
5643 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5644 | + (exit $ac_status); } && { | ||
5645 | + test -z "$ac_c_werror_flag" || | ||
5646 | + test ! -s conftest.err | ||
5647 | + } && test -s conftest.$ac_objext; then | ||
5648 | + ac_cv_type_int64_t=yes | ||
5649 | else | ||
5650 | + echo "$as_me: failed program was:" >&5 | ||
5651 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5652 | |||
5653 | -$as_echo "#define int32_t int" >>confdefs.h | ||
5654 | - | ||
5655 | + ac_cv_type_int64_t=no | ||
5656 | fi | ||
5657 | |||
5658 | -ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default | ||
5659 | -#ifdef HAVE_SYS_BITYPES_H | ||
5660 | -#include <sys/bitypes.h> | ||
5661 | -#endif | ||
5662 | -" | ||
5663 | -if test "x$ac_cv_type_u_int32_t" = x""yes; then : | ||
5664 | - | ||
5665 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5666 | +fi | ||
5667 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5 | ||
5668 | +echo "${ECHO_T}$ac_cv_type_int64_t" >&6; } | ||
5669 | +if test $ac_cv_type_int64_t = yes; then | ||
5670 | + : | ||
5671 | else | ||
5672 | |||
5673 | -$as_echo "#define u_int32_t unsigned int" >>confdefs.h | ||
5674 | +cat >>confdefs.h <<\_ACEOF | ||
5675 | +#define int64_t long long | ||
5676 | +_ACEOF | ||
5677 | |||
5678 | fi | ||
5679 | |||
5680 | -ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default | ||
5681 | +{ echo "$as_me:$LINENO: checking for u_int64_t" >&5 | ||
5682 | +echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; } | ||
5683 | +if test "${ac_cv_type_u_int64_t+set}" = set; then | ||
5684 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5685 | +else | ||
5686 | + cat >conftest.$ac_ext <<_ACEOF | ||
5687 | +/* confdefs.h. */ | ||
5688 | +_ACEOF | ||
5689 | +cat confdefs.h >>conftest.$ac_ext | ||
5690 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5691 | +/* end confdefs.h. */ | ||
5692 | +$ac_includes_default | ||
5693 | #ifdef HAVE_SYS_BITYPES_H | ||
5694 | #include <sys/bitypes.h> | ||
5695 | #endif | ||
5696 | -" | ||
5697 | -if test "x$ac_cv_type_int64_t" = x""yes; then : | ||
5698 | |||
5699 | +typedef u_int64_t ac__type_new_; | ||
5700 | +int | ||
5701 | +main () | ||
5702 | +{ | ||
5703 | +if ((ac__type_new_ *) 0) | ||
5704 | + return 0; | ||
5705 | +if (sizeof (ac__type_new_)) | ||
5706 | + return 0; | ||
5707 | + ; | ||
5708 | + return 0; | ||
5709 | +} | ||
5710 | +_ACEOF | ||
5711 | +rm -f conftest.$ac_objext | ||
5712 | +if { (ac_try="$ac_compile" | ||
5713 | +case "(($ac_try" in | ||
5714 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5715 | + *) ac_try_echo=$ac_try;; | ||
5716 | +esac | ||
5717 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5718 | + (eval "$ac_compile") 2>conftest.er1 | ||
5719 | + ac_status=$? | ||
5720 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5721 | + rm -f conftest.er1 | ||
5722 | + cat conftest.err >&5 | ||
5723 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5724 | + (exit $ac_status); } && { | ||
5725 | + test -z "$ac_c_werror_flag" || | ||
5726 | + test ! -s conftest.err | ||
5727 | + } && test -s conftest.$ac_objext; then | ||
5728 | + ac_cv_type_u_int64_t=yes | ||
5729 | else | ||
5730 | + echo "$as_me: failed program was:" >&5 | ||
5731 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5732 | |||
5733 | -$as_echo "#define int64_t long long" >>confdefs.h | ||
5734 | - | ||
5735 | + ac_cv_type_u_int64_t=no | ||
5736 | fi | ||
5737 | |||
5738 | -ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "$ac_includes_default | ||
5739 | -#ifdef HAVE_SYS_BITYPES_H | ||
5740 | -#include <sys/bitypes.h> | ||
5741 | -#endif | ||
5742 | -" | ||
5743 | -if test "x$ac_cv_type_u_int64_t" = x""yes; then : | ||
5744 | - | ||
5745 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5746 | +fi | ||
5747 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 | ||
5748 | +echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6; } | ||
5749 | +if test $ac_cv_type_u_int64_t = yes; then | ||
5750 | + : | ||
5751 | else | ||
5752 | |||
5753 | -$as_echo "#define u_int64_t unsigned long long" >>confdefs.h | ||
5754 | +cat >>confdefs.h <<\_ACEOF | ||
5755 | +#define u_int64_t unsigned long long | ||
5756 | +_ACEOF | ||
5757 | |||
5758 | fi | ||
5759 | |||
5760 | @@ -4236,16 +4838,16 @@ fi | ||
5761 | # Try to arrange for large file support. | ||
5762 | # | ||
5763 | # Check whether --enable-largefile was given. | ||
5764 | -if test "${enable_largefile+set}" = set; then : | ||
5765 | +if test "${enable_largefile+set}" = set; then | ||
5766 | enableval=$enable_largefile; | ||
5767 | fi | ||
5768 | |||
5769 | if test "$enable_largefile" != no; then | ||
5770 | |||
5771 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 | ||
5772 | -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } | ||
5773 | -if test "${ac_cv_sys_largefile_CC+set}" = set; then : | ||
5774 | - $as_echo_n "(cached) " >&6 | ||
5775 | + { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 | ||
5776 | +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } | ||
5777 | +if test "${ac_cv_sys_largefile_CC+set}" = set; then | ||
5778 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5779 | else | ||
5780 | ac_cv_sys_largefile_CC=no | ||
5781 | if test "$GCC" != yes; then | ||
5782 | @@ -4253,7 +4855,11 @@ else | ||
5783 | while :; do | ||
5784 | # IRIX 6.2 and later do not support large files by default, | ||
5785 | # so use the C compiler's -n32 option if that helps. | ||
5786 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5787 | + cat >conftest.$ac_ext <<_ACEOF | ||
5788 | +/* confdefs.h. */ | ||
5789 | +_ACEOF | ||
5790 | +cat confdefs.h >>conftest.$ac_ext | ||
5791 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5792 | /* end confdefs.h. */ | ||
5793 | #include <sys/types.h> | ||
5794 | /* Check that off_t can represent 2**63 - 1 correctly. | ||
5795 | @@ -4272,14 +4878,58 @@ main () | ||
5796 | return 0; | ||
5797 | } | ||
5798 | _ACEOF | ||
5799 | - if ac_fn_c_try_compile "$LINENO"; then : | ||
5800 | + rm -f conftest.$ac_objext | ||
5801 | +if { (ac_try="$ac_compile" | ||
5802 | +case "(($ac_try" in | ||
5803 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5804 | + *) ac_try_echo=$ac_try;; | ||
5805 | +esac | ||
5806 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5807 | + (eval "$ac_compile") 2>conftest.er1 | ||
5808 | + ac_status=$? | ||
5809 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5810 | + rm -f conftest.er1 | ||
5811 | + cat conftest.err >&5 | ||
5812 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5813 | + (exit $ac_status); } && { | ||
5814 | + test -z "$ac_c_werror_flag" || | ||
5815 | + test ! -s conftest.err | ||
5816 | + } && test -s conftest.$ac_objext; then | ||
5817 | break | ||
5818 | +else | ||
5819 | + echo "$as_me: failed program was:" >&5 | ||
5820 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5821 | + | ||
5822 | + | ||
5823 | fi | ||
5824 | + | ||
5825 | rm -f core conftest.err conftest.$ac_objext | ||
5826 | CC="$CC -n32" | ||
5827 | - if ac_fn_c_try_compile "$LINENO"; then : | ||
5828 | + rm -f conftest.$ac_objext | ||
5829 | +if { (ac_try="$ac_compile" | ||
5830 | +case "(($ac_try" in | ||
5831 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5832 | + *) ac_try_echo=$ac_try;; | ||
5833 | +esac | ||
5834 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5835 | + (eval "$ac_compile") 2>conftest.er1 | ||
5836 | + ac_status=$? | ||
5837 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5838 | + rm -f conftest.er1 | ||
5839 | + cat conftest.err >&5 | ||
5840 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5841 | + (exit $ac_status); } && { | ||
5842 | + test -z "$ac_c_werror_flag" || | ||
5843 | + test ! -s conftest.err | ||
5844 | + } && test -s conftest.$ac_objext; then | ||
5845 | ac_cv_sys_largefile_CC=' -n32'; break | ||
5846 | +else | ||
5847 | + echo "$as_me: failed program was:" >&5 | ||
5848 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5849 | + | ||
5850 | + | ||
5851 | fi | ||
5852 | + | ||
5853 | rm -f core conftest.err conftest.$ac_objext | ||
5854 | break | ||
5855 | done | ||
5856 | @@ -4287,19 +4937,23 @@ rm -f core conftest.err conftest.$ac_objext | ||
5857 | rm -f conftest.$ac_ext | ||
5858 | fi | ||
5859 | fi | ||
5860 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 | ||
5861 | -$as_echo "$ac_cv_sys_largefile_CC" >&6; } | ||
5862 | +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 | ||
5863 | +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } | ||
5864 | if test "$ac_cv_sys_largefile_CC" != no; then | ||
5865 | CC=$CC$ac_cv_sys_largefile_CC | ||
5866 | fi | ||
5867 | |||
5868 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 | ||
5869 | -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } | ||
5870 | -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : | ||
5871 | - $as_echo_n "(cached) " >&6 | ||
5872 | + { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 | ||
5873 | +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } | ||
5874 | +if test "${ac_cv_sys_file_offset_bits+set}" = set; then | ||
5875 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5876 | else | ||
5877 | while :; do | ||
5878 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5879 | + cat >conftest.$ac_ext <<_ACEOF | ||
5880 | +/* confdefs.h. */ | ||
5881 | +_ACEOF | ||
5882 | +cat confdefs.h >>conftest.$ac_ext | ||
5883 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5884 | /* end confdefs.h. */ | ||
5885 | #include <sys/types.h> | ||
5886 | /* Check that off_t can represent 2**63 - 1 correctly. | ||
5887 | @@ -4318,11 +4972,37 @@ main () | ||
5888 | return 0; | ||
5889 | } | ||
5890 | _ACEOF | ||
5891 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
5892 | +rm -f conftest.$ac_objext | ||
5893 | +if { (ac_try="$ac_compile" | ||
5894 | +case "(($ac_try" in | ||
5895 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5896 | + *) ac_try_echo=$ac_try;; | ||
5897 | +esac | ||
5898 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5899 | + (eval "$ac_compile") 2>conftest.er1 | ||
5900 | + ac_status=$? | ||
5901 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5902 | + rm -f conftest.er1 | ||
5903 | + cat conftest.err >&5 | ||
5904 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5905 | + (exit $ac_status); } && { | ||
5906 | + test -z "$ac_c_werror_flag" || | ||
5907 | + test ! -s conftest.err | ||
5908 | + } && test -s conftest.$ac_objext; then | ||
5909 | ac_cv_sys_file_offset_bits=no; break | ||
5910 | +else | ||
5911 | + echo "$as_me: failed program was:" >&5 | ||
5912 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5913 | + | ||
5914 | + | ||
5915 | fi | ||
5916 | + | ||
5917 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5918 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5919 | + cat >conftest.$ac_ext <<_ACEOF | ||
5920 | +/* confdefs.h. */ | ||
5921 | +_ACEOF | ||
5922 | +cat confdefs.h >>conftest.$ac_ext | ||
5923 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5924 | /* end confdefs.h. */ | ||
5925 | #define _FILE_OFFSET_BITS 64 | ||
5926 | #include <sys/types.h> | ||
5927 | @@ -4342,16 +5022,38 @@ main () | ||
5928 | return 0; | ||
5929 | } | ||
5930 | _ACEOF | ||
5931 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
5932 | +rm -f conftest.$ac_objext | ||
5933 | +if { (ac_try="$ac_compile" | ||
5934 | +case "(($ac_try" in | ||
5935 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5936 | + *) ac_try_echo=$ac_try;; | ||
5937 | +esac | ||
5938 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5939 | + (eval "$ac_compile") 2>conftest.er1 | ||
5940 | + ac_status=$? | ||
5941 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
5942 | + rm -f conftest.er1 | ||
5943 | + cat conftest.err >&5 | ||
5944 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5945 | + (exit $ac_status); } && { | ||
5946 | + test -z "$ac_c_werror_flag" || | ||
5947 | + test ! -s conftest.err | ||
5948 | + } && test -s conftest.$ac_objext; then | ||
5949 | ac_cv_sys_file_offset_bits=64; break | ||
5950 | +else | ||
5951 | + echo "$as_me: failed program was:" >&5 | ||
5952 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
5953 | + | ||
5954 | + | ||
5955 | fi | ||
5956 | + | ||
5957 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5958 | ac_cv_sys_file_offset_bits=unknown | ||
5959 | break | ||
5960 | done | ||
5961 | fi | ||
5962 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 | ||
5963 | -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } | ||
5964 | +{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 | ||
5965 | +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } | ||
5966 | case $ac_cv_sys_file_offset_bits in #( | ||
5967 | no | unknown) ;; | ||
5968 | *) | ||
5969 | @@ -4360,15 +5062,19 @@ cat >>confdefs.h <<_ACEOF | ||
5970 | _ACEOF | ||
5971 | ;; | ||
5972 | esac | ||
5973 | -rm -rf conftest* | ||
5974 | +rm -f -r conftest* | ||
5975 | if test $ac_cv_sys_file_offset_bits = unknown; then | ||
5976 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 | ||
5977 | -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } | ||
5978 | -if test "${ac_cv_sys_large_files+set}" = set; then : | ||
5979 | - $as_echo_n "(cached) " >&6 | ||
5980 | + { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 | ||
5981 | +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } | ||
5982 | +if test "${ac_cv_sys_large_files+set}" = set; then | ||
5983 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5984 | else | ||
5985 | while :; do | ||
5986 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
5987 | + cat >conftest.$ac_ext <<_ACEOF | ||
5988 | +/* confdefs.h. */ | ||
5989 | +_ACEOF | ||
5990 | +cat confdefs.h >>conftest.$ac_ext | ||
5991 | +cat >>conftest.$ac_ext <<_ACEOF | ||
5992 | /* end confdefs.h. */ | ||
5993 | #include <sys/types.h> | ||
5994 | /* Check that off_t can represent 2**63 - 1 correctly. | ||
5995 | @@ -4387,11 +5093,37 @@ main () | ||
5996 | return 0; | ||
5997 | } | ||
5998 | _ACEOF | ||
5999 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
6000 | +rm -f conftest.$ac_objext | ||
6001 | +if { (ac_try="$ac_compile" | ||
6002 | +case "(($ac_try" in | ||
6003 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6004 | + *) ac_try_echo=$ac_try;; | ||
6005 | +esac | ||
6006 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6007 | + (eval "$ac_compile") 2>conftest.er1 | ||
6008 | + ac_status=$? | ||
6009 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6010 | + rm -f conftest.er1 | ||
6011 | + cat conftest.err >&5 | ||
6012 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6013 | + (exit $ac_status); } && { | ||
6014 | + test -z "$ac_c_werror_flag" || | ||
6015 | + test ! -s conftest.err | ||
6016 | + } && test -s conftest.$ac_objext; then | ||
6017 | ac_cv_sys_large_files=no; break | ||
6018 | +else | ||
6019 | + echo "$as_me: failed program was:" >&5 | ||
6020 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6021 | + | ||
6022 | + | ||
6023 | fi | ||
6024 | + | ||
6025 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6026 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6027 | + cat >conftest.$ac_ext <<_ACEOF | ||
6028 | +/* confdefs.h. */ | ||
6029 | +_ACEOF | ||
6030 | +cat confdefs.h >>conftest.$ac_ext | ||
6031 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6032 | /* end confdefs.h. */ | ||
6033 | #define _LARGE_FILES 1 | ||
6034 | #include <sys/types.h> | ||
6035 | @@ -4411,16 +5143,38 @@ main () | ||
6036 | return 0; | ||
6037 | } | ||
6038 | _ACEOF | ||
6039 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
6040 | +rm -f conftest.$ac_objext | ||
6041 | +if { (ac_try="$ac_compile" | ||
6042 | +case "(($ac_try" in | ||
6043 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6044 | + *) ac_try_echo=$ac_try;; | ||
6045 | +esac | ||
6046 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6047 | + (eval "$ac_compile") 2>conftest.er1 | ||
6048 | + ac_status=$? | ||
6049 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6050 | + rm -f conftest.er1 | ||
6051 | + cat conftest.err >&5 | ||
6052 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6053 | + (exit $ac_status); } && { | ||
6054 | + test -z "$ac_c_werror_flag" || | ||
6055 | + test ! -s conftest.err | ||
6056 | + } && test -s conftest.$ac_objext; then | ||
6057 | ac_cv_sys_large_files=1; break | ||
6058 | +else | ||
6059 | + echo "$as_me: failed program was:" >&5 | ||
6060 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6061 | + | ||
6062 | + | ||
6063 | fi | ||
6064 | + | ||
6065 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6066 | ac_cv_sys_large_files=unknown | ||
6067 | break | ||
6068 | done | ||
6069 | fi | ||
6070 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 | ||
6071 | -$as_echo "$ac_cv_sys_large_files" >&6; } | ||
6072 | +{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 | ||
6073 | +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } | ||
6074 | case $ac_cv_sys_large_files in #( | ||
6075 | no | unknown) ;; | ||
6076 | *) | ||
6077 | @@ -4429,126 +5183,610 @@ cat >>confdefs.h <<_ACEOF | ||
6078 | _ACEOF | ||
6079 | ;; | ||
6080 | esac | ||
6081 | -rm -rf conftest* | ||
6082 | +rm -f -r conftest* | ||
6083 | fi | ||
6084 | fi | ||
6085 | |||
6086 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 | ||
6087 | -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } | ||
6088 | -if test "${ac_cv_sys_largefile_source+set}" = set; then : | ||
6089 | - $as_echo_n "(cached) " >&6 | ||
6090 | +{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 | ||
6091 | +echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } | ||
6092 | +if test "${ac_cv_sys_largefile_source+set}" = set; then | ||
6093 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6094 | else | ||
6095 | while :; do | ||
6096 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6097 | + cat >conftest.$ac_ext <<_ACEOF | ||
6098 | +/* confdefs.h. */ | ||
6099 | +_ACEOF | ||
6100 | +cat confdefs.h >>conftest.$ac_ext | ||
6101 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6102 | /* end confdefs.h. */ | ||
6103 | -#include <sys/types.h> /* for off_t */ | ||
6104 | - #include <stdio.h> | ||
6105 | +#include <stdio.h> | ||
6106 | int | ||
6107 | main () | ||
6108 | { | ||
6109 | -int (*fp) (FILE *, off_t, int) = fseeko; | ||
6110 | - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); | ||
6111 | +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); | ||
6112 | ; | ||
6113 | return 0; | ||
6114 | } | ||
6115 | _ACEOF | ||
6116 | -if ac_fn_c_try_link "$LINENO"; then : | ||
6117 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
6118 | +if { (ac_try="$ac_link" | ||
6119 | +case "(($ac_try" in | ||
6120 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6121 | + *) ac_try_echo=$ac_try;; | ||
6122 | +esac | ||
6123 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6124 | + (eval "$ac_link") 2>conftest.er1 | ||
6125 | + ac_status=$? | ||
6126 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6127 | + rm -f conftest.er1 | ||
6128 | + cat conftest.err >&5 | ||
6129 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6130 | + (exit $ac_status); } && { | ||
6131 | + test -z "$ac_c_werror_flag" || | ||
6132 | + test ! -s conftest.err | ||
6133 | + } && test -s conftest$ac_exeext && | ||
6134 | + $as_test_x conftest$ac_exeext; then | ||
6135 | ac_cv_sys_largefile_source=no; break | ||
6136 | +else | ||
6137 | + echo "$as_me: failed program was:" >&5 | ||
6138 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6139 | + | ||
6140 | + | ||
6141 | +fi | ||
6142 | + | ||
6143 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
6144 | + conftest$ac_exeext conftest.$ac_ext | ||
6145 | + cat >conftest.$ac_ext <<_ACEOF | ||
6146 | +/* confdefs.h. */ | ||
6147 | +_ACEOF | ||
6148 | +cat confdefs.h >>conftest.$ac_ext | ||
6149 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6150 | +/* end confdefs.h. */ | ||
6151 | +#define _LARGEFILE_SOURCE 1 | ||
6152 | +#include <stdio.h> | ||
6153 | +int | ||
6154 | +main () | ||
6155 | +{ | ||
6156 | +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); | ||
6157 | + ; | ||
6158 | + return 0; | ||
6159 | +} | ||
6160 | +_ACEOF | ||
6161 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
6162 | +if { (ac_try="$ac_link" | ||
6163 | +case "(($ac_try" in | ||
6164 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6165 | + *) ac_try_echo=$ac_try;; | ||
6166 | +esac | ||
6167 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6168 | + (eval "$ac_link") 2>conftest.er1 | ||
6169 | + ac_status=$? | ||
6170 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6171 | + rm -f conftest.er1 | ||
6172 | + cat conftest.err >&5 | ||
6173 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6174 | + (exit $ac_status); } && { | ||
6175 | + test -z "$ac_c_werror_flag" || | ||
6176 | + test ! -s conftest.err | ||
6177 | + } && test -s conftest$ac_exeext && | ||
6178 | + $as_test_x conftest$ac_exeext; then | ||
6179 | + ac_cv_sys_largefile_source=1; break | ||
6180 | +else | ||
6181 | + echo "$as_me: failed program was:" >&5 | ||
6182 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6183 | + | ||
6184 | + | ||
6185 | +fi | ||
6186 | + | ||
6187 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
6188 | + conftest$ac_exeext conftest.$ac_ext | ||
6189 | + ac_cv_sys_largefile_source=unknown | ||
6190 | + break | ||
6191 | +done | ||
6192 | +fi | ||
6193 | +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 | ||
6194 | +echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } | ||
6195 | +case $ac_cv_sys_largefile_source in #( | ||
6196 | + no | unknown) ;; | ||
6197 | + *) | ||
6198 | +cat >>confdefs.h <<_ACEOF | ||
6199 | +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source | ||
6200 | +_ACEOF | ||
6201 | +;; | ||
6202 | +esac | ||
6203 | +rm -f -r conftest* | ||
6204 | + | ||
6205 | +# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug | ||
6206 | +# in glibc 2.1.3, but that breaks too many other things. | ||
6207 | +# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. | ||
6208 | +if test $ac_cv_sys_largefile_source != unknown; then | ||
6209 | + | ||
6210 | +cat >>confdefs.h <<\_ACEOF | ||
6211 | +#define HAVE_FSEEKO 1 | ||
6212 | +_ACEOF | ||
6213 | + | ||
6214 | +fi | ||
6215 | + | ||
6216 | + | ||
6217 | + | ||
6218 | + | ||
6219 | + | ||
6220 | + | ||
6221 | +for ac_header in sys/ioccom.h sys/sockio.h limits.h paths.h | ||
6222 | +do | ||
6223 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6224 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6225 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6226 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6227 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6228 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6229 | +fi | ||
6230 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6231 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6232 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6233 | +else | ||
6234 | + # Is the header compilable? | ||
6235 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6236 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
6237 | +cat >conftest.$ac_ext <<_ACEOF | ||
6238 | +/* confdefs.h. */ | ||
6239 | +_ACEOF | ||
6240 | +cat confdefs.h >>conftest.$ac_ext | ||
6241 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6242 | +/* end confdefs.h. */ | ||
6243 | +$ac_includes_default | ||
6244 | +#include <$ac_header> | ||
6245 | +_ACEOF | ||
6246 | +rm -f conftest.$ac_objext | ||
6247 | +if { (ac_try="$ac_compile" | ||
6248 | +case "(($ac_try" in | ||
6249 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6250 | + *) ac_try_echo=$ac_try;; | ||
6251 | +esac | ||
6252 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6253 | + (eval "$ac_compile") 2>conftest.er1 | ||
6254 | + ac_status=$? | ||
6255 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6256 | + rm -f conftest.er1 | ||
6257 | + cat conftest.err >&5 | ||
6258 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6259 | + (exit $ac_status); } && { | ||
6260 | + test -z "$ac_c_werror_flag" || | ||
6261 | + test ! -s conftest.err | ||
6262 | + } && test -s conftest.$ac_objext; then | ||
6263 | + ac_header_compiler=yes | ||
6264 | +else | ||
6265 | + echo "$as_me: failed program was:" >&5 | ||
6266 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6267 | + | ||
6268 | + ac_header_compiler=no | ||
6269 | +fi | ||
6270 | + | ||
6271 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6272 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6273 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
6274 | + | ||
6275 | +# Is the header present? | ||
6276 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6277 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
6278 | +cat >conftest.$ac_ext <<_ACEOF | ||
6279 | +/* confdefs.h. */ | ||
6280 | +_ACEOF | ||
6281 | +cat confdefs.h >>conftest.$ac_ext | ||
6282 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6283 | +/* end confdefs.h. */ | ||
6284 | +#include <$ac_header> | ||
6285 | +_ACEOF | ||
6286 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
6287 | +case "(($ac_try" in | ||
6288 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6289 | + *) ac_try_echo=$ac_try;; | ||
6290 | +esac | ||
6291 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6292 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
6293 | + ac_status=$? | ||
6294 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6295 | + rm -f conftest.er1 | ||
6296 | + cat conftest.err >&5 | ||
6297 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6298 | + (exit $ac_status); } >/dev/null && { | ||
6299 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
6300 | + test ! -s conftest.err | ||
6301 | + }; then | ||
6302 | + ac_header_preproc=yes | ||
6303 | +else | ||
6304 | + echo "$as_me: failed program was:" >&5 | ||
6305 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6306 | + | ||
6307 | + ac_header_preproc=no | ||
6308 | +fi | ||
6309 | + | ||
6310 | +rm -f conftest.err conftest.$ac_ext | ||
6311 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
6312 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
6313 | + | ||
6314 | +# So? What about this header? | ||
6315 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6316 | + yes:no: ) | ||
6317 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6318 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6319 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6320 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6321 | + ac_header_preproc=yes | ||
6322 | + ;; | ||
6323 | + no:yes:* ) | ||
6324 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6325 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6326 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6327 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6328 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
6329 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6330 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6331 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6332 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6333 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6334 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6335 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6336 | + | ||
6337 | + ;; | ||
6338 | +esac | ||
6339 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6340 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6341 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6342 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6343 | +else | ||
6344 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6345 | +fi | ||
6346 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6347 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6348 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6349 | + | ||
6350 | +fi | ||
6351 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6352 | + cat >>confdefs.h <<_ACEOF | ||
6353 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6354 | +_ACEOF | ||
6355 | + | ||
6356 | +fi | ||
6357 | + | ||
6358 | +done | ||
6359 | + | ||
6360 | + | ||
6361 | +for ac_header in linux/types.h | ||
6362 | +do | ||
6363 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6364 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6365 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6366 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6367 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6368 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6369 | +fi | ||
6370 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6371 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6372 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6373 | +else | ||
6374 | + # Is the header compilable? | ||
6375 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6376 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
6377 | +cat >conftest.$ac_ext <<_ACEOF | ||
6378 | +/* confdefs.h. */ | ||
6379 | +_ACEOF | ||
6380 | +cat confdefs.h >>conftest.$ac_ext | ||
6381 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6382 | +/* end confdefs.h. */ | ||
6383 | +$ac_includes_default | ||
6384 | +#include <$ac_header> | ||
6385 | +_ACEOF | ||
6386 | +rm -f conftest.$ac_objext | ||
6387 | +if { (ac_try="$ac_compile" | ||
6388 | +case "(($ac_try" in | ||
6389 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6390 | + *) ac_try_echo=$ac_try;; | ||
6391 | +esac | ||
6392 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6393 | + (eval "$ac_compile") 2>conftest.er1 | ||
6394 | + ac_status=$? | ||
6395 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6396 | + rm -f conftest.er1 | ||
6397 | + cat conftest.err >&5 | ||
6398 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6399 | + (exit $ac_status); } && { | ||
6400 | + test -z "$ac_c_werror_flag" || | ||
6401 | + test ! -s conftest.err | ||
6402 | + } && test -s conftest.$ac_objext; then | ||
6403 | + ac_header_compiler=yes | ||
6404 | +else | ||
6405 | + echo "$as_me: failed program was:" >&5 | ||
6406 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6407 | + | ||
6408 | + ac_header_compiler=no | ||
6409 | +fi | ||
6410 | + | ||
6411 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6412 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6413 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
6414 | + | ||
6415 | +# Is the header present? | ||
6416 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6417 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
6418 | +cat >conftest.$ac_ext <<_ACEOF | ||
6419 | +/* confdefs.h. */ | ||
6420 | +_ACEOF | ||
6421 | +cat confdefs.h >>conftest.$ac_ext | ||
6422 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6423 | +/* end confdefs.h. */ | ||
6424 | +#include <$ac_header> | ||
6425 | +_ACEOF | ||
6426 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
6427 | +case "(($ac_try" in | ||
6428 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6429 | + *) ac_try_echo=$ac_try;; | ||
6430 | +esac | ||
6431 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6432 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
6433 | + ac_status=$? | ||
6434 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6435 | + rm -f conftest.er1 | ||
6436 | + cat conftest.err >&5 | ||
6437 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6438 | + (exit $ac_status); } >/dev/null && { | ||
6439 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
6440 | + test ! -s conftest.err | ||
6441 | + }; then | ||
6442 | + ac_header_preproc=yes | ||
6443 | +else | ||
6444 | + echo "$as_me: failed program was:" >&5 | ||
6445 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6446 | + | ||
6447 | + ac_header_preproc=no | ||
6448 | +fi | ||
6449 | + | ||
6450 | +rm -f conftest.err conftest.$ac_ext | ||
6451 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
6452 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
6453 | + | ||
6454 | +# So? What about this header? | ||
6455 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6456 | + yes:no: ) | ||
6457 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6458 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6459 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6460 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6461 | + ac_header_preproc=yes | ||
6462 | + ;; | ||
6463 | + no:yes:* ) | ||
6464 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6465 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6466 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6467 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6468 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
6469 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6470 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6471 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6472 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6473 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6474 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6475 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6476 | + | ||
6477 | + ;; | ||
6478 | +esac | ||
6479 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6480 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6481 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6482 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6483 | +else | ||
6484 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6485 | fi | ||
6486 | -rm -f core conftest.err conftest.$ac_objext \ | ||
6487 | - conftest$ac_exeext conftest.$ac_ext | ||
6488 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6489 | -/* end confdefs.h. */ | ||
6490 | -#define _LARGEFILE_SOURCE 1 | ||
6491 | -#include <sys/types.h> /* for off_t */ | ||
6492 | - #include <stdio.h> | ||
6493 | -int | ||
6494 | -main () | ||
6495 | -{ | ||
6496 | -int (*fp) (FILE *, off_t, int) = fseeko; | ||
6497 | - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); | ||
6498 | - ; | ||
6499 | - return 0; | ||
6500 | -} | ||
6501 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6502 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6503 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6504 | + | ||
6505 | +fi | ||
6506 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6507 | + cat >>confdefs.h <<_ACEOF | ||
6508 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6509 | _ACEOF | ||
6510 | -if ac_fn_c_try_link "$LINENO"; then : | ||
6511 | - ac_cv_sys_largefile_source=1; break | ||
6512 | + | ||
6513 | fi | ||
6514 | -rm -f core conftest.err conftest.$ac_objext \ | ||
6515 | - conftest$ac_exeext conftest.$ac_ext | ||
6516 | - ac_cv_sys_largefile_source=unknown | ||
6517 | - break | ||
6518 | + | ||
6519 | done | ||
6520 | + | ||
6521 | + | ||
6522 | + | ||
6523 | + | ||
6524 | +for ac_header in linux/if_packet.h netpacket/packet.h netpacket/if_packet.h | ||
6525 | +do | ||
6526 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6527 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6528 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6529 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6530 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6531 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6532 | fi | ||
6533 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 | ||
6534 | -$as_echo "$ac_cv_sys_largefile_source" >&6; } | ||
6535 | -case $ac_cv_sys_largefile_source in #( | ||
6536 | - no | unknown) ;; | ||
6537 | - *) | ||
6538 | -cat >>confdefs.h <<_ACEOF | ||
6539 | -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source | ||
6540 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6541 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6542 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6543 | +else | ||
6544 | + # Is the header compilable? | ||
6545 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
6546 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
6547 | +cat >conftest.$ac_ext <<_ACEOF | ||
6548 | +/* confdefs.h. */ | ||
6549 | _ACEOF | ||
6550 | -;; | ||
6551 | +cat confdefs.h >>conftest.$ac_ext | ||
6552 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6553 | +/* end confdefs.h. */ | ||
6554 | +$ac_includes_default | ||
6555 | +#include <$ac_header> | ||
6556 | +_ACEOF | ||
6557 | +rm -f conftest.$ac_objext | ||
6558 | +if { (ac_try="$ac_compile" | ||
6559 | +case "(($ac_try" in | ||
6560 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6561 | + *) ac_try_echo=$ac_try;; | ||
6562 | esac | ||
6563 | -rm -rf conftest* | ||
6564 | - | ||
6565 | -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug | ||
6566 | -# in glibc 2.1.3, but that breaks too many other things. | ||
6567 | -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. | ||
6568 | -if test $ac_cv_sys_largefile_source != unknown; then | ||
6569 | - | ||
6570 | -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h | ||
6571 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6572 | + (eval "$ac_compile") 2>conftest.er1 | ||
6573 | + ac_status=$? | ||
6574 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6575 | + rm -f conftest.er1 | ||
6576 | + cat conftest.err >&5 | ||
6577 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6578 | + (exit $ac_status); } && { | ||
6579 | + test -z "$ac_c_werror_flag" || | ||
6580 | + test ! -s conftest.err | ||
6581 | + } && test -s conftest.$ac_objext; then | ||
6582 | + ac_header_compiler=yes | ||
6583 | +else | ||
6584 | + echo "$as_me: failed program was:" >&5 | ||
6585 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6586 | |||
6587 | + ac_header_compiler=no | ||
6588 | fi | ||
6589 | |||
6590 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6591 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6592 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
6593 | |||
6594 | -for ac_header in sys/ioccom.h sys/sockio.h limits.h paths.h | ||
6595 | -do : | ||
6596 | - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6597 | -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | ||
6598 | -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | ||
6599 | - cat >>confdefs.h <<_ACEOF | ||
6600 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6601 | +# Is the header present? | ||
6602 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6603 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
6604 | +cat >conftest.$ac_ext <<_ACEOF | ||
6605 | +/* confdefs.h. */ | ||
6606 | _ACEOF | ||
6607 | +cat confdefs.h >>conftest.$ac_ext | ||
6608 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6609 | +/* end confdefs.h. */ | ||
6610 | +#include <$ac_header> | ||
6611 | +_ACEOF | ||
6612 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
6613 | +case "(($ac_try" in | ||
6614 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6615 | + *) ac_try_echo=$ac_try;; | ||
6616 | +esac | ||
6617 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6618 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
6619 | + ac_status=$? | ||
6620 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6621 | + rm -f conftest.er1 | ||
6622 | + cat conftest.err >&5 | ||
6623 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6624 | + (exit $ac_status); } >/dev/null && { | ||
6625 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
6626 | + test ! -s conftest.err | ||
6627 | + }; then | ||
6628 | + ac_header_preproc=yes | ||
6629 | +else | ||
6630 | + echo "$as_me: failed program was:" >&5 | ||
6631 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6632 | |||
6633 | + ac_header_preproc=no | ||
6634 | fi | ||
6635 | |||
6636 | -done | ||
6637 | +rm -f conftest.err conftest.$ac_ext | ||
6638 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
6639 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
6640 | |||
6641 | -for ac_header in linux/types.h | ||
6642 | -do : | ||
6643 | - ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default" | ||
6644 | -if test "x$ac_cv_header_linux_types_h" = x""yes; then : | ||
6645 | - cat >>confdefs.h <<_ACEOF | ||
6646 | -#define HAVE_LINUX_TYPES_H 1 | ||
6647 | -_ACEOF | ||
6648 | +# So? What about this header? | ||
6649 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6650 | + yes:no: ) | ||
6651 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6652 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6653 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6654 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6655 | + ac_header_preproc=yes | ||
6656 | + ;; | ||
6657 | + no:yes:* ) | ||
6658 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6659 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6660 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6661 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6662 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
6663 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6664 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6665 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6666 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6667 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6668 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6669 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6670 | |||
6671 | + ;; | ||
6672 | +esac | ||
6673 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6674 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6675 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6676 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6677 | +else | ||
6678 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
6679 | fi | ||
6680 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6681 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6682 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6683 | |||
6684 | -done | ||
6685 | - | ||
6686 | -for ac_header in linux/if_packet.h netpacket/packet.h netpacket/if_packet.h | ||
6687 | -do : | ||
6688 | - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6689 | -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | ||
6690 | -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | ||
6691 | +fi | ||
6692 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6693 | cat >>confdefs.h <<_ACEOF | ||
6694 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6695 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6696 | _ACEOF | ||
6697 | |||
6698 | fi | ||
6699 | |||
6700 | done | ||
6701 | |||
6702 | + | ||
6703 | for ac_header in net/pfvar.h | ||
6704 | -do : | ||
6705 | - ac_fn_c_check_header_compile "$LINENO" "net/pfvar.h" "ac_cv_header_net_pfvar_h" "#include <sys/types.h> | ||
6706 | +do | ||
6707 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6708 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6709 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6710 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6711 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6712 | +else | ||
6713 | + cat >conftest.$ac_ext <<_ACEOF | ||
6714 | +/* confdefs.h. */ | ||
6715 | +_ACEOF | ||
6716 | +cat confdefs.h >>conftest.$ac_ext | ||
6717 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6718 | +/* end confdefs.h. */ | ||
6719 | +#include <sys/types.h> | ||
6720 | #include <sys/socket.h> | ||
6721 | #include <net/if.h> | ||
6722 | -" | ||
6723 | -if test "x$ac_cv_header_net_pfvar_h" = x""yes; then : | ||
6724 | + | ||
6725 | +#include <$ac_header> | ||
6726 | +_ACEOF | ||
6727 | +rm -f conftest.$ac_objext | ||
6728 | +if { (ac_try="$ac_compile" | ||
6729 | +case "(($ac_try" in | ||
6730 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6731 | + *) ac_try_echo=$ac_try;; | ||
6732 | +esac | ||
6733 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6734 | + (eval "$ac_compile") 2>conftest.er1 | ||
6735 | + ac_status=$? | ||
6736 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6737 | + rm -f conftest.er1 | ||
6738 | + cat conftest.err >&5 | ||
6739 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6740 | + (exit $ac_status); } && { | ||
6741 | + test -z "$ac_c_werror_flag" || | ||
6742 | + test ! -s conftest.err | ||
6743 | + } && test -s conftest.$ac_objext; then | ||
6744 | + eval "$as_ac_Header=yes" | ||
6745 | +else | ||
6746 | + echo "$as_me: failed program was:" >&5 | ||
6747 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6748 | + | ||
6749 | + eval "$as_ac_Header=no" | ||
6750 | +fi | ||
6751 | + | ||
6752 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6753 | +fi | ||
6754 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6755 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6756 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6757 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6758 | cat >>confdefs.h <<_ACEOF | ||
6759 | -#define HAVE_NET_PFVAR_H 1 | ||
6760 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6761 | _ACEOF | ||
6762 | |||
6763 | fi | ||
6764 | @@ -4559,9 +5797,13 @@ if test "$ac_cv_header_net_pfvar_h" = yes; then | ||
6765 | # | ||
6766 | # Check for various PF actions. | ||
6767 | # | ||
6768 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether net/pfvar.h defines PF_NAT through PF_NORDR" >&5 | ||
6769 | -$as_echo_n "checking whether net/pfvar.h defines PF_NAT through PF_NORDR... " >&6; } | ||
6770 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6771 | + { echo "$as_me:$LINENO: checking whether net/pfvar.h defines PF_NAT through PF_NORDR" >&5 | ||
6772 | +echo $ECHO_N "checking whether net/pfvar.h defines PF_NAT through PF_NORDR... $ECHO_C" >&6; } | ||
6773 | + cat >conftest.$ac_ext <<_ACEOF | ||
6774 | +/* confdefs.h. */ | ||
6775 | +_ACEOF | ||
6776 | +cat confdefs.h >>conftest.$ac_ext | ||
6777 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6778 | /* end confdefs.h. */ | ||
6779 | #include <sys/types.h> | ||
6780 | #include <sys/socket.h> | ||
6781 | @@ -4575,28 +5817,95 @@ return PF_NAT+PF_NONAT+PF_BINAT+PF_NOBINAT+PF_RDR+PF_NORDR; | ||
6782 | return 0; | ||
6783 | } | ||
6784 | _ACEOF | ||
6785 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
6786 | +rm -f conftest.$ac_objext | ||
6787 | +if { (ac_try="$ac_compile" | ||
6788 | +case "(($ac_try" in | ||
6789 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6790 | + *) ac_try_echo=$ac_try;; | ||
6791 | +esac | ||
6792 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6793 | + (eval "$ac_compile") 2>conftest.er1 | ||
6794 | + ac_status=$? | ||
6795 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6796 | + rm -f conftest.er1 | ||
6797 | + cat conftest.err >&5 | ||
6798 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6799 | + (exit $ac_status); } && { | ||
6800 | + test -z "$ac_c_werror_flag" || | ||
6801 | + test ! -s conftest.err | ||
6802 | + } && test -s conftest.$ac_objext; then | ||
6803 | |||
6804 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
6805 | -$as_echo "yes" >&6; } | ||
6806 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
6807 | +echo "${ECHO_T}yes" >&6; } | ||
6808 | |||
6809 | -$as_echo "#define HAVE_PF_NAT_THROUGH_PF_NORDR 1" >>confdefs.h | ||
6810 | +cat >>confdefs.h <<\_ACEOF | ||
6811 | +#define HAVE_PF_NAT_THROUGH_PF_NORDR 1 | ||
6812 | +_ACEOF | ||
6813 | |||
6814 | |||
6815 | else | ||
6816 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
6817 | -$as_echo "no" >&6; } | ||
6818 | + echo "$as_me: failed program was:" >&5 | ||
6819 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6820 | + | ||
6821 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6822 | +echo "${ECHO_T}no" >&6; } | ||
6823 | fi | ||
6824 | + | ||
6825 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6826 | fi | ||
6827 | + | ||
6828 | for ac_header in netinet/if_ether.h | ||
6829 | -do : | ||
6830 | - ac_fn_c_check_header_compile "$LINENO" "netinet/if_ether.h" "ac_cv_header_netinet_if_ether_h" "#include <sys/types.h> | ||
6831 | +do | ||
6832 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6833 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6834 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6835 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6836 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6837 | +else | ||
6838 | + cat >conftest.$ac_ext <<_ACEOF | ||
6839 | +/* confdefs.h. */ | ||
6840 | +_ACEOF | ||
6841 | +cat confdefs.h >>conftest.$ac_ext | ||
6842 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6843 | +/* end confdefs.h. */ | ||
6844 | +#include <sys/types.h> | ||
6845 | #include <sys/socket.h> | ||
6846 | -" | ||
6847 | -if test "x$ac_cv_header_netinet_if_ether_h" = x""yes; then : | ||
6848 | + | ||
6849 | +#include <$ac_header> | ||
6850 | +_ACEOF | ||
6851 | +rm -f conftest.$ac_objext | ||
6852 | +if { (ac_try="$ac_compile" | ||
6853 | +case "(($ac_try" in | ||
6854 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6855 | + *) ac_try_echo=$ac_try;; | ||
6856 | +esac | ||
6857 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6858 | + (eval "$ac_compile") 2>conftest.er1 | ||
6859 | + ac_status=$? | ||
6860 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6861 | + rm -f conftest.er1 | ||
6862 | + cat conftest.err >&5 | ||
6863 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6864 | + (exit $ac_status); } && { | ||
6865 | + test -z "$ac_c_werror_flag" || | ||
6866 | + test ! -s conftest.err | ||
6867 | + } && test -s conftest.$ac_objext; then | ||
6868 | + eval "$as_ac_Header=yes" | ||
6869 | +else | ||
6870 | + echo "$as_me: failed program was:" >&5 | ||
6871 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6872 | + | ||
6873 | + eval "$as_ac_Header=no" | ||
6874 | +fi | ||
6875 | + | ||
6876 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6877 | +fi | ||
6878 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6879 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6880 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6881 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6882 | cat >>confdefs.h <<_ACEOF | ||
6883 | -#define HAVE_NETINET_IF_ETHER_H 1 | ||
6884 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6885 | _ACEOF | ||
6886 | |||
6887 | fi | ||
6888 | @@ -4611,21 +5920,66 @@ if test "$ac_cv_header_netinet_if_ether_h" != yes; then | ||
6889 | # treat the previous failure as a cached value and | ||
6890 | # suppress the next test. | ||
6891 | # | ||
6892 | - { $as_echo "$as_me:${as_lineno-$LINENO}: Rechecking with some additional includes" >&5 | ||
6893 | -$as_echo "$as_me: Rechecking with some additional includes" >&6;} | ||
6894 | + { echo "$as_me:$LINENO: Rechecking with some additional includes" >&5 | ||
6895 | +echo "$as_me: Rechecking with some additional includes" >&6;} | ||
6896 | unset ac_cv_header_netinet_if_ether_h | ||
6897 | - for ac_header in netinet/if_ether.h | ||
6898 | -do : | ||
6899 | - ac_fn_c_check_header_compile "$LINENO" "netinet/if_ether.h" "ac_cv_header_netinet_if_ether_h" "#include <sys/types.h> | ||
6900 | + | ||
6901 | +for ac_header in netinet/if_ether.h | ||
6902 | +do | ||
6903 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6904 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6905 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
6906 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
6907 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6908 | +else | ||
6909 | + cat >conftest.$ac_ext <<_ACEOF | ||
6910 | +/* confdefs.h. */ | ||
6911 | +_ACEOF | ||
6912 | +cat confdefs.h >>conftest.$ac_ext | ||
6913 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6914 | +/* end confdefs.h. */ | ||
6915 | +#include <sys/types.h> | ||
6916 | #include <sys/socket.h> | ||
6917 | #include <netinet/in.h> | ||
6918 | struct mbuf; | ||
6919 | struct rtentry; | ||
6920 | #include <net/if.h> | ||
6921 | -" | ||
6922 | -if test "x$ac_cv_header_netinet_if_ether_h" = x""yes; then : | ||
6923 | + | ||
6924 | +#include <$ac_header> | ||
6925 | +_ACEOF | ||
6926 | +rm -f conftest.$ac_objext | ||
6927 | +if { (ac_try="$ac_compile" | ||
6928 | +case "(($ac_try" in | ||
6929 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6930 | + *) ac_try_echo=$ac_try;; | ||
6931 | +esac | ||
6932 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6933 | + (eval "$ac_compile") 2>conftest.er1 | ||
6934 | + ac_status=$? | ||
6935 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
6936 | + rm -f conftest.er1 | ||
6937 | + cat conftest.err >&5 | ||
6938 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6939 | + (exit $ac_status); } && { | ||
6940 | + test -z "$ac_c_werror_flag" || | ||
6941 | + test ! -s conftest.err | ||
6942 | + } && test -s conftest.$ac_objext; then | ||
6943 | + eval "$as_ac_Header=yes" | ||
6944 | +else | ||
6945 | + echo "$as_me: failed program was:" >&5 | ||
6946 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
6947 | + | ||
6948 | + eval "$as_ac_Header=no" | ||
6949 | +fi | ||
6950 | + | ||
6951 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6952 | +fi | ||
6953 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
6954 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
6955 | +echo "${ECHO_T}$ac_res" >&6; } | ||
6956 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6957 | cat >>confdefs.h <<_ACEOF | ||
6958 | -#define HAVE_NETINET_IF_ETHER_H 1 | ||
6959 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6960 | _ACEOF | ||
6961 | |||
6962 | fi | ||
6963 | @@ -4635,12 +5989,16 @@ done | ||
6964 | fi | ||
6965 | |||
6966 | if test "$GCC" = yes ; then | ||
6967 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI ioctl definitions" >&5 | ||
6968 | -$as_echo_n "checking for ANSI ioctl definitions... " >&6; } | ||
6969 | - if test "${ac_cv_lbl_gcc_fixincludes+set}" = set; then : | ||
6970 | - $as_echo_n "(cached) " >&6 | ||
6971 | + { echo "$as_me:$LINENO: checking for ANSI ioctl definitions" >&5 | ||
6972 | +echo $ECHO_N "checking for ANSI ioctl definitions... $ECHO_C" >&6; } | ||
6973 | + if test "${ac_cv_lbl_gcc_fixincludes+set}" = set; then | ||
6974 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6975 | else | ||
6976 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
6977 | + cat >conftest.$ac_ext <<_ACEOF | ||
6978 | +/* confdefs.h. */ | ||
6979 | +_ACEOF | ||
6980 | +cat confdefs.h >>conftest.$ac_ext | ||
6981 | +cat >>conftest.$ac_ext <<_ACEOF | ||
6982 | /* end confdefs.h. */ | ||
6983 | /* | ||
6984 | * This generates a "duplicate case value" when fixincludes | ||
6985 | @@ -4663,44 +6021,232 @@ switch (0) { | ||
6986 | return 0; | ||
6987 | } | ||
6988 | _ACEOF | ||
6989 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
6990 | +rm -f conftest.$ac_objext | ||
6991 | +if { (ac_try="$ac_compile" | ||
6992 | +case "(($ac_try" in | ||
6993 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6994 | + *) ac_try_echo=$ac_try;; | ||
6995 | +esac | ||
6996 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6997 | + (eval "$ac_compile") 2>conftest.er1 | ||
6998 | + ac_status=$? | ||
6999 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7000 | + rm -f conftest.er1 | ||
7001 | + cat conftest.err >&5 | ||
7002 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7003 | + (exit $ac_status); } && { | ||
7004 | + test -z "$ac_c_werror_flag" || | ||
7005 | + test ! -s conftest.err | ||
7006 | + } && test -s conftest.$ac_objext; then | ||
7007 | ac_cv_lbl_gcc_fixincludes=yes | ||
7008 | else | ||
7009 | - ac_cv_lbl_gcc_fixincludes=no | ||
7010 | + echo "$as_me: failed program was:" >&5 | ||
7011 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7012 | + | ||
7013 | + ac_cv_lbl_gcc_fixincludes=no | ||
7014 | fi | ||
7015 | + | ||
7016 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7017 | fi | ||
7018 | |||
7019 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_gcc_fixincludes" >&5 | ||
7020 | -$as_echo "$ac_cv_lbl_gcc_fixincludes" >&6; } | ||
7021 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_fixincludes" >&5 | ||
7022 | +echo "${ECHO_T}$ac_cv_lbl_gcc_fixincludes" >&6; } | ||
7023 | if test $ac_cv_lbl_gcc_fixincludes = no ; then | ||
7024 | # Don't cache failure | ||
7025 | unset ac_cv_lbl_gcc_fixincludes | ||
7026 | - as_fn_error $? "see the INSTALL for more info" "$LINENO" 5 | ||
7027 | + { { echo "$as_me:$LINENO: error: see the INSTALL for more info" >&5 | ||
7028 | +echo "$as_me: error: see the INSTALL for more info" >&2;} | ||
7029 | + { (exit 1); exit 1; }; } | ||
7030 | fi | ||
7031 | fi | ||
7032 | |||
7033 | -for ac_func in strerror strlcpy | ||
7034 | -do : | ||
7035 | - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
7036 | -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||
7037 | -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | ||
7038 | - cat >>confdefs.h <<_ACEOF | ||
7039 | -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
7040 | + | ||
7041 | + | ||
7042 | +for ac_func in strerror strlcpy | ||
7043 | +do | ||
7044 | +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
7045 | +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
7046 | +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | ||
7047 | +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
7048 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7049 | +else | ||
7050 | + cat >conftest.$ac_ext <<_ACEOF | ||
7051 | +/* confdefs.h. */ | ||
7052 | +_ACEOF | ||
7053 | +cat confdefs.h >>conftest.$ac_ext | ||
7054 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7055 | +/* end confdefs.h. */ | ||
7056 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7057 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7058 | +#define $ac_func innocuous_$ac_func | ||
7059 | + | ||
7060 | +/* System header to define __stub macros and hopefully few prototypes, | ||
7061 | + which can conflict with char $ac_func (); below. | ||
7062 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7063 | + <limits.h> exists even on freestanding compilers. */ | ||
7064 | + | ||
7065 | +#ifdef __STDC__ | ||
7066 | +# include <limits.h> | ||
7067 | +#else | ||
7068 | +# include <assert.h> | ||
7069 | +#endif | ||
7070 | + | ||
7071 | +#undef $ac_func | ||
7072 | + | ||
7073 | +/* Override any GCC internal prototype to avoid an error. | ||
7074 | + Use char because int might match the return type of a GCC | ||
7075 | + builtin and then its argument prototype would still apply. */ | ||
7076 | +#ifdef __cplusplus | ||
7077 | +extern "C" | ||
7078 | +#endif | ||
7079 | +char $ac_func (); | ||
7080 | +/* The GNU C library defines this for functions which it implements | ||
7081 | + to always fail with ENOSYS. Some functions are actually named | ||
7082 | + something starting with __ and the normal name is an alias. */ | ||
7083 | +#if defined __stub_$ac_func || defined __stub___$ac_func | ||
7084 | +choke me | ||
7085 | +#endif | ||
7086 | + | ||
7087 | +int | ||
7088 | +main () | ||
7089 | +{ | ||
7090 | +return $ac_func (); | ||
7091 | + ; | ||
7092 | + return 0; | ||
7093 | +} | ||
7094 | +_ACEOF | ||
7095 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
7096 | +if { (ac_try="$ac_link" | ||
7097 | +case "(($ac_try" in | ||
7098 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7099 | + *) ac_try_echo=$ac_try;; | ||
7100 | +esac | ||
7101 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7102 | + (eval "$ac_link") 2>conftest.er1 | ||
7103 | + ac_status=$? | ||
7104 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7105 | + rm -f conftest.er1 | ||
7106 | + cat conftest.err >&5 | ||
7107 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7108 | + (exit $ac_status); } && { | ||
7109 | + test -z "$ac_c_werror_flag" || | ||
7110 | + test ! -s conftest.err | ||
7111 | + } && test -s conftest$ac_exeext && | ||
7112 | + $as_test_x conftest$ac_exeext; then | ||
7113 | + eval "$as_ac_var=yes" | ||
7114 | +else | ||
7115 | + echo "$as_me: failed program was:" >&5 | ||
7116 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7117 | + | ||
7118 | + eval "$as_ac_var=no" | ||
7119 | +fi | ||
7120 | + | ||
7121 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7122 | + conftest$ac_exeext conftest.$ac_ext | ||
7123 | +fi | ||
7124 | +ac_res=`eval echo '${'$as_ac_var'}'` | ||
7125 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
7126 | +echo "${ECHO_T}$ac_res" >&6; } | ||
7127 | +if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
7128 | + cat >>confdefs.h <<_ACEOF | ||
7129 | +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
7130 | +_ACEOF | ||
7131 | + | ||
7132 | +fi | ||
7133 | +done | ||
7134 | + | ||
7135 | + | ||
7136 | +needsnprintf=no | ||
7137 | + | ||
7138 | + | ||
7139 | +for ac_func in vsnprintf snprintf | ||
7140 | +do | ||
7141 | +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
7142 | +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
7143 | +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | ||
7144 | +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
7145 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7146 | +else | ||
7147 | + cat >conftest.$ac_ext <<_ACEOF | ||
7148 | +/* confdefs.h. */ | ||
7149 | +_ACEOF | ||
7150 | +cat confdefs.h >>conftest.$ac_ext | ||
7151 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7152 | +/* end confdefs.h. */ | ||
7153 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7154 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7155 | +#define $ac_func innocuous_$ac_func | ||
7156 | + | ||
7157 | +/* System header to define __stub macros and hopefully few prototypes, | ||
7158 | + which can conflict with char $ac_func (); below. | ||
7159 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7160 | + <limits.h> exists even on freestanding compilers. */ | ||
7161 | + | ||
7162 | +#ifdef __STDC__ | ||
7163 | +# include <limits.h> | ||
7164 | +#else | ||
7165 | +# include <assert.h> | ||
7166 | +#endif | ||
7167 | + | ||
7168 | +#undef $ac_func | ||
7169 | + | ||
7170 | +/* Override any GCC internal prototype to avoid an error. | ||
7171 | + Use char because int might match the return type of a GCC | ||
7172 | + builtin and then its argument prototype would still apply. */ | ||
7173 | +#ifdef __cplusplus | ||
7174 | +extern "C" | ||
7175 | +#endif | ||
7176 | +char $ac_func (); | ||
7177 | +/* The GNU C library defines this for functions which it implements | ||
7178 | + to always fail with ENOSYS. Some functions are actually named | ||
7179 | + something starting with __ and the normal name is an alias. */ | ||
7180 | +#if defined __stub_$ac_func || defined __stub___$ac_func | ||
7181 | +choke me | ||
7182 | +#endif | ||
7183 | + | ||
7184 | +int | ||
7185 | +main () | ||
7186 | +{ | ||
7187 | +return $ac_func (); | ||
7188 | + ; | ||
7189 | + return 0; | ||
7190 | +} | ||
7191 | _ACEOF | ||
7192 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
7193 | +if { (ac_try="$ac_link" | ||
7194 | +case "(($ac_try" in | ||
7195 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7196 | + *) ac_try_echo=$ac_try;; | ||
7197 | +esac | ||
7198 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7199 | + (eval "$ac_link") 2>conftest.er1 | ||
7200 | + ac_status=$? | ||
7201 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7202 | + rm -f conftest.er1 | ||
7203 | + cat conftest.err >&5 | ||
7204 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7205 | + (exit $ac_status); } && { | ||
7206 | + test -z "$ac_c_werror_flag" || | ||
7207 | + test ! -s conftest.err | ||
7208 | + } && test -s conftest$ac_exeext && | ||
7209 | + $as_test_x conftest$ac_exeext; then | ||
7210 | + eval "$as_ac_var=yes" | ||
7211 | +else | ||
7212 | + echo "$as_me: failed program was:" >&5 | ||
7213 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7214 | |||
7215 | + eval "$as_ac_var=no" | ||
7216 | fi | ||
7217 | -done | ||
7218 | |||
7219 | - | ||
7220 | -needsnprintf=no | ||
7221 | -for ac_func in vsnprintf snprintf | ||
7222 | -do : | ||
7223 | - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
7224 | -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||
7225 | -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | ||
7226 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7227 | + conftest$ac_exeext conftest.$ac_ext | ||
7228 | +fi | ||
7229 | +ac_res=`eval echo '${'$as_ac_var'}'` | ||
7230 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
7231 | +echo "${ECHO_T}$ac_res" >&6; } | ||
7232 | +if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
7233 | cat >>confdefs.h <<_ACEOF | ||
7234 | -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
7235 | +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
7236 | _ACEOF | ||
7237 | |||
7238 | else | ||
7239 | @@ -4726,13 +6272,17 @@ fi | ||
7240 | # libraries (i.e. libc): | ||
7241 | # Some OSes (eg. Solaris) place it in libnsl | ||
7242 | # Some strange OSes (SINIX) have it in libsocket: | ||
7243 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 | ||
7244 | -$as_echo_n "checking for library containing gethostbyname... " >&6; } | ||
7245 | -if test "${ac_cv_search_gethostbyname+set}" = set; then : | ||
7246 | - $as_echo_n "(cached) " >&6 | ||
7247 | + { echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5 | ||
7248 | +echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; } | ||
7249 | +if test "${ac_cv_search_gethostbyname+set}" = set; then | ||
7250 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7251 | else | ||
7252 | ac_func_search_save_LIBS=$LIBS | ||
7253 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
7254 | +cat >conftest.$ac_ext <<_ACEOF | ||
7255 | +/* confdefs.h. */ | ||
7256 | +_ACEOF | ||
7257 | +cat confdefs.h >>conftest.$ac_ext | ||
7258 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7259 | /* end confdefs.h. */ | ||
7260 | |||
7261 | /* Override any GCC internal prototype to avoid an error. | ||
7262 | @@ -4757,27 +6307,50 @@ for ac_lib in '' nsl socket resolv; do | ||
7263 | ac_res=-l$ac_lib | ||
7264 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
7265 | fi | ||
7266 | - if ac_fn_c_try_link "$LINENO"; then : | ||
7267 | + rm -f conftest.$ac_objext conftest$ac_exeext | ||
7268 | +if { (ac_try="$ac_link" | ||
7269 | +case "(($ac_try" in | ||
7270 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7271 | + *) ac_try_echo=$ac_try;; | ||
7272 | +esac | ||
7273 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7274 | + (eval "$ac_link") 2>conftest.er1 | ||
7275 | + ac_status=$? | ||
7276 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7277 | + rm -f conftest.er1 | ||
7278 | + cat conftest.err >&5 | ||
7279 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7280 | + (exit $ac_status); } && { | ||
7281 | + test -z "$ac_c_werror_flag" || | ||
7282 | + test ! -s conftest.err | ||
7283 | + } && test -s conftest$ac_exeext && | ||
7284 | + $as_test_x conftest$ac_exeext; then | ||
7285 | ac_cv_search_gethostbyname=$ac_res | ||
7286 | +else | ||
7287 | + echo "$as_me: failed program was:" >&5 | ||
7288 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7289 | + | ||
7290 | + | ||
7291 | fi | ||
7292 | -rm -f core conftest.err conftest.$ac_objext \ | ||
7293 | - conftest$ac_exeext | ||
7294 | - if test "${ac_cv_search_gethostbyname+set}" = set; then : | ||
7295 | + | ||
7296 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7297 | + conftest$ac_exeext | ||
7298 | + if test "${ac_cv_search_gethostbyname+set}" = set; then | ||
7299 | break | ||
7300 | fi | ||
7301 | done | ||
7302 | -if test "${ac_cv_search_gethostbyname+set}" = set; then : | ||
7303 | - | ||
7304 | +if test "${ac_cv_search_gethostbyname+set}" = set; then | ||
7305 | + : | ||
7306 | else | ||
7307 | ac_cv_search_gethostbyname=no | ||
7308 | fi | ||
7309 | rm conftest.$ac_ext | ||
7310 | LIBS=$ac_func_search_save_LIBS | ||
7311 | fi | ||
7312 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 | ||
7313 | -$as_echo "$ac_cv_search_gethostbyname" >&6; } | ||
7314 | +{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 | ||
7315 | +echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; } | ||
7316 | ac_res=$ac_cv_search_gethostbyname | ||
7317 | -if test "$ac_res" != no; then : | ||
7318 | +if test "$ac_res" != no; then | ||
7319 | test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
7320 | |||
7321 | fi | ||
7322 | @@ -4786,14 +6359,18 @@ fi | ||
7323 | # AC_SEARCH_LIBS isn't up to the task of handling dependencies like this. | ||
7324 | if test "$ac_cv_search_gethostbyname" = "no" | ||
7325 | then | ||
7326 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5 | ||
7327 | -$as_echo_n "checking for gethostbyname in -lsocket... " >&6; } | ||
7328 | -if test "${ac_cv_lib_socket_gethostbyname+set}" = set; then : | ||
7329 | - $as_echo_n "(cached) " >&6 | ||
7330 | + { echo "$as_me:$LINENO: checking for gethostbyname in -lsocket" >&5 | ||
7331 | +echo $ECHO_N "checking for gethostbyname in -lsocket... $ECHO_C" >&6; } | ||
7332 | +if test "${ac_cv_lib_socket_gethostbyname+set}" = set; then | ||
7333 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7334 | else | ||
7335 | ac_check_lib_save_LIBS=$LIBS | ||
7336 | LIBS="-lsocket -lnsl $LIBS" | ||
7337 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
7338 | +cat >conftest.$ac_ext <<_ACEOF | ||
7339 | +/* confdefs.h. */ | ||
7340 | +_ACEOF | ||
7341 | +cat confdefs.h >>conftest.$ac_ext | ||
7342 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7343 | /* end confdefs.h. */ | ||
7344 | |||
7345 | /* Override any GCC internal prototype to avoid an error. | ||
7346 | @@ -4811,29 +6388,54 @@ return gethostbyname (); | ||
7347 | return 0; | ||
7348 | } | ||
7349 | _ACEOF | ||
7350 | -if ac_fn_c_try_link "$LINENO"; then : | ||
7351 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
7352 | +if { (ac_try="$ac_link" | ||
7353 | +case "(($ac_try" in | ||
7354 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7355 | + *) ac_try_echo=$ac_try;; | ||
7356 | +esac | ||
7357 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7358 | + (eval "$ac_link") 2>conftest.er1 | ||
7359 | + ac_status=$? | ||
7360 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7361 | + rm -f conftest.er1 | ||
7362 | + cat conftest.err >&5 | ||
7363 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7364 | + (exit $ac_status); } && { | ||
7365 | + test -z "$ac_c_werror_flag" || | ||
7366 | + test ! -s conftest.err | ||
7367 | + } && test -s conftest$ac_exeext && | ||
7368 | + $as_test_x conftest$ac_exeext; then | ||
7369 | ac_cv_lib_socket_gethostbyname=yes | ||
7370 | else | ||
7371 | - ac_cv_lib_socket_gethostbyname=no | ||
7372 | + echo "$as_me: failed program was:" >&5 | ||
7373 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7374 | + | ||
7375 | + ac_cv_lib_socket_gethostbyname=no | ||
7376 | fi | ||
7377 | -rm -f core conftest.err conftest.$ac_objext \ | ||
7378 | - conftest$ac_exeext conftest.$ac_ext | ||
7379 | + | ||
7380 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7381 | + conftest$ac_exeext conftest.$ac_ext | ||
7382 | LIBS=$ac_check_lib_save_LIBS | ||
7383 | fi | ||
7384 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gethostbyname" >&5 | ||
7385 | -$as_echo "$ac_cv_lib_socket_gethostbyname" >&6; } | ||
7386 | -if test "x$ac_cv_lib_socket_gethostbyname" = x""yes; then : | ||
7387 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gethostbyname" >&5 | ||
7388 | +echo "${ECHO_T}$ac_cv_lib_socket_gethostbyname" >&6; } | ||
7389 | +if test $ac_cv_lib_socket_gethostbyname = yes; then | ||
7390 | LIBS="-lsocket -lnsl $LIBS" | ||
7391 | fi | ||
7392 | |||
7393 | fi | ||
7394 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 | ||
7395 | -$as_echo_n "checking for library containing socket... " >&6; } | ||
7396 | -if test "${ac_cv_search_socket+set}" = set; then : | ||
7397 | - $as_echo_n "(cached) " >&6 | ||
7398 | + { echo "$as_me:$LINENO: checking for library containing socket" >&5 | ||
7399 | +echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; } | ||
7400 | +if test "${ac_cv_search_socket+set}" = set; then | ||
7401 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7402 | else | ||
7403 | ac_func_search_save_LIBS=$LIBS | ||
7404 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
7405 | +cat >conftest.$ac_ext <<_ACEOF | ||
7406 | +/* confdefs.h. */ | ||
7407 | +_ACEOF | ||
7408 | +cat confdefs.h >>conftest.$ac_ext | ||
7409 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7410 | /* end confdefs.h. */ | ||
7411 | |||
7412 | /* Override any GCC internal prototype to avoid an error. | ||
7413 | @@ -4858,38 +6460,65 @@ for ac_lib in '' socket; do | ||
7414 | ac_res=-l$ac_lib | ||
7415 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
7416 | fi | ||
7417 | - if ac_fn_c_try_link "$LINENO"; then : | ||
7418 | + rm -f conftest.$ac_objext conftest$ac_exeext | ||
7419 | +if { (ac_try="$ac_link" | ||
7420 | +case "(($ac_try" in | ||
7421 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7422 | + *) ac_try_echo=$ac_try;; | ||
7423 | +esac | ||
7424 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7425 | + (eval "$ac_link") 2>conftest.er1 | ||
7426 | + ac_status=$? | ||
7427 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7428 | + rm -f conftest.er1 | ||
7429 | + cat conftest.err >&5 | ||
7430 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7431 | + (exit $ac_status); } && { | ||
7432 | + test -z "$ac_c_werror_flag" || | ||
7433 | + test ! -s conftest.err | ||
7434 | + } && test -s conftest$ac_exeext && | ||
7435 | + $as_test_x conftest$ac_exeext; then | ||
7436 | ac_cv_search_socket=$ac_res | ||
7437 | +else | ||
7438 | + echo "$as_me: failed program was:" >&5 | ||
7439 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7440 | + | ||
7441 | + | ||
7442 | fi | ||
7443 | -rm -f core conftest.err conftest.$ac_objext \ | ||
7444 | - conftest$ac_exeext | ||
7445 | - if test "${ac_cv_search_socket+set}" = set; then : | ||
7446 | + | ||
7447 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7448 | + conftest$ac_exeext | ||
7449 | + if test "${ac_cv_search_socket+set}" = set; then | ||
7450 | break | ||
7451 | fi | ||
7452 | done | ||
7453 | -if test "${ac_cv_search_socket+set}" = set; then : | ||
7454 | - | ||
7455 | +if test "${ac_cv_search_socket+set}" = set; then | ||
7456 | + : | ||
7457 | else | ||
7458 | ac_cv_search_socket=no | ||
7459 | fi | ||
7460 | rm conftest.$ac_ext | ||
7461 | LIBS=$ac_func_search_save_LIBS | ||
7462 | fi | ||
7463 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 | ||
7464 | -$as_echo "$ac_cv_search_socket" >&6; } | ||
7465 | +{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5 | ||
7466 | +echo "${ECHO_T}$ac_cv_search_socket" >&6; } | ||
7467 | ac_res=$ac_cv_search_socket | ||
7468 | -if test "$ac_res" != no; then : | ||
7469 | +if test "$ac_res" != no; then | ||
7470 | test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
7471 | |||
7472 | else | ||
7473 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 | ||
7474 | -$as_echo_n "checking for socket in -lsocket... " >&6; } | ||
7475 | -if test "${ac_cv_lib_socket_socket+set}" = set; then : | ||
7476 | - $as_echo_n "(cached) " >&6 | ||
7477 | + { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 | ||
7478 | +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; } | ||
7479 | +if test "${ac_cv_lib_socket_socket+set}" = set; then | ||
7480 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7481 | else | ||
7482 | ac_check_lib_save_LIBS=$LIBS | ||
7483 | LIBS="-lsocket -lnsl $LIBS" | ||
7484 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
7485 | +cat >conftest.$ac_ext <<_ACEOF | ||
7486 | +/* confdefs.h. */ | ||
7487 | +_ACEOF | ||
7488 | +cat confdefs.h >>conftest.$ac_ext | ||
7489 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7490 | /* end confdefs.h. */ | ||
7491 | |||
7492 | /* Override any GCC internal prototype to avoid an error. | ||
7493 | @@ -4907,31 +6536,56 @@ return socket (); | ||
7494 | return 0; | ||
7495 | } | ||
7496 | _ACEOF | ||
7497 | -if ac_fn_c_try_link "$LINENO"; then : | ||
7498 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
7499 | +if { (ac_try="$ac_link" | ||
7500 | +case "(($ac_try" in | ||
7501 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7502 | + *) ac_try_echo=$ac_try;; | ||
7503 | +esac | ||
7504 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7505 | + (eval "$ac_link") 2>conftest.er1 | ||
7506 | + ac_status=$? | ||
7507 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7508 | + rm -f conftest.er1 | ||
7509 | + cat conftest.err >&5 | ||
7510 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7511 | + (exit $ac_status); } && { | ||
7512 | + test -z "$ac_c_werror_flag" || | ||
7513 | + test ! -s conftest.err | ||
7514 | + } && test -s conftest$ac_exeext && | ||
7515 | + $as_test_x conftest$ac_exeext; then | ||
7516 | ac_cv_lib_socket_socket=yes | ||
7517 | else | ||
7518 | - ac_cv_lib_socket_socket=no | ||
7519 | + echo "$as_me: failed program was:" >&5 | ||
7520 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7521 | + | ||
7522 | + ac_cv_lib_socket_socket=no | ||
7523 | fi | ||
7524 | -rm -f core conftest.err conftest.$ac_objext \ | ||
7525 | - conftest$ac_exeext conftest.$ac_ext | ||
7526 | + | ||
7527 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7528 | + conftest$ac_exeext conftest.$ac_ext | ||
7529 | LIBS=$ac_check_lib_save_LIBS | ||
7530 | fi | ||
7531 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 | ||
7532 | -$as_echo "$ac_cv_lib_socket_socket" >&6; } | ||
7533 | -if test "x$ac_cv_lib_socket_socket" = x""yes; then : | ||
7534 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 | ||
7535 | +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; } | ||
7536 | +if test $ac_cv_lib_socket_socket = yes; then | ||
7537 | LIBS="-lsocket -lnsl $LIBS" | ||
7538 | fi | ||
7539 | |||
7540 | fi | ||
7541 | |||
7542 | # DLPI needs putmsg under HPUX so test for -lstr while we're at it | ||
7543 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing putmsg" >&5 | ||
7544 | -$as_echo_n "checking for library containing putmsg... " >&6; } | ||
7545 | -if test "${ac_cv_search_putmsg+set}" = set; then : | ||
7546 | - $as_echo_n "(cached) " >&6 | ||
7547 | + { echo "$as_me:$LINENO: checking for library containing putmsg" >&5 | ||
7548 | +echo $ECHO_N "checking for library containing putmsg... $ECHO_C" >&6; } | ||
7549 | +if test "${ac_cv_search_putmsg+set}" = set; then | ||
7550 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7551 | else | ||
7552 | ac_func_search_save_LIBS=$LIBS | ||
7553 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
7554 | +cat >conftest.$ac_ext <<_ACEOF | ||
7555 | +/* confdefs.h. */ | ||
7556 | +_ACEOF | ||
7557 | +cat confdefs.h >>conftest.$ac_ext | ||
7558 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7559 | /* end confdefs.h. */ | ||
7560 | |||
7561 | /* Override any GCC internal prototype to avoid an error. | ||
7562 | @@ -4956,27 +6610,50 @@ for ac_lib in '' str; do | ||
7563 | ac_res=-l$ac_lib | ||
7564 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
7565 | fi | ||
7566 | - if ac_fn_c_try_link "$LINENO"; then : | ||
7567 | + rm -f conftest.$ac_objext conftest$ac_exeext | ||
7568 | +if { (ac_try="$ac_link" | ||
7569 | +case "(($ac_try" in | ||
7570 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7571 | + *) ac_try_echo=$ac_try;; | ||
7572 | +esac | ||
7573 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7574 | + (eval "$ac_link") 2>conftest.er1 | ||
7575 | + ac_status=$? | ||
7576 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7577 | + rm -f conftest.er1 | ||
7578 | + cat conftest.err >&5 | ||
7579 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7580 | + (exit $ac_status); } && { | ||
7581 | + test -z "$ac_c_werror_flag" || | ||
7582 | + test ! -s conftest.err | ||
7583 | + } && test -s conftest$ac_exeext && | ||
7584 | + $as_test_x conftest$ac_exeext; then | ||
7585 | ac_cv_search_putmsg=$ac_res | ||
7586 | +else | ||
7587 | + echo "$as_me: failed program was:" >&5 | ||
7588 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7589 | + | ||
7590 | + | ||
7591 | fi | ||
7592 | -rm -f core conftest.err conftest.$ac_objext \ | ||
7593 | - conftest$ac_exeext | ||
7594 | - if test "${ac_cv_search_putmsg+set}" = set; then : | ||
7595 | + | ||
7596 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7597 | + conftest$ac_exeext | ||
7598 | + if test "${ac_cv_search_putmsg+set}" = set; then | ||
7599 | break | ||
7600 | fi | ||
7601 | done | ||
7602 | -if test "${ac_cv_search_putmsg+set}" = set; then : | ||
7603 | - | ||
7604 | +if test "${ac_cv_search_putmsg+set}" = set; then | ||
7605 | + : | ||
7606 | else | ||
7607 | ac_cv_search_putmsg=no | ||
7608 | fi | ||
7609 | rm conftest.$ac_ext | ||
7610 | LIBS=$ac_func_search_save_LIBS | ||
7611 | fi | ||
7612 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_putmsg" >&5 | ||
7613 | -$as_echo "$ac_cv_search_putmsg" >&6; } | ||
7614 | +{ echo "$as_me:$LINENO: result: $ac_cv_search_putmsg" >&5 | ||
7615 | +echo "${ECHO_T}$ac_cv_search_putmsg" >&6; } | ||
7616 | ac_res=$ac_cv_search_putmsg | ||
7617 | -if test "$ac_res" != no; then : | ||
7618 | +if test "$ac_res" != no; then | ||
7619 | test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
7620 | |||
7621 | fi | ||
7622 | @@ -4994,12 +6671,95 @@ fi | ||
7623 | # | ||
7624 | # Before you is a C compiler. | ||
7625 | # | ||
7626 | + | ||
7627 | for ac_func in ether_hostton | ||
7628 | -do : | ||
7629 | - ac_fn_c_check_func "$LINENO" "ether_hostton" "ac_cv_func_ether_hostton" | ||
7630 | -if test "x$ac_cv_func_ether_hostton" = x""yes; then : | ||
7631 | +do | ||
7632 | +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
7633 | +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 | ||
7634 | +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | ||
7635 | +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | ||
7636 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7637 | +else | ||
7638 | + cat >conftest.$ac_ext <<_ACEOF | ||
7639 | +/* confdefs.h. */ | ||
7640 | +_ACEOF | ||
7641 | +cat confdefs.h >>conftest.$ac_ext | ||
7642 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7643 | +/* end confdefs.h. */ | ||
7644 | +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7645 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7646 | +#define $ac_func innocuous_$ac_func | ||
7647 | + | ||
7648 | +/* System header to define __stub macros and hopefully few prototypes, | ||
7649 | + which can conflict with char $ac_func (); below. | ||
7650 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
7651 | + <limits.h> exists even on freestanding compilers. */ | ||
7652 | + | ||
7653 | +#ifdef __STDC__ | ||
7654 | +# include <limits.h> | ||
7655 | +#else | ||
7656 | +# include <assert.h> | ||
7657 | +#endif | ||
7658 | + | ||
7659 | +#undef $ac_func | ||
7660 | + | ||
7661 | +/* Override any GCC internal prototype to avoid an error. | ||
7662 | + Use char because int might match the return type of a GCC | ||
7663 | + builtin and then its argument prototype would still apply. */ | ||
7664 | +#ifdef __cplusplus | ||
7665 | +extern "C" | ||
7666 | +#endif | ||
7667 | +char $ac_func (); | ||
7668 | +/* The GNU C library defines this for functions which it implements | ||
7669 | + to always fail with ENOSYS. Some functions are actually named | ||
7670 | + something starting with __ and the normal name is an alias. */ | ||
7671 | +#if defined __stub_$ac_func || defined __stub___$ac_func | ||
7672 | +choke me | ||
7673 | +#endif | ||
7674 | + | ||
7675 | +int | ||
7676 | +main () | ||
7677 | +{ | ||
7678 | +return $ac_func (); | ||
7679 | + ; | ||
7680 | + return 0; | ||
7681 | +} | ||
7682 | +_ACEOF | ||
7683 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
7684 | +if { (ac_try="$ac_link" | ||
7685 | +case "(($ac_try" in | ||
7686 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7687 | + *) ac_try_echo=$ac_try;; | ||
7688 | +esac | ||
7689 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7690 | + (eval "$ac_link") 2>conftest.er1 | ||
7691 | + ac_status=$? | ||
7692 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7693 | + rm -f conftest.er1 | ||
7694 | + cat conftest.err >&5 | ||
7695 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7696 | + (exit $ac_status); } && { | ||
7697 | + test -z "$ac_c_werror_flag" || | ||
7698 | + test ! -s conftest.err | ||
7699 | + } && test -s conftest$ac_exeext && | ||
7700 | + $as_test_x conftest$ac_exeext; then | ||
7701 | + eval "$as_ac_var=yes" | ||
7702 | +else | ||
7703 | + echo "$as_me: failed program was:" >&5 | ||
7704 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7705 | + | ||
7706 | + eval "$as_ac_var=no" | ||
7707 | +fi | ||
7708 | + | ||
7709 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
7710 | + conftest$ac_exeext conftest.$ac_ext | ||
7711 | +fi | ||
7712 | +ac_res=`eval echo '${'$as_ac_var'}'` | ||
7713 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
7714 | +echo "${ECHO_T}$ac_res" >&6; } | ||
7715 | +if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
7716 | cat >>confdefs.h <<_ACEOF | ||
7717 | -#define HAVE_ETHER_HOSTTON 1 | ||
7718 | +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||
7719 | _ACEOF | ||
7720 | |||
7721 | fi | ||
7722 | @@ -5013,7 +6773,18 @@ if test "$ac_cv_func_ether_hostton" = yes; then | ||
7723 | # | ||
7724 | # Yes. Does it declare ether_hostton()? | ||
7725 | # | ||
7726 | - ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" " | ||
7727 | + { echo "$as_me:$LINENO: checking whether ether_hostton is declared" >&5 | ||
7728 | +echo $ECHO_N "checking whether ether_hostton is declared... $ECHO_C" >&6; } | ||
7729 | +if test "${ac_cv_have_decl_ether_hostton+set}" = set; then | ||
7730 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7731 | +else | ||
7732 | + cat >conftest.$ac_ext <<_ACEOF | ||
7733 | +/* confdefs.h. */ | ||
7734 | +_ACEOF | ||
7735 | +cat confdefs.h >>conftest.$ac_ext | ||
7736 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7737 | +/* end confdefs.h. */ | ||
7738 | + | ||
7739 | #include <sys/types.h> | ||
7740 | #include <sys/socket.h> | ||
7741 | #include <netinet/in.h> | ||
7742 | @@ -5023,11 +6794,53 @@ struct rtentry; | ||
7743 | #include <net/if.h> | ||
7744 | #include <netinet/if_ether.h> | ||
7745 | |||
7746 | -" | ||
7747 | -if test "x$ac_cv_have_decl_ether_hostton" = x""yes; then : | ||
7748 | + | ||
7749 | +int | ||
7750 | +main () | ||
7751 | +{ | ||
7752 | +#ifndef ether_hostton | ||
7753 | + (void) ether_hostton; | ||
7754 | +#endif | ||
7755 | + | ||
7756 | + ; | ||
7757 | + return 0; | ||
7758 | +} | ||
7759 | +_ACEOF | ||
7760 | +rm -f conftest.$ac_objext | ||
7761 | +if { (ac_try="$ac_compile" | ||
7762 | +case "(($ac_try" in | ||
7763 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7764 | + *) ac_try_echo=$ac_try;; | ||
7765 | +esac | ||
7766 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7767 | + (eval "$ac_compile") 2>conftest.er1 | ||
7768 | + ac_status=$? | ||
7769 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7770 | + rm -f conftest.er1 | ||
7771 | + cat conftest.err >&5 | ||
7772 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7773 | + (exit $ac_status); } && { | ||
7774 | + test -z "$ac_c_werror_flag" || | ||
7775 | + test ! -s conftest.err | ||
7776 | + } && test -s conftest.$ac_objext; then | ||
7777 | + ac_cv_have_decl_ether_hostton=yes | ||
7778 | +else | ||
7779 | + echo "$as_me: failed program was:" >&5 | ||
7780 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7781 | + | ||
7782 | + ac_cv_have_decl_ether_hostton=no | ||
7783 | +fi | ||
7784 | + | ||
7785 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7786 | +fi | ||
7787 | +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_ether_hostton" >&5 | ||
7788 | +echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6; } | ||
7789 | +if test $ac_cv_have_decl_ether_hostton = yes; then | ||
7790 | |||
7791 | |||
7792 | -$as_echo "#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h | ||
7793 | +cat >>confdefs.h <<\_ACEOF | ||
7794 | +#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON | ||
7795 | +_ACEOF | ||
7796 | |||
7797 | |||
7798 | fi | ||
7799 | @@ -5040,34 +6853,215 @@ fi | ||
7800 | # | ||
7801 | # No, how about <netinet/ether.h>, as on Linux? | ||
7802 | # | ||
7803 | - for ac_header in netinet/ether.h | ||
7804 | -do : | ||
7805 | - ac_fn_c_check_header_mongrel "$LINENO" "netinet/ether.h" "ac_cv_header_netinet_ether_h" "$ac_includes_default" | ||
7806 | -if test "x$ac_cv_header_netinet_ether_h" = x""yes; then : | ||
7807 | + | ||
7808 | +for ac_header in netinet/ether.h | ||
7809 | +do | ||
7810 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
7811 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
7812 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
7813 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
7814 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
7815 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7816 | +fi | ||
7817 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
7818 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
7819 | +echo "${ECHO_T}$ac_res" >&6; } | ||
7820 | +else | ||
7821 | + # Is the header compilable? | ||
7822 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
7823 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
7824 | +cat >conftest.$ac_ext <<_ACEOF | ||
7825 | +/* confdefs.h. */ | ||
7826 | +_ACEOF | ||
7827 | +cat confdefs.h >>conftest.$ac_ext | ||
7828 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7829 | +/* end confdefs.h. */ | ||
7830 | +$ac_includes_default | ||
7831 | +#include <$ac_header> | ||
7832 | +_ACEOF | ||
7833 | +rm -f conftest.$ac_objext | ||
7834 | +if { (ac_try="$ac_compile" | ||
7835 | +case "(($ac_try" in | ||
7836 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7837 | + *) ac_try_echo=$ac_try;; | ||
7838 | +esac | ||
7839 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7840 | + (eval "$ac_compile") 2>conftest.er1 | ||
7841 | + ac_status=$? | ||
7842 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7843 | + rm -f conftest.er1 | ||
7844 | + cat conftest.err >&5 | ||
7845 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7846 | + (exit $ac_status); } && { | ||
7847 | + test -z "$ac_c_werror_flag" || | ||
7848 | + test ! -s conftest.err | ||
7849 | + } && test -s conftest.$ac_objext; then | ||
7850 | + ac_header_compiler=yes | ||
7851 | +else | ||
7852 | + echo "$as_me: failed program was:" >&5 | ||
7853 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7854 | + | ||
7855 | + ac_header_compiler=no | ||
7856 | +fi | ||
7857 | + | ||
7858 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7859 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
7860 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
7861 | + | ||
7862 | +# Is the header present? | ||
7863 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
7864 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
7865 | +cat >conftest.$ac_ext <<_ACEOF | ||
7866 | +/* confdefs.h. */ | ||
7867 | +_ACEOF | ||
7868 | +cat confdefs.h >>conftest.$ac_ext | ||
7869 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7870 | +/* end confdefs.h. */ | ||
7871 | +#include <$ac_header> | ||
7872 | +_ACEOF | ||
7873 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
7874 | +case "(($ac_try" in | ||
7875 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7876 | + *) ac_try_echo=$ac_try;; | ||
7877 | +esac | ||
7878 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7879 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
7880 | + ac_status=$? | ||
7881 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7882 | + rm -f conftest.er1 | ||
7883 | + cat conftest.err >&5 | ||
7884 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7885 | + (exit $ac_status); } >/dev/null && { | ||
7886 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
7887 | + test ! -s conftest.err | ||
7888 | + }; then | ||
7889 | + ac_header_preproc=yes | ||
7890 | +else | ||
7891 | + echo "$as_me: failed program was:" >&5 | ||
7892 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
7893 | + | ||
7894 | + ac_header_preproc=no | ||
7895 | +fi | ||
7896 | + | ||
7897 | +rm -f conftest.err conftest.$ac_ext | ||
7898 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
7899 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
7900 | + | ||
7901 | +# So? What about this header? | ||
7902 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
7903 | + yes:no: ) | ||
7904 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
7905 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
7906 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
7907 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
7908 | + ac_header_preproc=yes | ||
7909 | + ;; | ||
7910 | + no:yes:* ) | ||
7911 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
7912 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
7913 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
7914 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
7915 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
7916 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
7917 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
7918 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
7919 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
7920 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
7921 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
7922 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
7923 | + | ||
7924 | + ;; | ||
7925 | +esac | ||
7926 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
7927 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
7928 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
7929 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7930 | +else | ||
7931 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
7932 | +fi | ||
7933 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
7934 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
7935 | +echo "${ECHO_T}$ac_res" >&6; } | ||
7936 | + | ||
7937 | +fi | ||
7938 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
7939 | cat >>confdefs.h <<_ACEOF | ||
7940 | -#define HAVE_NETINET_ETHER_H 1 | ||
7941 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
7942 | +_ACEOF | ||
7943 | + | ||
7944 | +fi | ||
7945 | + | ||
7946 | +done | ||
7947 | + | ||
7948 | + if test "$ac_cv_header_netinet_ether_h" = yes; then | ||
7949 | + # | ||
7950 | + # We have it - does it declare ether_hostton()? | ||
7951 | + # Unset ac_cv_have_decl_ether_hostton so we don't | ||
7952 | + # treat the previous failure as a cached value and | ||
7953 | + # suppress the next test. | ||
7954 | + # | ||
7955 | + unset ac_cv_have_decl_ether_hostton | ||
7956 | + { echo "$as_me:$LINENO: checking whether ether_hostton is declared" >&5 | ||
7957 | +echo $ECHO_N "checking whether ether_hostton is declared... $ECHO_C" >&6; } | ||
7958 | +if test "${ac_cv_have_decl_ether_hostton+set}" = set; then | ||
7959 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7960 | +else | ||
7961 | + cat >conftest.$ac_ext <<_ACEOF | ||
7962 | +/* confdefs.h. */ | ||
7963 | +_ACEOF | ||
7964 | +cat confdefs.h >>conftest.$ac_ext | ||
7965 | +cat >>conftest.$ac_ext <<_ACEOF | ||
7966 | +/* end confdefs.h. */ | ||
7967 | + | ||
7968 | +#include <netinet/ether.h> | ||
7969 | + | ||
7970 | + | ||
7971 | +int | ||
7972 | +main () | ||
7973 | +{ | ||
7974 | +#ifndef ether_hostton | ||
7975 | + (void) ether_hostton; | ||
7976 | +#endif | ||
7977 | + | ||
7978 | + ; | ||
7979 | + return 0; | ||
7980 | +} | ||
7981 | _ACEOF | ||
7982 | +rm -f conftest.$ac_objext | ||
7983 | +if { (ac_try="$ac_compile" | ||
7984 | +case "(($ac_try" in | ||
7985 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7986 | + *) ac_try_echo=$ac_try;; | ||
7987 | +esac | ||
7988 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7989 | + (eval "$ac_compile") 2>conftest.er1 | ||
7990 | + ac_status=$? | ||
7991 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
7992 | + rm -f conftest.er1 | ||
7993 | + cat conftest.err >&5 | ||
7994 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7995 | + (exit $ac_status); } && { | ||
7996 | + test -z "$ac_c_werror_flag" || | ||
7997 | + test ! -s conftest.err | ||
7998 | + } && test -s conftest.$ac_objext; then | ||
7999 | + ac_cv_have_decl_ether_hostton=yes | ||
8000 | +else | ||
8001 | + echo "$as_me: failed program was:" >&5 | ||
8002 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8003 | |||
8004 | + ac_cv_have_decl_ether_hostton=no | ||
8005 | fi | ||
8006 | |||
8007 | -done | ||
8008 | - | ||
8009 | - if test "$ac_cv_header_netinet_ether_h" = yes; then | ||
8010 | - # | ||
8011 | - # We have it - does it declare ether_hostton()? | ||
8012 | - # Unset ac_cv_have_decl_ether_hostton so we don't | ||
8013 | - # treat the previous failure as a cached value and | ||
8014 | - # suppress the next test. | ||
8015 | - # | ||
8016 | - unset ac_cv_have_decl_ether_hostton | ||
8017 | - ac_fn_c_check_decl "$LINENO" "ether_hostton" "ac_cv_have_decl_ether_hostton" " | ||
8018 | -#include <netinet/ether.h> | ||
8019 | - | ||
8020 | -" | ||
8021 | -if test "x$ac_cv_have_decl_ether_hostton" = x""yes; then : | ||
8022 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8023 | +fi | ||
8024 | +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_ether_hostton" >&5 | ||
8025 | +echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6; } | ||
8026 | +if test $ac_cv_have_decl_ether_hostton = yes; then | ||
8027 | |||
8028 | |||
8029 | -$as_echo "#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON /**/" >>confdefs.h | ||
8030 | +cat >>confdefs.h <<\_ACEOF | ||
8031 | +#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON | ||
8032 | +_ACEOF | ||
8033 | |||
8034 | |||
8035 | fi | ||
8036 | @@ -5082,7 +7076,18 @@ fi | ||
8037 | # No, we'll have to declare it ourselves. | ||
8038 | # Do we have "struct ether_addr"? | ||
8039 | # | ||
8040 | - ac_fn_c_check_type "$LINENO" "struct ether_addr" "ac_cv_type_struct_ether_addr" " | ||
8041 | + { echo "$as_me:$LINENO: checking for struct ether_addr" >&5 | ||
8042 | +echo $ECHO_N "checking for struct ether_addr... $ECHO_C" >&6; } | ||
8043 | +if test "${ac_cv_type_struct_ether_addr+set}" = set; then | ||
8044 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8045 | +else | ||
8046 | + cat >conftest.$ac_ext <<_ACEOF | ||
8047 | +/* confdefs.h. */ | ||
8048 | +_ACEOF | ||
8049 | +cat confdefs.h >>conftest.$ac_ext | ||
8050 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8051 | +/* end confdefs.h. */ | ||
8052 | + | ||
8053 | #include <sys/types.h> | ||
8054 | #include <sys/socket.h> | ||
8055 | #include <netinet/in.h> | ||
8056 | @@ -5092,8 +7097,49 @@ struct rtentry; | ||
8057 | #include <net/if.h> | ||
8058 | #include <netinet/if_ether.h> | ||
8059 | |||
8060 | -" | ||
8061 | -if test "x$ac_cv_type_struct_ether_addr" = x""yes; then : | ||
8062 | + | ||
8063 | +typedef struct ether_addr ac__type_new_; | ||
8064 | +int | ||
8065 | +main () | ||
8066 | +{ | ||
8067 | +if ((ac__type_new_ *) 0) | ||
8068 | + return 0; | ||
8069 | +if (sizeof (ac__type_new_)) | ||
8070 | + return 0; | ||
8071 | + ; | ||
8072 | + return 0; | ||
8073 | +} | ||
8074 | +_ACEOF | ||
8075 | +rm -f conftest.$ac_objext | ||
8076 | +if { (ac_try="$ac_compile" | ||
8077 | +case "(($ac_try" in | ||
8078 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8079 | + *) ac_try_echo=$ac_try;; | ||
8080 | +esac | ||
8081 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8082 | + (eval "$ac_compile") 2>conftest.er1 | ||
8083 | + ac_status=$? | ||
8084 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8085 | + rm -f conftest.er1 | ||
8086 | + cat conftest.err >&5 | ||
8087 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8088 | + (exit $ac_status); } && { | ||
8089 | + test -z "$ac_c_werror_flag" || | ||
8090 | + test ! -s conftest.err | ||
8091 | + } && test -s conftest.$ac_objext; then | ||
8092 | + ac_cv_type_struct_ether_addr=yes | ||
8093 | +else | ||
8094 | + echo "$as_me: failed program was:" >&5 | ||
8095 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8096 | + | ||
8097 | + ac_cv_type_struct_ether_addr=no | ||
8098 | +fi | ||
8099 | + | ||
8100 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8101 | +fi | ||
8102 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_ether_addr" >&5 | ||
8103 | +echo "${ECHO_T}$ac_cv_type_struct_ether_addr" >&6; } | ||
8104 | +if test $ac_cv_type_struct_ether_addr = yes; then | ||
8105 | |||
8106 | cat >>confdefs.h <<_ACEOF | ||
8107 | #define HAVE_STRUCT_ETHER_ADDR 1 | ||
8108 | @@ -5103,19 +7149,23 @@ _ACEOF | ||
8109 | fi | ||
8110 | |||
8111 | |||
8112 | -$as_echo "#define HAVE_DECL_ETHER_HOSTTON 0" >>confdefs.h | ||
8113 | +cat >>confdefs.h <<\_ACEOF | ||
8114 | +#define HAVE_DECL_ETHER_HOSTTON 0 | ||
8115 | +_ACEOF | ||
8116 | |||
8117 | else | ||
8118 | |||
8119 | -$as_echo "#define HAVE_DECL_ETHER_HOSTTON 1" >>confdefs.h | ||
8120 | +cat >>confdefs.h <<\_ACEOF | ||
8121 | +#define HAVE_DECL_ETHER_HOSTTON 1 | ||
8122 | +_ACEOF | ||
8123 | |||
8124 | fi | ||
8125 | fi | ||
8126 | |||
8127 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --disable-protochain option is specified" >&5 | ||
8128 | -$as_echo_n "checking if --disable-protochain option is specified... " >&6; } | ||
8129 | +{ echo "$as_me:$LINENO: checking if --disable-protochain option is specified" >&5 | ||
8130 | +echo $ECHO_N "checking if --disable-protochain option is specified... $ECHO_C" >&6; } | ||
8131 | # Check whether --enable-protochain was given. | ||
8132 | -if test "${enable_protochain+set}" = set; then : | ||
8133 | +if test "${enable_protochain+set}" = set; then | ||
8134 | enableval=$enable_protochain; | ||
8135 | fi | ||
8136 | |||
8137 | @@ -5127,11 +7177,13 @@ esac | ||
8138 | |||
8139 | if test "$enable_protochain" = "disabled"; then | ||
8140 | |||
8141 | -$as_echo "#define NO_PROTOCHAIN 1" >>confdefs.h | ||
8142 | +cat >>confdefs.h <<\_ACEOF | ||
8143 | +#define NO_PROTOCHAIN 1 | ||
8144 | +_ACEOF | ||
8145 | |||
8146 | fi | ||
8147 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_protochain}" >&5 | ||
8148 | -$as_echo "${enable_protochain}" >&6; } | ||
8149 | +{ echo "$as_me:$LINENO: result: ${enable_protochain}" >&5 | ||
8150 | +echo "${ECHO_T}${enable_protochain}" >&6; } | ||
8151 | |||
8152 | # | ||
8153 | # SITA support is mutually exclusive with native capture support; | ||
8154 | @@ -5139,14 +7191,16 @@ $as_echo "${enable_protochain}" >&6; } | ||
8155 | # | ||
8156 | |||
8157 | # Check whether --with-sita was given. | ||
8158 | -if test "${with_sita+set}" = set; then : | ||
8159 | +if test "${with_sita+set}" = set; then | ||
8160 | withval=$with_sita; | ||
8161 | if test ! "x$withval" = "xno" ; then | ||
8162 | |||
8163 | -$as_echo "#define SITA 1" >>confdefs.h | ||
8164 | +cat >>confdefs.h <<\_ACEOF | ||
8165 | +#define SITA 1 | ||
8166 | +_ACEOF | ||
8167 | |||
8168 | - { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling SITA ACN support" >&5 | ||
8169 | -$as_echo "$as_me: Enabling SITA ACN support" >&6;} | ||
8170 | + { echo "$as_me:$LINENO: Enabling SITA ACN support" >&5 | ||
8171 | +echo "$as_me: Enabling SITA ACN support" >&6;} | ||
8172 | V_PCAP=sita | ||
8173 | V_FINDALLDEVS=sita | ||
8174 | fi | ||
8175 | @@ -5154,16 +7208,18 @@ $as_echo "$as_me: Enabling SITA ACN support" >&6;} | ||
8176 | else | ||
8177 | |||
8178 | if test -z "$with_pcap" && test "$cross_compiling" = yes; then | ||
8179 | - as_fn_error $? "pcap type not determined when cross-compiling; use --with-pcap=..." "$LINENO" 5 | ||
8180 | + { { echo "$as_me:$LINENO: error: pcap type not determined when cross-compiling; use --with-pcap=..." >&5 | ||
8181 | +echo "$as_me: error: pcap type not determined when cross-compiling; use --with-pcap=..." >&2;} | ||
8182 | + { (exit 1); exit 1; }; } | ||
8183 | fi | ||
8184 | |||
8185 | # Check whether --with-pcap was given. | ||
8186 | -if test "${with_pcap+set}" = set; then : | ||
8187 | +if test "${with_pcap+set}" = set; then | ||
8188 | withval=$with_pcap; | ||
8189 | fi | ||
8190 | |||
8191 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking packet capture type" >&5 | ||
8192 | -$as_echo_n "checking packet capture type... " >&6; } | ||
8193 | +{ echo "$as_me:$LINENO: checking packet capture type" >&5 | ||
8194 | +echo $ECHO_N "checking packet capture type... $ECHO_C" >&6; } | ||
8195 | if test ! -z "$with_pcap" ; then | ||
8196 | V_PCAP="$withval" | ||
8197 | elif test -r /dev/bpf -o -h /dev/bpf ; then | ||
8198 | @@ -5172,7 +7228,9 @@ elif test -r /dev/bpf -o -h /dev/bpf ; then | ||
8199 | # | ||
8200 | V_PCAP=bpf | ||
8201 | |||
8202 | -$as_echo "#define HAVE_CLONING_BPF 1" >>confdefs.h | ||
8203 | +cat >>confdefs.h <<\_ACEOF | ||
8204 | +#define HAVE_CLONING_BPF 1 | ||
8205 | +_ACEOF | ||
8206 | |||
8207 | elif test -r /dev/bpf0 ; then | ||
8208 | V_PCAP=bpf | ||
8209 | @@ -5206,8 +7264,8 @@ elif test -c /dev/nit ; then # check again in case not readable | ||
8210 | else | ||
8211 | V_PCAP=null | ||
8212 | fi | ||
8213 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_PCAP" >&5 | ||
8214 | -$as_echo "$V_PCAP" >&6; } | ||
8215 | +{ echo "$as_me:$LINENO: result: $V_PCAP" >&5 | ||
8216 | +echo "${ECHO_T}$V_PCAP" >&6; } | ||
8217 | |||
8218 | # | ||
8219 | # Do capture-mechanism-dependent tests. | ||
8220 | @@ -5227,14 +7285,18 @@ dlpi) | ||
8221 | # | ||
8222 | saved_ldflags=$LDFLAGS | ||
8223 | LDFLAGS="$LIBS -L/lib" | ||
8224 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlpi_walk in -ldlpi" >&5 | ||
8225 | -$as_echo_n "checking for dlpi_walk in -ldlpi... " >&6; } | ||
8226 | -if test "${ac_cv_lib_dlpi_dlpi_walk+set}" = set; then : | ||
8227 | - $as_echo_n "(cached) " >&6 | ||
8228 | + { echo "$as_me:$LINENO: checking for dlpi_walk in -ldlpi" >&5 | ||
8229 | +echo $ECHO_N "checking for dlpi_walk in -ldlpi... $ECHO_C" >&6; } | ||
8230 | +if test "${ac_cv_lib_dlpi_dlpi_walk+set}" = set; then | ||
8231 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8232 | else | ||
8233 | ac_check_lib_save_LIBS=$LIBS | ||
8234 | LIBS="-ldlpi $LIBS" | ||
8235 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8236 | +cat >conftest.$ac_ext <<_ACEOF | ||
8237 | +/* confdefs.h. */ | ||
8238 | +_ACEOF | ||
8239 | +cat confdefs.h >>conftest.$ac_ext | ||
8240 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8241 | /* end confdefs.h. */ | ||
8242 | |||
8243 | /* Override any GCC internal prototype to avoid an error. | ||
8244 | @@ -5252,22 +7314,45 @@ return dlpi_walk (); | ||
8245 | return 0; | ||
8246 | } | ||
8247 | _ACEOF | ||
8248 | -if ac_fn_c_try_link "$LINENO"; then : | ||
8249 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
8250 | +if { (ac_try="$ac_link" | ||
8251 | +case "(($ac_try" in | ||
8252 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8253 | + *) ac_try_echo=$ac_try;; | ||
8254 | +esac | ||
8255 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8256 | + (eval "$ac_link") 2>conftest.er1 | ||
8257 | + ac_status=$? | ||
8258 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8259 | + rm -f conftest.er1 | ||
8260 | + cat conftest.err >&5 | ||
8261 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8262 | + (exit $ac_status); } && { | ||
8263 | + test -z "$ac_c_werror_flag" || | ||
8264 | + test ! -s conftest.err | ||
8265 | + } && test -s conftest$ac_exeext && | ||
8266 | + $as_test_x conftest$ac_exeext; then | ||
8267 | ac_cv_lib_dlpi_dlpi_walk=yes | ||
8268 | else | ||
8269 | - ac_cv_lib_dlpi_dlpi_walk=no | ||
8270 | + echo "$as_me: failed program was:" >&5 | ||
8271 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8272 | + | ||
8273 | + ac_cv_lib_dlpi_dlpi_walk=no | ||
8274 | fi | ||
8275 | -rm -f core conftest.err conftest.$ac_objext \ | ||
8276 | - conftest$ac_exeext conftest.$ac_ext | ||
8277 | + | ||
8278 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
8279 | + conftest$ac_exeext conftest.$ac_ext | ||
8280 | LIBS=$ac_check_lib_save_LIBS | ||
8281 | fi | ||
8282 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dlpi_dlpi_walk" >&5 | ||
8283 | -$as_echo "$ac_cv_lib_dlpi_dlpi_walk" >&6; } | ||
8284 | -if test "x$ac_cv_lib_dlpi_dlpi_walk" = x""yes; then : | ||
8285 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dlpi_dlpi_walk" >&5 | ||
8286 | +echo "${ECHO_T}$ac_cv_lib_dlpi_dlpi_walk" >&6; } | ||
8287 | +if test $ac_cv_lib_dlpi_dlpi_walk = yes; then | ||
8288 | LIBS="-ldlpi $LIBS" | ||
8289 | V_PCAP=libdlpi | ||
8290 | |||
8291 | -$as_echo "#define HAVE_LIBDLPI 1" >>confdefs.h | ||
8292 | +cat >>confdefs.h <<\_ACEOF | ||
8293 | +#define HAVE_LIBDLPI 1 | ||
8294 | +_ACEOF | ||
8295 | |||
8296 | else | ||
8297 | V_PCAP=dlpi | ||
8298 | @@ -5279,12 +7364,16 @@ fi | ||
8299 | # Checks whether <sys/dlpi.h> is usable, to catch weird SCO | ||
8300 | # versions of DLPI. | ||
8301 | # | ||
8302 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/dlpi.h> is usable" >&5 | ||
8303 | -$as_echo_n "checking whether <sys/dlpi.h> is usable... " >&6; } | ||
8304 | - if test "${ac_cv_sys_dlpi_usable+set}" = set; then : | ||
8305 | - $as_echo_n "(cached) " >&6 | ||
8306 | + { echo "$as_me:$LINENO: checking whether <sys/dlpi.h> is usable" >&5 | ||
8307 | +echo $ECHO_N "checking whether <sys/dlpi.h> is usable... $ECHO_C" >&6; } | ||
8308 | + if test "${ac_cv_sys_dlpi_usable+set}" = set; then | ||
8309 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8310 | else | ||
8311 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8312 | + cat >conftest.$ac_ext <<_ACEOF | ||
8313 | +/* confdefs.h. */ | ||
8314 | +_ACEOF | ||
8315 | +cat confdefs.h >>conftest.$ac_ext | ||
8316 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8317 | /* end confdefs.h. */ | ||
8318 | |||
8319 | #include <sys/types.h> | ||
8320 | @@ -5299,48 +7388,72 @@ int i = DL_PROMISC_PHYS; | ||
8321 | return 0; | ||
8322 | } | ||
8323 | _ACEOF | ||
8324 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
8325 | +rm -f conftest.$ac_objext | ||
8326 | +if { (ac_try="$ac_compile" | ||
8327 | +case "(($ac_try" in | ||
8328 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8329 | + *) ac_try_echo=$ac_try;; | ||
8330 | +esac | ||
8331 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8332 | + (eval "$ac_compile") 2>conftest.er1 | ||
8333 | + ac_status=$? | ||
8334 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8335 | + rm -f conftest.er1 | ||
8336 | + cat conftest.err >&5 | ||
8337 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8338 | + (exit $ac_status); } && { | ||
8339 | + test -z "$ac_c_werror_flag" || | ||
8340 | + test ! -s conftest.err | ||
8341 | + } && test -s conftest.$ac_objext; then | ||
8342 | ac_cv_sys_dlpi_usable=yes | ||
8343 | else | ||
8344 | - ac_cv_sys_dlpi_usable=no | ||
8345 | + echo "$as_me: failed program was:" >&5 | ||
8346 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8347 | + | ||
8348 | + ac_cv_sys_dlpi_usable=no | ||
8349 | fi | ||
8350 | + | ||
8351 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8352 | fi | ||
8353 | |||
8354 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_dlpi_usable" >&5 | ||
8355 | -$as_echo "$ac_cv_sys_dlpi_usable" >&6; } | ||
8356 | + { echo "$as_me:$LINENO: result: $ac_cv_sys_dlpi_usable" >&5 | ||
8357 | +echo "${ECHO_T}$ac_cv_sys_dlpi_usable" >&6; } | ||
8358 | if test $ac_cv_sys_dlpi_usable = no ; then | ||
8359 | - as_fn_error $? "<sys/dlpi.h> is not usable on this system; it probably has a non-standard DLPI" "$LINENO" 5 | ||
8360 | + { { echo "$as_me:$LINENO: error: <sys/dlpi.h> is not usable on this system; it probably has a non-standard DLPI" >&5 | ||
8361 | +echo "$as_me: error: <sys/dlpi.h> is not usable on this system; it probably has a non-standard DLPI" >&2;} | ||
8362 | + { (exit 1); exit 1; }; } | ||
8363 | fi | ||
8364 | |||
8365 | # | ||
8366 | # Check whether we have a /dev/dlpi device or have multiple devices. | ||
8367 | # | ||
8368 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/dlpi device" >&5 | ||
8369 | -$as_echo_n "checking for /dev/dlpi device... " >&6; } | ||
8370 | + { echo "$as_me:$LINENO: checking for /dev/dlpi device" >&5 | ||
8371 | +echo $ECHO_N "checking for /dev/dlpi device... $ECHO_C" >&6; } | ||
8372 | if test -c /dev/dlpi ; then | ||
8373 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
8374 | -$as_echo "yes" >&6; } | ||
8375 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
8376 | +echo "${ECHO_T}yes" >&6; } | ||
8377 | |||
8378 | -$as_echo "#define HAVE_DEV_DLPI 1" >>confdefs.h | ||
8379 | +cat >>confdefs.h <<\_ACEOF | ||
8380 | +#define HAVE_DEV_DLPI 1 | ||
8381 | +_ACEOF | ||
8382 | |||
8383 | else | ||
8384 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8385 | -$as_echo "no" >&6; } | ||
8386 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
8387 | +echo "${ECHO_T}no" >&6; } | ||
8388 | dir="/dev/dlpi" | ||
8389 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir directory" >&5 | ||
8390 | -$as_echo_n "checking for $dir directory... " >&6; } | ||
8391 | + { echo "$as_me:$LINENO: checking for $dir directory" >&5 | ||
8392 | +echo $ECHO_N "checking for $dir directory... $ECHO_C" >&6; } | ||
8393 | if test -d $dir ; then | ||
8394 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
8395 | -$as_echo "yes" >&6; } | ||
8396 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
8397 | +echo "${ECHO_T}yes" >&6; } | ||
8398 | |||
8399 | cat >>confdefs.h <<_ACEOF | ||
8400 | #define PCAP_DEV_PREFIX "$dir" | ||
8401 | _ACEOF | ||
8402 | |||
8403 | else | ||
8404 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
8405 | -$as_echo "no" >&6; } | ||
8406 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
8407 | +echo "${ECHO_T}no" >&6; } | ||
8408 | fi | ||
8409 | fi | ||
8410 | |||
8411 | @@ -5348,12 +7461,16 @@ $as_echo "no" >&6; } | ||
8412 | # This check is for Solaris with DLPI support for passive modes. | ||
8413 | # See dlpi(7P) for more details. | ||
8414 | # | ||
8415 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dl_passive_req_t struct exists" >&5 | ||
8416 | -$as_echo_n "checking if dl_passive_req_t struct exists... " >&6; } | ||
8417 | - if test "${ac_cv_lbl_has_dl_passive_req_t+set}" = set; then : | ||
8418 | - $as_echo_n "(cached) " >&6 | ||
8419 | + { echo "$as_me:$LINENO: checking if dl_passive_req_t struct exists" >&5 | ||
8420 | +echo $ECHO_N "checking if dl_passive_req_t struct exists... $ECHO_C" >&6; } | ||
8421 | + if test "${ac_cv_lbl_has_dl_passive_req_t+set}" = set; then | ||
8422 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8423 | else | ||
8424 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8425 | + cat >conftest.$ac_ext <<_ACEOF | ||
8426 | +/* confdefs.h. */ | ||
8427 | +_ACEOF | ||
8428 | +cat confdefs.h >>conftest.$ac_ext | ||
8429 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8430 | /* end confdefs.h. */ | ||
8431 | |||
8432 | # include <sys/types.h> | ||
8433 | @@ -5366,19 +7483,41 @@ u_int i = sizeof(dl_passive_req_t) | ||
8434 | return 0; | ||
8435 | } | ||
8436 | _ACEOF | ||
8437 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
8438 | +rm -f conftest.$ac_objext | ||
8439 | +if { (ac_try="$ac_compile" | ||
8440 | +case "(($ac_try" in | ||
8441 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8442 | + *) ac_try_echo=$ac_try;; | ||
8443 | +esac | ||
8444 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8445 | + (eval "$ac_compile") 2>conftest.er1 | ||
8446 | + ac_status=$? | ||
8447 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8448 | + rm -f conftest.er1 | ||
8449 | + cat conftest.err >&5 | ||
8450 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8451 | + (exit $ac_status); } && { | ||
8452 | + test -z "$ac_c_werror_flag" || | ||
8453 | + test ! -s conftest.err | ||
8454 | + } && test -s conftest.$ac_objext; then | ||
8455 | ac_cv_lbl_has_dl_passive_req_t=yes | ||
8456 | else | ||
8457 | - ac_cv_lbl_has_dl_passive_req_t=no | ||
8458 | + echo "$as_me: failed program was:" >&5 | ||
8459 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8460 | + | ||
8461 | + ac_cv_lbl_has_dl_passive_req_t=no | ||
8462 | fi | ||
8463 | + | ||
8464 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8465 | fi | ||
8466 | |||
8467 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_has_dl_passive_req_t" >&5 | ||
8468 | -$as_echo "$ac_cv_lbl_has_dl_passive_req_t" >&6; } | ||
8469 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_has_dl_passive_req_t" >&5 | ||
8470 | +echo "${ECHO_T}$ac_cv_lbl_has_dl_passive_req_t" >&6; } | ||
8471 | if test $ac_cv_lbl_has_dl_passive_req_t = yes ; then | ||
8472 | |||
8473 | -$as_echo "#define HAVE_DLPI_PASSIVE 1" >>confdefs.h | ||
8474 | +cat >>confdefs.h <<\_ACEOF | ||
8475 | +#define HAVE_DLPI_PASSIVE 1 | ||
8476 | +_ACEOF | ||
8477 | |||
8478 | fi | ||
8479 | ;; | ||
8480 | @@ -5387,17 +7526,62 @@ linux) | ||
8481 | # | ||
8482 | # Do we have the wireless extensions? | ||
8483 | # | ||
8484 | - for ac_header in linux/wireless.h | ||
8485 | -do : | ||
8486 | - ac_fn_c_check_header_compile "$LINENO" "linux/wireless.h" "ac_cv_header_linux_wireless_h" " | ||
8487 | + | ||
8488 | +for ac_header in linux/wireless.h | ||
8489 | +do | ||
8490 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8491 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
8492 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
8493 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
8494 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8495 | +else | ||
8496 | + cat >conftest.$ac_ext <<_ACEOF | ||
8497 | +/* confdefs.h. */ | ||
8498 | +_ACEOF | ||
8499 | +cat confdefs.h >>conftest.$ac_ext | ||
8500 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8501 | +/* end confdefs.h. */ | ||
8502 | + | ||
8503 | #include <sys/socket.h> | ||
8504 | #include <linux/if.h> | ||
8505 | #include <linux/types.h> | ||
8506 | |||
8507 | -" | ||
8508 | -if test "x$ac_cv_header_linux_wireless_h" = x""yes; then : | ||
8509 | + | ||
8510 | +#include <$ac_header> | ||
8511 | +_ACEOF | ||
8512 | +rm -f conftest.$ac_objext | ||
8513 | +if { (ac_try="$ac_compile" | ||
8514 | +case "(($ac_try" in | ||
8515 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8516 | + *) ac_try_echo=$ac_try;; | ||
8517 | +esac | ||
8518 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8519 | + (eval "$ac_compile") 2>conftest.er1 | ||
8520 | + ac_status=$? | ||
8521 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8522 | + rm -f conftest.er1 | ||
8523 | + cat conftest.err >&5 | ||
8524 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8525 | + (exit $ac_status); } && { | ||
8526 | + test -z "$ac_c_werror_flag" || | ||
8527 | + test ! -s conftest.err | ||
8528 | + } && test -s conftest.$ac_objext; then | ||
8529 | + eval "$as_ac_Header=yes" | ||
8530 | +else | ||
8531 | + echo "$as_me: failed program was:" >&5 | ||
8532 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8533 | + | ||
8534 | + eval "$as_ac_Header=no" | ||
8535 | +fi | ||
8536 | + | ||
8537 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8538 | +fi | ||
8539 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
8540 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
8541 | +echo "${ECHO_T}$ac_res" >&6; } | ||
8542 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
8543 | cat >>confdefs.h <<_ACEOF | ||
8544 | -#define HAVE_LINUX_WIRELESS_H 1 | ||
8545 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
8546 | _ACEOF | ||
8547 | |||
8548 | fi | ||
8549 | @@ -5410,7 +7594,7 @@ done | ||
8550 | # | ||
8551 | |||
8552 | # Check whether --with-libnl was given. | ||
8553 | -if test "${with_libnl+set}" = set; then : | ||
8554 | +if test "${with_libnl+set}" = set; then | ||
8555 | withval=$with_libnl; with_libnl=$withval | ||
8556 | fi | ||
8557 | |||
8558 | @@ -5419,14 +7603,18 @@ fi | ||
8559 | # | ||
8560 | # Try libnl 2.x first. | ||
8561 | # | ||
8562 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_socket_alloc in -lnl" >&5 | ||
8563 | -$as_echo_n "checking for nl_socket_alloc in -lnl... " >&6; } | ||
8564 | -if test "${ac_cv_lib_nl_nl_socket_alloc+set}" = set; then : | ||
8565 | - $as_echo_n "(cached) " >&6 | ||
8566 | + { echo "$as_me:$LINENO: checking for nl_socket_alloc in -lnl" >&5 | ||
8567 | +echo $ECHO_N "checking for nl_socket_alloc in -lnl... $ECHO_C" >&6; } | ||
8568 | +if test "${ac_cv_lib_nl_nl_socket_alloc+set}" = set; then | ||
8569 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8570 | else | ||
8571 | ac_check_lib_save_LIBS=$LIBS | ||
8572 | LIBS="-lnl $LIBS" | ||
8573 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8574 | +cat >conftest.$ac_ext <<_ACEOF | ||
8575 | +/* confdefs.h. */ | ||
8576 | +_ACEOF | ||
8577 | +cat confdefs.h >>conftest.$ac_ext | ||
8578 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8579 | /* end confdefs.h. */ | ||
8580 | |||
8581 | /* Override any GCC internal prototype to avoid an error. | ||
8582 | @@ -5444,28 +7632,53 @@ return nl_socket_alloc (); | ||
8583 | return 0; | ||
8584 | } | ||
8585 | _ACEOF | ||
8586 | -if ac_fn_c_try_link "$LINENO"; then : | ||
8587 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
8588 | +if { (ac_try="$ac_link" | ||
8589 | +case "(($ac_try" in | ||
8590 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8591 | + *) ac_try_echo=$ac_try;; | ||
8592 | +esac | ||
8593 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8594 | + (eval "$ac_link") 2>conftest.er1 | ||
8595 | + ac_status=$? | ||
8596 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8597 | + rm -f conftest.er1 | ||
8598 | + cat conftest.err >&5 | ||
8599 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8600 | + (exit $ac_status); } && { | ||
8601 | + test -z "$ac_c_werror_flag" || | ||
8602 | + test ! -s conftest.err | ||
8603 | + } && test -s conftest$ac_exeext && | ||
8604 | + $as_test_x conftest$ac_exeext; then | ||
8605 | ac_cv_lib_nl_nl_socket_alloc=yes | ||
8606 | else | ||
8607 | - ac_cv_lib_nl_nl_socket_alloc=no | ||
8608 | + echo "$as_me: failed program was:" >&5 | ||
8609 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8610 | + | ||
8611 | + ac_cv_lib_nl_nl_socket_alloc=no | ||
8612 | fi | ||
8613 | -rm -f core conftest.err conftest.$ac_objext \ | ||
8614 | - conftest$ac_exeext conftest.$ac_ext | ||
8615 | + | ||
8616 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
8617 | + conftest$ac_exeext conftest.$ac_ext | ||
8618 | LIBS=$ac_check_lib_save_LIBS | ||
8619 | fi | ||
8620 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_nl_socket_alloc" >&5 | ||
8621 | -$as_echo "$ac_cv_lib_nl_nl_socket_alloc" >&6; } | ||
8622 | -if test "x$ac_cv_lib_nl_nl_socket_alloc" = x""yes; then : | ||
8623 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_socket_alloc" >&5 | ||
8624 | +echo "${ECHO_T}$ac_cv_lib_nl_nl_socket_alloc" >&6; } | ||
8625 | +if test $ac_cv_lib_nl_nl_socket_alloc = yes; then | ||
8626 | |||
8627 | # | ||
8628 | # Yes, we have libnl 2.x. | ||
8629 | # | ||
8630 | LIBS="-lnl-genl -lnl $LIBS" | ||
8631 | |||
8632 | -$as_echo "#define HAVE_LIBNL 1" >>confdefs.h | ||
8633 | +cat >>confdefs.h <<\_ACEOF | ||
8634 | +#define HAVE_LIBNL 1 | ||
8635 | +_ACEOF | ||
8636 | |||
8637 | |||
8638 | -$as_echo "#define HAVE_LIBNL_2_x 1" >>confdefs.h | ||
8639 | +cat >>confdefs.h <<\_ACEOF | ||
8640 | +#define HAVE_LIBNL_2_x 1 | ||
8641 | +_ACEOF | ||
8642 | |||
8643 | |||
8644 | else | ||
8645 | @@ -5473,14 +7686,18 @@ else | ||
8646 | # | ||
8647 | # No, we don't; do we have libnl 1.x? | ||
8648 | # | ||
8649 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_handle_alloc in -lnl" >&5 | ||
8650 | -$as_echo_n "checking for nl_handle_alloc in -lnl... " >&6; } | ||
8651 | -if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then : | ||
8652 | - $as_echo_n "(cached) " >&6 | ||
8653 | + { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5 | ||
8654 | +echo $ECHO_N "checking for nl_handle_alloc in -lnl... $ECHO_C" >&6; } | ||
8655 | +if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then | ||
8656 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8657 | else | ||
8658 | ac_check_lib_save_LIBS=$LIBS | ||
8659 | LIBS="-lnl $LIBS" | ||
8660 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8661 | +cat >conftest.$ac_ext <<_ACEOF | ||
8662 | +/* confdefs.h. */ | ||
8663 | +_ACEOF | ||
8664 | +cat confdefs.h >>conftest.$ac_ext | ||
8665 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8666 | /* end confdefs.h. */ | ||
8667 | |||
8668 | /* Override any GCC internal prototype to avoid an error. | ||
8669 | @@ -5498,25 +7715,48 @@ return nl_handle_alloc (); | ||
8670 | return 0; | ||
8671 | } | ||
8672 | _ACEOF | ||
8673 | -if ac_fn_c_try_link "$LINENO"; then : | ||
8674 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
8675 | +if { (ac_try="$ac_link" | ||
8676 | +case "(($ac_try" in | ||
8677 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8678 | + *) ac_try_echo=$ac_try;; | ||
8679 | +esac | ||
8680 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8681 | + (eval "$ac_link") 2>conftest.er1 | ||
8682 | + ac_status=$? | ||
8683 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8684 | + rm -f conftest.er1 | ||
8685 | + cat conftest.err >&5 | ||
8686 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8687 | + (exit $ac_status); } && { | ||
8688 | + test -z "$ac_c_werror_flag" || | ||
8689 | + test ! -s conftest.err | ||
8690 | + } && test -s conftest$ac_exeext && | ||
8691 | + $as_test_x conftest$ac_exeext; then | ||
8692 | ac_cv_lib_nl_nl_handle_alloc=yes | ||
8693 | else | ||
8694 | - ac_cv_lib_nl_nl_handle_alloc=no | ||
8695 | + echo "$as_me: failed program was:" >&5 | ||
8696 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8697 | + | ||
8698 | + ac_cv_lib_nl_nl_handle_alloc=no | ||
8699 | fi | ||
8700 | -rm -f core conftest.err conftest.$ac_objext \ | ||
8701 | - conftest$ac_exeext conftest.$ac_ext | ||
8702 | + | ||
8703 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
8704 | + conftest$ac_exeext conftest.$ac_ext | ||
8705 | LIBS=$ac_check_lib_save_LIBS | ||
8706 | fi | ||
8707 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_nl_handle_alloc" >&5 | ||
8708 | -$as_echo "$ac_cv_lib_nl_nl_handle_alloc" >&6; } | ||
8709 | -if test "x$ac_cv_lib_nl_nl_handle_alloc" = x""yes; then : | ||
8710 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_handle_alloc" >&5 | ||
8711 | +echo "${ECHO_T}$ac_cv_lib_nl_nl_handle_alloc" >&6; } | ||
8712 | +if test $ac_cv_lib_nl_nl_handle_alloc = yes; then | ||
8713 | |||
8714 | # | ||
8715 | # Yes. | ||
8716 | # | ||
8717 | LIBS="-lnl $LIBS" | ||
8718 | |||
8719 | -$as_echo "#define HAVE_LIBNL 1" >>confdefs.h | ||
8720 | +cat >>confdefs.h <<\_ACEOF | ||
8721 | +#define HAVE_LIBNL 1 | ||
8722 | +_ACEOF | ||
8723 | |||
8724 | |||
8725 | else | ||
8726 | @@ -5525,7 +7765,9 @@ else | ||
8727 | # No, we don't have libnl at all. | ||
8728 | # | ||
8729 | if test x$with_libnl = xyes ; then | ||
8730 | - as_fn_error $? "libnl support requested but libnl not found" "$LINENO" 5 | ||
8731 | + { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5 | ||
8732 | +echo "$as_me: error: libnl support requested but libnl not found" >&2;} | ||
8733 | + { (exit 1); exit 1; }; } | ||
8734 | fi | ||
8735 | |||
8736 | fi | ||
8737 | @@ -5535,28 +7777,77 @@ fi | ||
8738 | |||
8739 | fi | ||
8740 | |||
8741 | - for ac_header in linux/ethtool.h | ||
8742 | -do : | ||
8743 | - ac_fn_c_check_header_compile "$LINENO" "linux/ethtool.h" "ac_cv_header_linux_ethtool_h" " | ||
8744 | + | ||
8745 | +for ac_header in linux/ethtool.h | ||
8746 | +do | ||
8747 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8748 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
8749 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
8750 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
8751 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8752 | +else | ||
8753 | + cat >conftest.$ac_ext <<_ACEOF | ||
8754 | +/* confdefs.h. */ | ||
8755 | +_ACEOF | ||
8756 | +cat confdefs.h >>conftest.$ac_ext | ||
8757 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8758 | +/* end confdefs.h. */ | ||
8759 | + | ||
8760 | $ac_includes_default | ||
8761 | #include <linux/types.h> | ||
8762 | |||
8763 | -" | ||
8764 | -if test "x$ac_cv_header_linux_ethtool_h" = x""yes; then : | ||
8765 | + | ||
8766 | +#include <$ac_header> | ||
8767 | +_ACEOF | ||
8768 | +rm -f conftest.$ac_objext | ||
8769 | +if { (ac_try="$ac_compile" | ||
8770 | +case "(($ac_try" in | ||
8771 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8772 | + *) ac_try_echo=$ac_try;; | ||
8773 | +esac | ||
8774 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8775 | + (eval "$ac_compile") 2>conftest.er1 | ||
8776 | + ac_status=$? | ||
8777 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8778 | + rm -f conftest.er1 | ||
8779 | + cat conftest.err >&5 | ||
8780 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8781 | + (exit $ac_status); } && { | ||
8782 | + test -z "$ac_c_werror_flag" || | ||
8783 | + test ! -s conftest.err | ||
8784 | + } && test -s conftest.$ac_objext; then | ||
8785 | + eval "$as_ac_Header=yes" | ||
8786 | +else | ||
8787 | + echo "$as_me: failed program was:" >&5 | ||
8788 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8789 | + | ||
8790 | + eval "$as_ac_Header=no" | ||
8791 | +fi | ||
8792 | + | ||
8793 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8794 | +fi | ||
8795 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
8796 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
8797 | +echo "${ECHO_T}$ac_res" >&6; } | ||
8798 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
8799 | cat >>confdefs.h <<_ACEOF | ||
8800 | -#define HAVE_LINUX_ETHTOOL_H 1 | ||
8801 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
8802 | _ACEOF | ||
8803 | |||
8804 | fi | ||
8805 | |||
8806 | done | ||
8807 | |||
8808 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if if_packet.h has tpacket_stats defined" >&5 | ||
8809 | -$as_echo_n "checking if if_packet.h has tpacket_stats defined... " >&6; } | ||
8810 | - if test "${ac_cv_lbl_tpacket_stats+set}" = set; then : | ||
8811 | - $as_echo_n "(cached) " >&6 | ||
8812 | + { echo "$as_me:$LINENO: checking if if_packet.h has tpacket_stats defined" >&5 | ||
8813 | +echo $ECHO_N "checking if if_packet.h has tpacket_stats defined... $ECHO_C" >&6; } | ||
8814 | + if test "${ac_cv_lbl_tpacket_stats+set}" = set; then | ||
8815 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8816 | else | ||
8817 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8818 | + cat >conftest.$ac_ext <<_ACEOF | ||
8819 | +/* confdefs.h. */ | ||
8820 | +_ACEOF | ||
8821 | +cat confdefs.h >>conftest.$ac_ext | ||
8822 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8823 | /* end confdefs.h. */ | ||
8824 | |||
8825 | # include <linux/if_packet.h> | ||
8826 | @@ -5568,27 +7859,53 @@ struct tpacket_stats stats | ||
8827 | return 0; | ||
8828 | } | ||
8829 | _ACEOF | ||
8830 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
8831 | +rm -f conftest.$ac_objext | ||
8832 | +if { (ac_try="$ac_compile" | ||
8833 | +case "(($ac_try" in | ||
8834 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8835 | + *) ac_try_echo=$ac_try;; | ||
8836 | +esac | ||
8837 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8838 | + (eval "$ac_compile") 2>conftest.er1 | ||
8839 | + ac_status=$? | ||
8840 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8841 | + rm -f conftest.er1 | ||
8842 | + cat conftest.err >&5 | ||
8843 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8844 | + (exit $ac_status); } && { | ||
8845 | + test -z "$ac_c_werror_flag" || | ||
8846 | + test ! -s conftest.err | ||
8847 | + } && test -s conftest.$ac_objext; then | ||
8848 | ac_cv_lbl_tpacket_stats=yes | ||
8849 | else | ||
8850 | - ac_cv_lbl_tpacket_stats=no | ||
8851 | + echo "$as_me: failed program was:" >&5 | ||
8852 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8853 | + | ||
8854 | + ac_cv_lbl_tpacket_stats=no | ||
8855 | fi | ||
8856 | + | ||
8857 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8858 | fi | ||
8859 | |||
8860 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_tpacket_stats" >&5 | ||
8861 | -$as_echo "$ac_cv_lbl_tpacket_stats" >&6; } | ||
8862 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_tpacket_stats" >&5 | ||
8863 | +echo "${ECHO_T}$ac_cv_lbl_tpacket_stats" >&6; } | ||
8864 | if test $ac_cv_lbl_tpacket_stats = yes; then | ||
8865 | |||
8866 | -$as_echo "#define HAVE_TPACKET_STATS 1" >>confdefs.h | ||
8867 | +cat >>confdefs.h <<\_ACEOF | ||
8868 | +#define HAVE_TPACKET_STATS 1 | ||
8869 | +_ACEOF | ||
8870 | |||
8871 | fi | ||
8872 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tpacket_auxdata struct has tp_vlan_tci member" >&5 | ||
8873 | -$as_echo_n "checking if tpacket_auxdata struct has tp_vlan_tci member... " >&6; } | ||
8874 | - if test "${ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci+set}" = set; then : | ||
8875 | - $as_echo_n "(cached) " >&6 | ||
8876 | + { echo "$as_me:$LINENO: checking if tpacket_auxdata struct has tp_vlan_tci member" >&5 | ||
8877 | +echo $ECHO_N "checking if tpacket_auxdata struct has tp_vlan_tci member... $ECHO_C" >&6; } | ||
8878 | + if test "${ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci+set}" = set; then | ||
8879 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8880 | else | ||
8881 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
8882 | + cat >conftest.$ac_ext <<_ACEOF | ||
8883 | +/* confdefs.h. */ | ||
8884 | +_ACEOF | ||
8885 | +cat confdefs.h >>conftest.$ac_ext | ||
8886 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8887 | /* end confdefs.h. */ | ||
8888 | |||
8889 | # include <sys/types.h> | ||
8890 | @@ -5601,21 +7918,43 @@ u_int i = sizeof(((struct tpacket_auxdata *)0)->tp_vlan_tci) | ||
8891 | return 0; | ||
8892 | } | ||
8893 | _ACEOF | ||
8894 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
8895 | +rm -f conftest.$ac_objext | ||
8896 | +if { (ac_try="$ac_compile" | ||
8897 | +case "(($ac_try" in | ||
8898 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8899 | + *) ac_try_echo=$ac_try;; | ||
8900 | +esac | ||
8901 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8902 | + (eval "$ac_compile") 2>conftest.er1 | ||
8903 | + ac_status=$? | ||
8904 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8905 | + rm -f conftest.er1 | ||
8906 | + cat conftest.err >&5 | ||
8907 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8908 | + (exit $ac_status); } && { | ||
8909 | + test -z "$ac_c_werror_flag" || | ||
8910 | + test ! -s conftest.err | ||
8911 | + } && test -s conftest.$ac_objext; then | ||
8912 | ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=yes | ||
8913 | else | ||
8914 | - ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=no | ||
8915 | + echo "$as_me: failed program was:" >&5 | ||
8916 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8917 | + | ||
8918 | + ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=no | ||
8919 | fi | ||
8920 | + | ||
8921 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8922 | fi | ||
8923 | |||
8924 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci" >&5 | ||
8925 | -$as_echo "$ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci" >&6; } | ||
8926 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci" >&5 | ||
8927 | +echo "${ECHO_T}$ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci" >&6; } | ||
8928 | if test $ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci = yes ; then | ||
8929 | HAVE_LINUX_TPACKET_AUXDATA=tp_vlan_tci | ||
8930 | |||
8931 | |||
8932 | -$as_echo "#define HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI 1" >>confdefs.h | ||
8933 | +cat >>confdefs.h <<\_ACEOF | ||
8934 | +#define HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI 1 | ||
8935 | +_ACEOF | ||
8936 | |||
8937 | fi | ||
8938 | ;; | ||
8939 | @@ -5624,12 +7963,140 @@ bpf) | ||
8940 | # | ||
8941 | # Check whether we have the *BSD-style ioctls. | ||
8942 | # | ||
8943 | - for ac_header in net/if_media.h | ||
8944 | -do : | ||
8945 | - ac_fn_c_check_header_mongrel "$LINENO" "net/if_media.h" "ac_cv_header_net_if_media_h" "$ac_includes_default" | ||
8946 | -if test "x$ac_cv_header_net_if_media_h" = x""yes; then : | ||
8947 | + | ||
8948 | +for ac_header in net/if_media.h | ||
8949 | +do | ||
8950 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8951 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
8952 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
8953 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
8954 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
8955 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8956 | +fi | ||
8957 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
8958 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
8959 | +echo "${ECHO_T}$ac_res" >&6; } | ||
8960 | +else | ||
8961 | + # Is the header compilable? | ||
8962 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
8963 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
8964 | +cat >conftest.$ac_ext <<_ACEOF | ||
8965 | +/* confdefs.h. */ | ||
8966 | +_ACEOF | ||
8967 | +cat confdefs.h >>conftest.$ac_ext | ||
8968 | +cat >>conftest.$ac_ext <<_ACEOF | ||
8969 | +/* end confdefs.h. */ | ||
8970 | +$ac_includes_default | ||
8971 | +#include <$ac_header> | ||
8972 | +_ACEOF | ||
8973 | +rm -f conftest.$ac_objext | ||
8974 | +if { (ac_try="$ac_compile" | ||
8975 | +case "(($ac_try" in | ||
8976 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8977 | + *) ac_try_echo=$ac_try;; | ||
8978 | +esac | ||
8979 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8980 | + (eval "$ac_compile") 2>conftest.er1 | ||
8981 | + ac_status=$? | ||
8982 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
8983 | + rm -f conftest.er1 | ||
8984 | + cat conftest.err >&5 | ||
8985 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8986 | + (exit $ac_status); } && { | ||
8987 | + test -z "$ac_c_werror_flag" || | ||
8988 | + test ! -s conftest.err | ||
8989 | + } && test -s conftest.$ac_objext; then | ||
8990 | + ac_header_compiler=yes | ||
8991 | +else | ||
8992 | + echo "$as_me: failed program was:" >&5 | ||
8993 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
8994 | + | ||
8995 | + ac_header_compiler=no | ||
8996 | +fi | ||
8997 | + | ||
8998 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8999 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
9000 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
9001 | + | ||
9002 | +# Is the header present? | ||
9003 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
9004 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
9005 | +cat >conftest.$ac_ext <<_ACEOF | ||
9006 | +/* confdefs.h. */ | ||
9007 | +_ACEOF | ||
9008 | +cat confdefs.h >>conftest.$ac_ext | ||
9009 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9010 | +/* end confdefs.h. */ | ||
9011 | +#include <$ac_header> | ||
9012 | +_ACEOF | ||
9013 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
9014 | +case "(($ac_try" in | ||
9015 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9016 | + *) ac_try_echo=$ac_try;; | ||
9017 | +esac | ||
9018 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9019 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
9020 | + ac_status=$? | ||
9021 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9022 | + rm -f conftest.er1 | ||
9023 | + cat conftest.err >&5 | ||
9024 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9025 | + (exit $ac_status); } >/dev/null && { | ||
9026 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
9027 | + test ! -s conftest.err | ||
9028 | + }; then | ||
9029 | + ac_header_preproc=yes | ||
9030 | +else | ||
9031 | + echo "$as_me: failed program was:" >&5 | ||
9032 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9033 | + | ||
9034 | + ac_header_preproc=no | ||
9035 | +fi | ||
9036 | + | ||
9037 | +rm -f conftest.err conftest.$ac_ext | ||
9038 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
9039 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
9040 | + | ||
9041 | +# So? What about this header? | ||
9042 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
9043 | + yes:no: ) | ||
9044 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
9045 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
9046 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
9047 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
9048 | + ac_header_preproc=yes | ||
9049 | + ;; | ||
9050 | + no:yes:* ) | ||
9051 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
9052 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
9053 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
9054 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
9055 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
9056 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
9057 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
9058 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
9059 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
9060 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
9061 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
9062 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
9063 | + | ||
9064 | + ;; | ||
9065 | +esac | ||
9066 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
9067 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
9068 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
9069 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9070 | +else | ||
9071 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
9072 | +fi | ||
9073 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
9074 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
9075 | +echo "${ECHO_T}$ac_res" >&6; } | ||
9076 | + | ||
9077 | +fi | ||
9078 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
9079 | cat >>confdefs.h <<_ACEOF | ||
9080 | -#define HAVE_NET_IF_MEDIA_H 1 | ||
9081 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
9082 | _ACEOF | ||
9083 | |||
9084 | fi | ||
9085 | @@ -5637,9 +8104,13 @@ fi | ||
9086 | done | ||
9087 | |||
9088 | |||
9089 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the system supports zerocopy BPF" >&5 | ||
9090 | -$as_echo_n "checking whether the system supports zerocopy BPF... " >&6; } | ||
9091 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9092 | + { echo "$as_me:$LINENO: checking whether the system supports zerocopy BPF" >&5 | ||
9093 | +echo $ECHO_N "checking whether the system supports zerocopy BPF... $ECHO_C" >&6; } | ||
9094 | + cat >conftest.$ac_ext <<_ACEOF | ||
9095 | +/* confdefs.h. */ | ||
9096 | +_ACEOF | ||
9097 | +cat confdefs.h >>conftest.$ac_ext | ||
9098 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9099 | /* end confdefs.h. */ | ||
9100 | #include <sys/socket.h> | ||
9101 | #include <sys/ioctl.h> | ||
9102 | @@ -5653,24 +8124,57 @@ return (BIOCROTZBUF + BPF_BUFMODE_ZBUF); | ||
9103 | return 0; | ||
9104 | } | ||
9105 | _ACEOF | ||
9106 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
9107 | +rm -f conftest.$ac_objext | ||
9108 | +if { (ac_try="$ac_compile" | ||
9109 | +case "(($ac_try" in | ||
9110 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9111 | + *) ac_try_echo=$ac_try;; | ||
9112 | +esac | ||
9113 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9114 | + (eval "$ac_compile") 2>conftest.er1 | ||
9115 | + ac_status=$? | ||
9116 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9117 | + rm -f conftest.er1 | ||
9118 | + cat conftest.err >&5 | ||
9119 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9120 | + (exit $ac_status); } && { | ||
9121 | + test -z "$ac_c_werror_flag" || | ||
9122 | + test ! -s conftest.err | ||
9123 | + } && test -s conftest.$ac_objext; then | ||
9124 | |||
9125 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
9126 | -$as_echo "yes" >&6; } | ||
9127 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
9128 | +echo "${ECHO_T}yes" >&6; } | ||
9129 | |||
9130 | -$as_echo "#define HAVE_ZEROCOPY_BPF 1" >>confdefs.h | ||
9131 | +cat >>confdefs.h <<\_ACEOF | ||
9132 | +#define HAVE_ZEROCOPY_BPF 1 | ||
9133 | +_ACEOF | ||
9134 | |||
9135 | |||
9136 | else | ||
9137 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
9138 | -$as_echo "no" >&6; } | ||
9139 | + echo "$as_me: failed program was:" >&5 | ||
9140 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9141 | + | ||
9142 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
9143 | +echo "${ECHO_T}no" >&6; } | ||
9144 | fi | ||
9145 | + | ||
9146 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
9147 | |||
9148 | # | ||
9149 | # Check whether we have struct BPF_TIMEVAL. | ||
9150 | # | ||
9151 | - ac_fn_c_check_type "$LINENO" "struct BPF_TIMEVAL" "ac_cv_type_struct_BPF_TIMEVAL" " | ||
9152 | + { echo "$as_me:$LINENO: checking for struct BPF_TIMEVAL" >&5 | ||
9153 | +echo $ECHO_N "checking for struct BPF_TIMEVAL... $ECHO_C" >&6; } | ||
9154 | +if test "${ac_cv_type_struct_BPF_TIMEVAL+set}" = set; then | ||
9155 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9156 | +else | ||
9157 | + cat >conftest.$ac_ext <<_ACEOF | ||
9158 | +/* confdefs.h. */ | ||
9159 | +_ACEOF | ||
9160 | +cat confdefs.h >>conftest.$ac_ext | ||
9161 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9162 | +/* end confdefs.h. */ | ||
9163 | + | ||
9164 | #include <sys/types.h> | ||
9165 | #include <sys/ioctl.h> | ||
9166 | #ifdef HAVE_SYS_IOCCOM_H | ||
9167 | @@ -5678,8 +8182,49 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
9168 | #endif | ||
9169 | #include <net/bpf.h> | ||
9170 | |||
9171 | -" | ||
9172 | -if test "x$ac_cv_type_struct_BPF_TIMEVAL" = x""yes; then : | ||
9173 | + | ||
9174 | +typedef struct BPF_TIMEVAL ac__type_new_; | ||
9175 | +int | ||
9176 | +main () | ||
9177 | +{ | ||
9178 | +if ((ac__type_new_ *) 0) | ||
9179 | + return 0; | ||
9180 | +if (sizeof (ac__type_new_)) | ||
9181 | + return 0; | ||
9182 | + ; | ||
9183 | + return 0; | ||
9184 | +} | ||
9185 | +_ACEOF | ||
9186 | +rm -f conftest.$ac_objext | ||
9187 | +if { (ac_try="$ac_compile" | ||
9188 | +case "(($ac_try" in | ||
9189 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9190 | + *) ac_try_echo=$ac_try;; | ||
9191 | +esac | ||
9192 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9193 | + (eval "$ac_compile") 2>conftest.er1 | ||
9194 | + ac_status=$? | ||
9195 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9196 | + rm -f conftest.er1 | ||
9197 | + cat conftest.err >&5 | ||
9198 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9199 | + (exit $ac_status); } && { | ||
9200 | + test -z "$ac_c_werror_flag" || | ||
9201 | + test ! -s conftest.err | ||
9202 | + } && test -s conftest.$ac_objext; then | ||
9203 | + ac_cv_type_struct_BPF_TIMEVAL=yes | ||
9204 | +else | ||
9205 | + echo "$as_me: failed program was:" >&5 | ||
9206 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9207 | + | ||
9208 | + ac_cv_type_struct_BPF_TIMEVAL=no | ||
9209 | +fi | ||
9210 | + | ||
9211 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
9212 | +fi | ||
9213 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_BPF_TIMEVAL" >&5 | ||
9214 | +echo "${ECHO_T}$ac_cv_type_struct_BPF_TIMEVAL" >&6; } | ||
9215 | +if test $ac_cv_type_struct_BPF_TIMEVAL = yes; then | ||
9216 | |||
9217 | cat >>confdefs.h <<_ACEOF | ||
9218 | #define HAVE_STRUCT_BPF_TIMEVAL 1 | ||
9219 | @@ -5703,10 +8248,10 @@ snf) | ||
9220 | ;; | ||
9221 | |||
9222 | null) | ||
9223 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine packet capture interface" >&5 | ||
9224 | -$as_echo "$as_me: WARNING: cannot determine packet capture interface" >&2;} | ||
9225 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: (see the INSTALL doc for more info)" >&5 | ||
9226 | -$as_echo "$as_me: WARNING: (see the INSTALL doc for more info)" >&2;} | ||
9227 | + { echo "$as_me:$LINENO: WARNING: cannot determine packet capture interface" >&5 | ||
9228 | +echo "$as_me: WARNING: cannot determine packet capture interface" >&2;} | ||
9229 | + { echo "$as_me:$LINENO: WARNING: (see the INSTALL doc for more info)" >&5 | ||
9230 | +echo "$as_me: WARNING: (see the INSTALL doc for more info)" >&2;} | ||
9231 | ;; | ||
9232 | esac | ||
9233 | |||
9234 | @@ -5718,15 +8263,219 @@ then | ||
9235 | # | ||
9236 | V_FINDALLDEVS=null | ||
9237 | else | ||
9238 | - ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs" | ||
9239 | -if test "x$ac_cv_func_getifaddrs" = x""yes; then : | ||
9240 | + { echo "$as_me:$LINENO: checking for getifaddrs" >&5 | ||
9241 | +echo $ECHO_N "checking for getifaddrs... $ECHO_C" >&6; } | ||
9242 | +if test "${ac_cv_func_getifaddrs+set}" = set; then | ||
9243 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9244 | +else | ||
9245 | + cat >conftest.$ac_ext <<_ACEOF | ||
9246 | +/* confdefs.h. */ | ||
9247 | +_ACEOF | ||
9248 | +cat confdefs.h >>conftest.$ac_ext | ||
9249 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9250 | +/* end confdefs.h. */ | ||
9251 | +/* Define getifaddrs to an innocuous variant, in case <limits.h> declares getifaddrs. | ||
9252 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
9253 | +#define getifaddrs innocuous_getifaddrs | ||
9254 | + | ||
9255 | +/* System header to define __stub macros and hopefully few prototypes, | ||
9256 | + which can conflict with char getifaddrs (); below. | ||
9257 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
9258 | + <limits.h> exists even on freestanding compilers. */ | ||
9259 | + | ||
9260 | +#ifdef __STDC__ | ||
9261 | +# include <limits.h> | ||
9262 | +#else | ||
9263 | +# include <assert.h> | ||
9264 | +#endif | ||
9265 | + | ||
9266 | +#undef getifaddrs | ||
9267 | + | ||
9268 | +/* Override any GCC internal prototype to avoid an error. | ||
9269 | + Use char because int might match the return type of a GCC | ||
9270 | + builtin and then its argument prototype would still apply. */ | ||
9271 | +#ifdef __cplusplus | ||
9272 | +extern "C" | ||
9273 | +#endif | ||
9274 | +char getifaddrs (); | ||
9275 | +/* The GNU C library defines this for functions which it implements | ||
9276 | + to always fail with ENOSYS. Some functions are actually named | ||
9277 | + something starting with __ and the normal name is an alias. */ | ||
9278 | +#if defined __stub_getifaddrs || defined __stub___getifaddrs | ||
9279 | +choke me | ||
9280 | +#endif | ||
9281 | + | ||
9282 | +int | ||
9283 | +main () | ||
9284 | +{ | ||
9285 | +return getifaddrs (); | ||
9286 | + ; | ||
9287 | + return 0; | ||
9288 | +} | ||
9289 | +_ACEOF | ||
9290 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
9291 | +if { (ac_try="$ac_link" | ||
9292 | +case "(($ac_try" in | ||
9293 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9294 | + *) ac_try_echo=$ac_try;; | ||
9295 | +esac | ||
9296 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9297 | + (eval "$ac_link") 2>conftest.er1 | ||
9298 | + ac_status=$? | ||
9299 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9300 | + rm -f conftest.er1 | ||
9301 | + cat conftest.err >&5 | ||
9302 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9303 | + (exit $ac_status); } && { | ||
9304 | + test -z "$ac_c_werror_flag" || | ||
9305 | + test ! -s conftest.err | ||
9306 | + } && test -s conftest$ac_exeext && | ||
9307 | + $as_test_x conftest$ac_exeext; then | ||
9308 | + ac_cv_func_getifaddrs=yes | ||
9309 | +else | ||
9310 | + echo "$as_me: failed program was:" >&5 | ||
9311 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9312 | + | ||
9313 | + ac_cv_func_getifaddrs=no | ||
9314 | +fi | ||
9315 | + | ||
9316 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9317 | + conftest$ac_exeext conftest.$ac_ext | ||
9318 | +fi | ||
9319 | +{ echo "$as_me:$LINENO: result: $ac_cv_func_getifaddrs" >&5 | ||
9320 | +echo "${ECHO_T}$ac_cv_func_getifaddrs" >&6; } | ||
9321 | +if test $ac_cv_func_getifaddrs = yes; then | ||
9322 | |||
9323 | # | ||
9324 | # We have "getifaddrs()"; make sure we have <ifaddrs.h> | ||
9325 | # as well, just in case some platform is really weird. | ||
9326 | # | ||
9327 | - ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default" | ||
9328 | -if test "x$ac_cv_header_ifaddrs_h" = x""yes; then : | ||
9329 | + if test "${ac_cv_header_ifaddrs_h+set}" = set; then | ||
9330 | + { echo "$as_me:$LINENO: checking for ifaddrs.h" >&5 | ||
9331 | +echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; } | ||
9332 | +if test "${ac_cv_header_ifaddrs_h+set}" = set; then | ||
9333 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9334 | +fi | ||
9335 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5 | ||
9336 | +echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; } | ||
9337 | +else | ||
9338 | + # Is the header compilable? | ||
9339 | +{ echo "$as_me:$LINENO: checking ifaddrs.h usability" >&5 | ||
9340 | +echo $ECHO_N "checking ifaddrs.h usability... $ECHO_C" >&6; } | ||
9341 | +cat >conftest.$ac_ext <<_ACEOF | ||
9342 | +/* confdefs.h. */ | ||
9343 | +_ACEOF | ||
9344 | +cat confdefs.h >>conftest.$ac_ext | ||
9345 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9346 | +/* end confdefs.h. */ | ||
9347 | +$ac_includes_default | ||
9348 | +#include <ifaddrs.h> | ||
9349 | +_ACEOF | ||
9350 | +rm -f conftest.$ac_objext | ||
9351 | +if { (ac_try="$ac_compile" | ||
9352 | +case "(($ac_try" in | ||
9353 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9354 | + *) ac_try_echo=$ac_try;; | ||
9355 | +esac | ||
9356 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9357 | + (eval "$ac_compile") 2>conftest.er1 | ||
9358 | + ac_status=$? | ||
9359 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9360 | + rm -f conftest.er1 | ||
9361 | + cat conftest.err >&5 | ||
9362 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9363 | + (exit $ac_status); } && { | ||
9364 | + test -z "$ac_c_werror_flag" || | ||
9365 | + test ! -s conftest.err | ||
9366 | + } && test -s conftest.$ac_objext; then | ||
9367 | + ac_header_compiler=yes | ||
9368 | +else | ||
9369 | + echo "$as_me: failed program was:" >&5 | ||
9370 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9371 | + | ||
9372 | + ac_header_compiler=no | ||
9373 | +fi | ||
9374 | + | ||
9375 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
9376 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
9377 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
9378 | + | ||
9379 | +# Is the header present? | ||
9380 | +{ echo "$as_me:$LINENO: checking ifaddrs.h presence" >&5 | ||
9381 | +echo $ECHO_N "checking ifaddrs.h presence... $ECHO_C" >&6; } | ||
9382 | +cat >conftest.$ac_ext <<_ACEOF | ||
9383 | +/* confdefs.h. */ | ||
9384 | +_ACEOF | ||
9385 | +cat confdefs.h >>conftest.$ac_ext | ||
9386 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9387 | +/* end confdefs.h. */ | ||
9388 | +#include <ifaddrs.h> | ||
9389 | +_ACEOF | ||
9390 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
9391 | +case "(($ac_try" in | ||
9392 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9393 | + *) ac_try_echo=$ac_try;; | ||
9394 | +esac | ||
9395 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9396 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
9397 | + ac_status=$? | ||
9398 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9399 | + rm -f conftest.er1 | ||
9400 | + cat conftest.err >&5 | ||
9401 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9402 | + (exit $ac_status); } >/dev/null && { | ||
9403 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
9404 | + test ! -s conftest.err | ||
9405 | + }; then | ||
9406 | + ac_header_preproc=yes | ||
9407 | +else | ||
9408 | + echo "$as_me: failed program was:" >&5 | ||
9409 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9410 | + | ||
9411 | + ac_header_preproc=no | ||
9412 | +fi | ||
9413 | + | ||
9414 | +rm -f conftest.err conftest.$ac_ext | ||
9415 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
9416 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
9417 | + | ||
9418 | +# So? What about this header? | ||
9419 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
9420 | + yes:no: ) | ||
9421 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
9422 | +echo "$as_me: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
9423 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the compiler's result" >&5 | ||
9424 | +echo "$as_me: WARNING: ifaddrs.h: proceeding with the compiler's result" >&2;} | ||
9425 | + ac_header_preproc=yes | ||
9426 | + ;; | ||
9427 | + no:yes:* ) | ||
9428 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: present but cannot be compiled" >&5 | ||
9429 | +echo "$as_me: WARNING: ifaddrs.h: present but cannot be compiled" >&2;} | ||
9430 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&5 | ||
9431 | +echo "$as_me: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&2;} | ||
9432 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: see the Autoconf documentation" >&5 | ||
9433 | +echo "$as_me: WARNING: ifaddrs.h: see the Autoconf documentation" >&2;} | ||
9434 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
9435 | +echo "$as_me: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
9436 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&5 | ||
9437 | +echo "$as_me: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&2;} | ||
9438 | + { echo "$as_me:$LINENO: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&5 | ||
9439 | +echo "$as_me: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&2;} | ||
9440 | + | ||
9441 | + ;; | ||
9442 | +esac | ||
9443 | +{ echo "$as_me:$LINENO: checking for ifaddrs.h" >&5 | ||
9444 | +echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; } | ||
9445 | +if test "${ac_cv_header_ifaddrs_h+set}" = set; then | ||
9446 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9447 | +else | ||
9448 | + ac_cv_header_ifaddrs_h=$ac_header_preproc | ||
9449 | +fi | ||
9450 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5 | ||
9451 | +echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; } | ||
9452 | + | ||
9453 | +fi | ||
9454 | +if test $ac_cv_header_ifaddrs_h = yes; then | ||
9455 | |||
9456 | # | ||
9457 | # We have the header, so we use "getifaddrs()" to | ||
9458 | @@ -5745,7 +8494,9 @@ else | ||
9459 | # but without "ifaddrs.h", if there is something | ||
9460 | # we can do on those systems. | ||
9461 | # | ||
9462 | - as_fn_error $? "Your system has getifaddrs() but doesn't have a usable <ifaddrs.h>." "$LINENO" 5 | ||
9463 | + { { echo "$as_me:$LINENO: error: Your system has getifaddrs() but doesn't have a usable <ifaddrs.h>." >&5 | ||
9464 | +echo "$as_me: error: Your system has getifaddrs() but doesn't have a usable <ifaddrs.h>." >&2;} | ||
9465 | + { (exit 1); exit 1; }; } | ||
9466 | |||
9467 | fi | ||
9468 | |||
9469 | @@ -5763,13 +8514,141 @@ else | ||
9470 | case "$V_PCAP" in | ||
9471 | |||
9472 | dlpi|libdlpi) | ||
9473 | - for ac_header in sys/bufmod.h sys/dlpi_ext.h | ||
9474 | -do : | ||
9475 | - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
9476 | -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | ||
9477 | -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | ||
9478 | + | ||
9479 | + | ||
9480 | +for ac_header in sys/bufmod.h sys/dlpi_ext.h | ||
9481 | +do | ||
9482 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
9483 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
9484 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
9485 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
9486 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
9487 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9488 | +fi | ||
9489 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
9490 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
9491 | +echo "${ECHO_T}$ac_res" >&6; } | ||
9492 | +else | ||
9493 | + # Is the header compilable? | ||
9494 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
9495 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
9496 | +cat >conftest.$ac_ext <<_ACEOF | ||
9497 | +/* confdefs.h. */ | ||
9498 | +_ACEOF | ||
9499 | +cat confdefs.h >>conftest.$ac_ext | ||
9500 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9501 | +/* end confdefs.h. */ | ||
9502 | +$ac_includes_default | ||
9503 | +#include <$ac_header> | ||
9504 | +_ACEOF | ||
9505 | +rm -f conftest.$ac_objext | ||
9506 | +if { (ac_try="$ac_compile" | ||
9507 | +case "(($ac_try" in | ||
9508 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9509 | + *) ac_try_echo=$ac_try;; | ||
9510 | +esac | ||
9511 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9512 | + (eval "$ac_compile") 2>conftest.er1 | ||
9513 | + ac_status=$? | ||
9514 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9515 | + rm -f conftest.er1 | ||
9516 | + cat conftest.err >&5 | ||
9517 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9518 | + (exit $ac_status); } && { | ||
9519 | + test -z "$ac_c_werror_flag" || | ||
9520 | + test ! -s conftest.err | ||
9521 | + } && test -s conftest.$ac_objext; then | ||
9522 | + ac_header_compiler=yes | ||
9523 | +else | ||
9524 | + echo "$as_me: failed program was:" >&5 | ||
9525 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9526 | + | ||
9527 | + ac_header_compiler=no | ||
9528 | +fi | ||
9529 | + | ||
9530 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
9531 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
9532 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
9533 | + | ||
9534 | +# Is the header present? | ||
9535 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
9536 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
9537 | +cat >conftest.$ac_ext <<_ACEOF | ||
9538 | +/* confdefs.h. */ | ||
9539 | +_ACEOF | ||
9540 | +cat confdefs.h >>conftest.$ac_ext | ||
9541 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9542 | +/* end confdefs.h. */ | ||
9543 | +#include <$ac_header> | ||
9544 | +_ACEOF | ||
9545 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
9546 | +case "(($ac_try" in | ||
9547 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9548 | + *) ac_try_echo=$ac_try;; | ||
9549 | +esac | ||
9550 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9551 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
9552 | + ac_status=$? | ||
9553 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9554 | + rm -f conftest.er1 | ||
9555 | + cat conftest.err >&5 | ||
9556 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9557 | + (exit $ac_status); } >/dev/null && { | ||
9558 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
9559 | + test ! -s conftest.err | ||
9560 | + }; then | ||
9561 | + ac_header_preproc=yes | ||
9562 | +else | ||
9563 | + echo "$as_me: failed program was:" >&5 | ||
9564 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9565 | + | ||
9566 | + ac_header_preproc=no | ||
9567 | +fi | ||
9568 | + | ||
9569 | +rm -f conftest.err conftest.$ac_ext | ||
9570 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
9571 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
9572 | + | ||
9573 | +# So? What about this header? | ||
9574 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
9575 | + yes:no: ) | ||
9576 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
9577 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
9578 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
9579 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
9580 | + ac_header_preproc=yes | ||
9581 | + ;; | ||
9582 | + no:yes:* ) | ||
9583 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
9584 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
9585 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
9586 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
9587 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
9588 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
9589 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
9590 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
9591 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
9592 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
9593 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
9594 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
9595 | + | ||
9596 | + ;; | ||
9597 | +esac | ||
9598 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
9599 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
9600 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
9601 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9602 | +else | ||
9603 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
9604 | +fi | ||
9605 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
9606 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
9607 | +echo "${ECHO_T}$ac_res" >&6; } | ||
9608 | + | ||
9609 | +fi | ||
9610 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
9611 | cat >>confdefs.h <<_ACEOF | ||
9612 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
9613 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
9614 | _ACEOF | ||
9615 | |||
9616 | fi | ||
9617 | @@ -5782,12 +8661,16 @@ done | ||
9618 | # or some older version of Solaris, with | ||
9619 | # just SIOCGIFCONF. | ||
9620 | # | ||
9621 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have SIOCGLIFCONF" >&5 | ||
9622 | -$as_echo_n "checking whether we have SIOCGLIFCONF... " >&6; } | ||
9623 | - if test "${ac_cv_lbl_have_siocglifconf+set}" = set; then : | ||
9624 | - $as_echo_n "(cached) " >&6 | ||
9625 | + { echo "$as_me:$LINENO: checking whether we have SIOCGLIFCONF" >&5 | ||
9626 | +echo $ECHO_N "checking whether we have SIOCGLIFCONF... $ECHO_C" >&6; } | ||
9627 | + if test "${ac_cv_lbl_have_siocglifconf+set}" = set; then | ||
9628 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9629 | else | ||
9630 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9631 | + cat >conftest.$ac_ext <<_ACEOF | ||
9632 | +/* confdefs.h. */ | ||
9633 | +_ACEOF | ||
9634 | +cat confdefs.h >>conftest.$ac_ext | ||
9635 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9636 | /* end confdefs.h. */ | ||
9637 | #include <sys/param.h> | ||
9638 | #include <sys/file.h> | ||
9639 | @@ -5802,16 +8685,36 @@ ioctl(0, SIOCGLIFCONF, (char *)0); | ||
9640 | return 0; | ||
9641 | } | ||
9642 | _ACEOF | ||
9643 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
9644 | +rm -f conftest.$ac_objext | ||
9645 | +if { (ac_try="$ac_compile" | ||
9646 | +case "(($ac_try" in | ||
9647 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9648 | + *) ac_try_echo=$ac_try;; | ||
9649 | +esac | ||
9650 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9651 | + (eval "$ac_compile") 2>conftest.er1 | ||
9652 | + ac_status=$? | ||
9653 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9654 | + rm -f conftest.er1 | ||
9655 | + cat conftest.err >&5 | ||
9656 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9657 | + (exit $ac_status); } && { | ||
9658 | + test -z "$ac_c_werror_flag" || | ||
9659 | + test ! -s conftest.err | ||
9660 | + } && test -s conftest.$ac_objext; then | ||
9661 | ac_cv_lbl_have_siocglifconf=yes | ||
9662 | else | ||
9663 | - ac_cv_lbl_have_siocglifconf=no | ||
9664 | + echo "$as_me: failed program was:" >&5 | ||
9665 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9666 | + | ||
9667 | + ac_cv_lbl_have_siocglifconf=no | ||
9668 | fi | ||
9669 | + | ||
9670 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
9671 | fi | ||
9672 | |||
9673 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_have_siocglifconf" >&5 | ||
9674 | -$as_echo "$ac_cv_lbl_have_siocglifconf" >&6; } | ||
9675 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_have_siocglifconf" >&5 | ||
9676 | +echo "${ECHO_T}$ac_cv_lbl_have_siocglifconf" >&6; } | ||
9677 | if test $ac_cv_lbl_have_siocglifconf = yes ; then | ||
9678 | V_FINDALLDEVS=glifc | ||
9679 | else | ||
9680 | @@ -5840,9 +8743,13 @@ fi | ||
9681 | fi | ||
9682 | |||
9683 | |||
9684 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 | ||
9685 | -$as_echo_n "checking for socklen_t... " >&6; } | ||
9686 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9687 | +{ echo "$as_me:$LINENO: checking for socklen_t" >&5 | ||
9688 | +echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; } | ||
9689 | +cat >conftest.$ac_ext <<_ACEOF | ||
9690 | +/* confdefs.h. */ | ||
9691 | +_ACEOF | ||
9692 | +cat confdefs.h >>conftest.$ac_ext | ||
9693 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9694 | /* end confdefs.h. */ | ||
9695 | |||
9696 | #include <sys/types.h> | ||
9697 | @@ -5856,82 +8763,191 @@ main () | ||
9698 | return 0; | ||
9699 | } | ||
9700 | _ACEOF | ||
9701 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
9702 | +rm -f conftest.$ac_objext | ||
9703 | +if { (ac_try="$ac_compile" | ||
9704 | +case "(($ac_try" in | ||
9705 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9706 | + *) ac_try_echo=$ac_try;; | ||
9707 | +esac | ||
9708 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9709 | + (eval "$ac_compile") 2>conftest.er1 | ||
9710 | + ac_status=$? | ||
9711 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9712 | + rm -f conftest.er1 | ||
9713 | + cat conftest.err >&5 | ||
9714 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9715 | + (exit $ac_status); } && { | ||
9716 | + test -z "$ac_c_werror_flag" || | ||
9717 | + test ! -s conftest.err | ||
9718 | + } && test -s conftest.$ac_objext; then | ||
9719 | have_socklen_t=yes | ||
9720 | else | ||
9721 | - have_socklen_t=no | ||
9722 | + echo "$as_me: failed program was:" >&5 | ||
9723 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9724 | + | ||
9725 | + have_socklen_t=no | ||
9726 | fi | ||
9727 | + | ||
9728 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
9729 | if test "x$have_socklen_t" = "xyes"; then | ||
9730 | |||
9731 | -$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h | ||
9732 | +cat >>confdefs.h <<\_ACEOF | ||
9733 | +#define HAVE_SOCKLEN_T 1 | ||
9734 | +_ACEOF | ||
9735 | |||
9736 | fi | ||
9737 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_socklen_t" >&5 | ||
9738 | -$as_echo "$have_socklen_t" >&6; } | ||
9739 | +{ echo "$as_me:$LINENO: result: $have_socklen_t" >&5 | ||
9740 | +echo "${ECHO_T}$have_socklen_t" >&6; } | ||
9741 | |||
9742 | # Check whether --enable-ipv6 was given. | ||
9743 | -if test "${enable_ipv6+set}" = set; then : | ||
9744 | +if test "${enable_ipv6+set}" = set; then | ||
9745 | enableval=$enable_ipv6; | ||
9746 | else | ||
9747 | enable_ipv6=ifavailable | ||
9748 | fi | ||
9749 | |||
9750 | if test "$enable_ipv6" != "no"; then | ||
9751 | - ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" | ||
9752 | -if test "x$ac_cv_func_getaddrinfo" = x""yes; then : | ||
9753 | + { echo "$as_me:$LINENO: checking for getaddrinfo" >&5 | ||
9754 | +echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; } | ||
9755 | +if test "${ac_cv_func_getaddrinfo+set}" = set; then | ||
9756 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9757 | +else | ||
9758 | + cat >conftest.$ac_ext <<_ACEOF | ||
9759 | +/* confdefs.h. */ | ||
9760 | +_ACEOF | ||
9761 | +cat confdefs.h >>conftest.$ac_ext | ||
9762 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9763 | +/* end confdefs.h. */ | ||
9764 | +/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo. | ||
9765 | + For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
9766 | +#define getaddrinfo innocuous_getaddrinfo | ||
9767 | + | ||
9768 | +/* System header to define __stub macros and hopefully few prototypes, | ||
9769 | + which can conflict with char getaddrinfo (); below. | ||
9770 | + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
9771 | + <limits.h> exists even on freestanding compilers. */ | ||
9772 | + | ||
9773 | +#ifdef __STDC__ | ||
9774 | +# include <limits.h> | ||
9775 | +#else | ||
9776 | +# include <assert.h> | ||
9777 | +#endif | ||
9778 | + | ||
9779 | +#undef getaddrinfo | ||
9780 | + | ||
9781 | +/* Override any GCC internal prototype to avoid an error. | ||
9782 | + Use char because int might match the return type of a GCC | ||
9783 | + builtin and then its argument prototype would still apply. */ | ||
9784 | +#ifdef __cplusplus | ||
9785 | +extern "C" | ||
9786 | +#endif | ||
9787 | +char getaddrinfo (); | ||
9788 | +/* The GNU C library defines this for functions which it implements | ||
9789 | + to always fail with ENOSYS. Some functions are actually named | ||
9790 | + something starting with __ and the normal name is an alias. */ | ||
9791 | +#if defined __stub_getaddrinfo || defined __stub___getaddrinfo | ||
9792 | +choke me | ||
9793 | +#endif | ||
9794 | + | ||
9795 | +int | ||
9796 | +main () | ||
9797 | +{ | ||
9798 | +return getaddrinfo (); | ||
9799 | + ; | ||
9800 | + return 0; | ||
9801 | +} | ||
9802 | +_ACEOF | ||
9803 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
9804 | +if { (ac_try="$ac_link" | ||
9805 | +case "(($ac_try" in | ||
9806 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9807 | + *) ac_try_echo=$ac_try;; | ||
9808 | +esac | ||
9809 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9810 | + (eval "$ac_link") 2>conftest.er1 | ||
9811 | + ac_status=$? | ||
9812 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
9813 | + rm -f conftest.er1 | ||
9814 | + cat conftest.err >&5 | ||
9815 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9816 | + (exit $ac_status); } && { | ||
9817 | + test -z "$ac_c_werror_flag" || | ||
9818 | + test ! -s conftest.err | ||
9819 | + } && test -s conftest$ac_exeext && | ||
9820 | + $as_test_x conftest$ac_exeext; then | ||
9821 | + ac_cv_func_getaddrinfo=yes | ||
9822 | +else | ||
9823 | + echo "$as_me: failed program was:" >&5 | ||
9824 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
9825 | + | ||
9826 | + ac_cv_func_getaddrinfo=no | ||
9827 | +fi | ||
9828 | + | ||
9829 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
9830 | + conftest$ac_exeext conftest.$ac_ext | ||
9831 | +fi | ||
9832 | +{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 | ||
9833 | +echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; } | ||
9834 | +if test $ac_cv_func_getaddrinfo = yes; then | ||
9835 | |||
9836 | |||
9837 | -$as_echo "#define INET6 1" >>confdefs.h | ||
9838 | +cat >>confdefs.h <<\_ACEOF | ||
9839 | +#define INET6 1 | ||
9840 | +_ACEOF | ||
9841 | |||
9842 | |||
9843 | else | ||
9844 | |||
9845 | if test "$enable_ipv6" != "ifavailable"; then | ||
9846 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
9847 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
9848 | -as_fn_error $? "--enable-ipv6 was given, but getaddrinfo isn't available | ||
9849 | -See \`config.log' for more details" "$LINENO" 5 ; } | ||
9850 | + { { echo "$as_me:$LINENO: error: --enable-ipv6 was given, but getaddrinfo isn't available | ||
9851 | +See \`config.log' for more details." >&5 | ||
9852 | +echo "$as_me: error: --enable-ipv6 was given, but getaddrinfo isn't available | ||
9853 | +See \`config.log' for more details." >&2;} | ||
9854 | + { (exit 1); exit 1; }; } | ||
9855 | fi | ||
9856 | |||
9857 | fi | ||
9858 | |||
9859 | fi | ||
9860 | |||
9861 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build optimizer debugging code" >&5 | ||
9862 | -$as_echo_n "checking whether to build optimizer debugging code... " >&6; } | ||
9863 | +{ echo "$as_me:$LINENO: checking whether to build optimizer debugging code" >&5 | ||
9864 | +echo $ECHO_N "checking whether to build optimizer debugging code... $ECHO_C" >&6; } | ||
9865 | # Check whether --enable-optimizer-dbg was given. | ||
9866 | -if test "${enable_optimizer_dbg+set}" = set; then : | ||
9867 | +if test "${enable_optimizer_dbg+set}" = set; then | ||
9868 | enableval=$enable_optimizer_dbg; | ||
9869 | fi | ||
9870 | |||
9871 | if test "$enable_optimizer_dbg" = "yes"; then | ||
9872 | |||
9873 | -$as_echo "#define BDEBUG 1" >>confdefs.h | ||
9874 | +cat >>confdefs.h <<\_ACEOF | ||
9875 | +#define BDEBUG 1 | ||
9876 | +_ACEOF | ||
9877 | |||
9878 | fi | ||
9879 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_optimizer_dbg-no}" >&5 | ||
9880 | -$as_echo "${enable_optimizer_dbg-no}" >&6; } | ||
9881 | +{ echo "$as_me:$LINENO: result: ${enable_optimizer_dbg-no}" >&5 | ||
9882 | +echo "${ECHO_T}${enable_optimizer_dbg-no}" >&6; } | ||
9883 | |||
9884 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build parser debugging code" >&5 | ||
9885 | -$as_echo_n "checking whether to build parser debugging code... " >&6; } | ||
9886 | +{ echo "$as_me:$LINENO: checking whether to build parser debugging code" >&5 | ||
9887 | +echo $ECHO_N "checking whether to build parser debugging code... $ECHO_C" >&6; } | ||
9888 | # Check whether --enable-yydebug was given. | ||
9889 | -if test "${enable_yydebug+set}" = set; then : | ||
9890 | +if test "${enable_yydebug+set}" = set; then | ||
9891 | enableval=$enable_yydebug; | ||
9892 | fi | ||
9893 | |||
9894 | if test "$enable_yydebug" = "yes"; then | ||
9895 | |||
9896 | -$as_echo "#define YYDEBUG 1" >>confdefs.h | ||
9897 | +cat >>confdefs.h <<\_ACEOF | ||
9898 | +#define YYDEBUG 1 | ||
9899 | +_ACEOF | ||
9900 | |||
9901 | fi | ||
9902 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_yydebug-no}" >&5 | ||
9903 | -$as_echo "${enable_yydebug-no}" >&6; } | ||
9904 | +{ echo "$as_me:$LINENO: result: ${enable_yydebug-no}" >&5 | ||
9905 | +echo "${ECHO_T}${enable_yydebug-no}" >&6; } | ||
9906 | |||
9907 | # Check for Endace DAG card support. | ||
9908 | |||
9909 | # Check whether --with-dag was given. | ||
9910 | -if test "${with_dag+set}" = set; then : | ||
9911 | +if test "${with_dag+set}" = set; then | ||
9912 | withval=$with_dag; | ||
9913 | if test "$withval" = no | ||
9914 | then | ||
9915 | @@ -5959,7 +8975,7 @@ fi | ||
9916 | |||
9917 | |||
9918 | # Check whether --with-dag-includes was given. | ||
9919 | -if test "${with_dag_includes+set}" = set; then : | ||
9920 | +if test "${with_dag_includes+set}" = set; then | ||
9921 | withval=$with_dag_includes; | ||
9922 | # User wants DAG support and has specified a header directory, so use the provided value. | ||
9923 | want_dag=yes | ||
9924 | @@ -5970,7 +8986,7 @@ fi | ||
9925 | |||
9926 | |||
9927 | # Check whether --with-dag-libraries was given. | ||
9928 | -if test "${with_dag_libraries+set}" = set; then : | ||
9929 | +if test "${with_dag_libraries+set}" = set; then | ||
9930 | withval=$with_dag_libraries; | ||
9931 | # User wants DAG support and has specified a library directory, so use the provided value. | ||
9932 | want_dag=yes | ||
9933 | @@ -5994,7 +9010,9 @@ linux|bpf|dag) | ||
9934 | # If they expressed no preference, don't include it. | ||
9935 | # | ||
9936 | if test $want_dag = yes; then | ||
9937 | - as_fn_error $? "DAG support is only available with 'linux' 'bpf' and 'dag' packet capture types" "$LINENO" 5 | ||
9938 | + { { echo "$as_me:$LINENO: error: DAG support is only available with 'linux' 'bpf' and 'dag' packet capture types" >&5 | ||
9939 | +echo "$as_me: error: DAG support is only available with 'linux' 'bpf' and 'dag' packet capture types" >&2;} | ||
9940 | + { (exit 1); exit 1; }; } | ||
9941 | elif test $want_dag = yes; then | ||
9942 | want_dag=no | ||
9943 | fi | ||
9944 | @@ -6004,8 +9022,8 @@ esac | ||
9945 | ac_cv_lbl_dag_api=no | ||
9946 | if test "$want_dag" != no; then | ||
9947 | |||
9948 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have DAG API headers" >&5 | ||
9949 | -$as_echo_n "checking whether we have DAG API headers... " >&6; } | ||
9950 | + { echo "$as_me:$LINENO: checking whether we have DAG API headers" >&5 | ||
9951 | +echo $ECHO_N "checking whether we have DAG API headers... $ECHO_C" >&6; } | ||
9952 | |||
9953 | # If necessary, set default paths for DAG API headers and libraries. | ||
9954 | if test -z "$dag_root"; then | ||
9955 | @@ -6027,8 +9045,8 @@ $as_echo_n "checking whether we have DAG API headers... " >&6; } | ||
9956 | if test -r $dag_include_dir/dagapi.h; then | ||
9957 | ac_cv_lbl_dag_api=yes | ||
9958 | fi | ||
9959 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_dag_api ($dag_include_dir)" >&5 | ||
9960 | -$as_echo "$ac_cv_lbl_dag_api ($dag_include_dir)" >&6; } | ||
9961 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_dag_api ($dag_include_dir)" >&5 | ||
9962 | +echo "${ECHO_T}$ac_cv_lbl_dag_api ($dag_include_dir)" >&6; } | ||
9963 | fi | ||
9964 | |||
9965 | if test $ac_cv_lbl_dag_api = yes; then | ||
9966 | @@ -6043,14 +9061,18 @@ if test $ac_cv_lbl_dag_api = yes; then | ||
9967 | # included if there's a found-action (arg 3). | ||
9968 | saved_ldflags=$LDFLAGS | ||
9969 | LDFLAGS="-L$dag_lib_dir" | ||
9970 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dag_attach_stream in -ldag" >&5 | ||
9971 | -$as_echo_n "checking for dag_attach_stream in -ldag... " >&6; } | ||
9972 | -if test "${ac_cv_lib_dag_dag_attach_stream+set}" = set; then : | ||
9973 | - $as_echo_n "(cached) " >&6 | ||
9974 | + { echo "$as_me:$LINENO: checking for dag_attach_stream in -ldag" >&5 | ||
9975 | +echo $ECHO_N "checking for dag_attach_stream in -ldag... $ECHO_C" >&6; } | ||
9976 | +if test "${ac_cv_lib_dag_dag_attach_stream+set}" = set; then | ||
9977 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9978 | else | ||
9979 | ac_check_lib_save_LIBS=$LIBS | ||
9980 | LIBS="-ldag $LIBS" | ||
9981 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
9982 | +cat >conftest.$ac_ext <<_ACEOF | ||
9983 | +/* confdefs.h. */ | ||
9984 | +_ACEOF | ||
9985 | +cat confdefs.h >>conftest.$ac_ext | ||
9986 | +cat >>conftest.$ac_ext <<_ACEOF | ||
9987 | /* end confdefs.h. */ | ||
9988 | |||
9989 | /* Override any GCC internal prototype to avoid an error. | ||
9990 | @@ -6068,31 +9090,56 @@ return dag_attach_stream (); | ||
9991 | return 0; | ||
9992 | } | ||
9993 | _ACEOF | ||
9994 | -if ac_fn_c_try_link "$LINENO"; then : | ||
9995 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
9996 | +if { (ac_try="$ac_link" | ||
9997 | +case "(($ac_try" in | ||
9998 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9999 | + *) ac_try_echo=$ac_try;; | ||
10000 | +esac | ||
10001 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10002 | + (eval "$ac_link") 2>conftest.er1 | ||
10003 | + ac_status=$? | ||
10004 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
10005 | + rm -f conftest.er1 | ||
10006 | + cat conftest.err >&5 | ||
10007 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10008 | + (exit $ac_status); } && { | ||
10009 | + test -z "$ac_c_werror_flag" || | ||
10010 | + test ! -s conftest.err | ||
10011 | + } && test -s conftest$ac_exeext && | ||
10012 | + $as_test_x conftest$ac_exeext; then | ||
10013 | ac_cv_lib_dag_dag_attach_stream=yes | ||
10014 | else | ||
10015 | - ac_cv_lib_dag_dag_attach_stream=no | ||
10016 | + echo "$as_me: failed program was:" >&5 | ||
10017 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
10018 | + | ||
10019 | + ac_cv_lib_dag_dag_attach_stream=no | ||
10020 | fi | ||
10021 | -rm -f core conftest.err conftest.$ac_objext \ | ||
10022 | - conftest$ac_exeext conftest.$ac_ext | ||
10023 | + | ||
10024 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10025 | + conftest$ac_exeext conftest.$ac_ext | ||
10026 | LIBS=$ac_check_lib_save_LIBS | ||
10027 | fi | ||
10028 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dag_dag_attach_stream" >&5 | ||
10029 | -$as_echo "$ac_cv_lib_dag_dag_attach_stream" >&6; } | ||
10030 | -if test "x$ac_cv_lib_dag_dag_attach_stream" = x""yes; then : | ||
10031 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dag_dag_attach_stream" >&5 | ||
10032 | +echo "${ECHO_T}$ac_cv_lib_dag_dag_attach_stream" >&6; } | ||
10033 | +if test $ac_cv_lib_dag_dag_attach_stream = yes; then | ||
10034 | dag_streams="1" | ||
10035 | else | ||
10036 | dag_streams="0" | ||
10037 | fi | ||
10038 | |||
10039 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dag_get_erf_types in -ldag" >&5 | ||
10040 | -$as_echo_n "checking for dag_get_erf_types in -ldag... " >&6; } | ||
10041 | -if test "${ac_cv_lib_dag_dag_get_erf_types+set}" = set; then : | ||
10042 | - $as_echo_n "(cached) " >&6 | ||
10043 | + { echo "$as_me:$LINENO: checking for dag_get_erf_types in -ldag" >&5 | ||
10044 | +echo $ECHO_N "checking for dag_get_erf_types in -ldag... $ECHO_C" >&6; } | ||
10045 | +if test "${ac_cv_lib_dag_dag_get_erf_types+set}" = set; then | ||
10046 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10047 | else | ||
10048 | ac_check_lib_save_LIBS=$LIBS | ||
10049 | LIBS="-ldag $LIBS" | ||
10050 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10051 | +cat >conftest.$ac_ext <<_ACEOF | ||
10052 | +/* confdefs.h. */ | ||
10053 | +_ACEOF | ||
10054 | +cat confdefs.h >>conftest.$ac_ext | ||
10055 | +cat >>conftest.$ac_ext <<_ACEOF | ||
10056 | /* end confdefs.h. */ | ||
10057 | |||
10058 | /* Override any GCC internal prototype to avoid an error. | ||
10059 | @@ -6110,32 +9157,59 @@ return dag_get_erf_types (); | ||
10060 | return 0; | ||
10061 | } | ||
10062 | _ACEOF | ||
10063 | -if ac_fn_c_try_link "$LINENO"; then : | ||
10064 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
10065 | +if { (ac_try="$ac_link" | ||
10066 | +case "(($ac_try" in | ||
10067 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10068 | + *) ac_try_echo=$ac_try;; | ||
10069 | +esac | ||
10070 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10071 | + (eval "$ac_link") 2>conftest.er1 | ||
10072 | + ac_status=$? | ||
10073 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
10074 | + rm -f conftest.er1 | ||
10075 | + cat conftest.err >&5 | ||
10076 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10077 | + (exit $ac_status); } && { | ||
10078 | + test -z "$ac_c_werror_flag" || | ||
10079 | + test ! -s conftest.err | ||
10080 | + } && test -s conftest$ac_exeext && | ||
10081 | + $as_test_x conftest$ac_exeext; then | ||
10082 | ac_cv_lib_dag_dag_get_erf_types=yes | ||
10083 | else | ||
10084 | - ac_cv_lib_dag_dag_get_erf_types=no | ||
10085 | + echo "$as_me: failed program was:" >&5 | ||
10086 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
10087 | + | ||
10088 | + ac_cv_lib_dag_dag_get_erf_types=no | ||
10089 | fi | ||
10090 | -rm -f core conftest.err conftest.$ac_objext \ | ||
10091 | - conftest$ac_exeext conftest.$ac_ext | ||
10092 | + | ||
10093 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10094 | + conftest$ac_exeext conftest.$ac_ext | ||
10095 | LIBS=$ac_check_lib_save_LIBS | ||
10096 | fi | ||
10097 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dag_dag_get_erf_types" >&5 | ||
10098 | -$as_echo "$ac_cv_lib_dag_dag_get_erf_types" >&6; } | ||
10099 | -if test "x$ac_cv_lib_dag_dag_get_erf_types" = x""yes; then : | ||
10100 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dag_dag_get_erf_types" >&5 | ||
10101 | +echo "${ECHO_T}$ac_cv_lib_dag_dag_get_erf_types" >&6; } | ||
10102 | +if test $ac_cv_lib_dag_dag_get_erf_types = yes; then | ||
10103 | |||
10104 | |||
10105 | -$as_echo "#define HAVE_DAG_GET_ERF_TYPES 1" >>confdefs.h | ||
10106 | +cat >>confdefs.h <<\_ACEOF | ||
10107 | +#define HAVE_DAG_GET_ERF_TYPES 1 | ||
10108 | +_ACEOF | ||
10109 | |||
10110 | fi | ||
10111 | |||
10112 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dag_get_stream_erf_types in -ldag" >&5 | ||
10113 | -$as_echo_n "checking for dag_get_stream_erf_types in -ldag... " >&6; } | ||
10114 | -if test "${ac_cv_lib_dag_dag_get_stream_erf_types+set}" = set; then : | ||
10115 | - $as_echo_n "(cached) " >&6 | ||
10116 | + { echo "$as_me:$LINENO: checking for dag_get_stream_erf_types in -ldag" >&5 | ||
10117 | +echo $ECHO_N "checking for dag_get_stream_erf_types in -ldag... $ECHO_C" >&6; } | ||
10118 | +if test "${ac_cv_lib_dag_dag_get_stream_erf_types+set}" = set; then | ||
10119 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10120 | else | ||
10121 | ac_check_lib_save_LIBS=$LIBS | ||
10122 | LIBS="-ldag $LIBS" | ||
10123 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10124 | +cat >conftest.$ac_ext <<_ACEOF | ||
10125 | +/* confdefs.h. */ | ||
10126 | +_ACEOF | ||
10127 | +cat confdefs.h >>conftest.$ac_ext | ||
10128 | +cat >>conftest.$ac_ext <<_ACEOF | ||
10129 | /* end confdefs.h. */ | ||
10130 | |||
10131 | /* Override any GCC internal prototype to avoid an error. | ||
10132 | @@ -6153,21 +9227,44 @@ return dag_get_stream_erf_types (); | ||
10133 | return 0; | ||
10134 | } | ||
10135 | _ACEOF | ||
10136 | -if ac_fn_c_try_link "$LINENO"; then : | ||
10137 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
10138 | +if { (ac_try="$ac_link" | ||
10139 | +case "(($ac_try" in | ||
10140 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10141 | + *) ac_try_echo=$ac_try;; | ||
10142 | +esac | ||
10143 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10144 | + (eval "$ac_link") 2>conftest.er1 | ||
10145 | + ac_status=$? | ||
10146 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
10147 | + rm -f conftest.er1 | ||
10148 | + cat conftest.err >&5 | ||
10149 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10150 | + (exit $ac_status); } && { | ||
10151 | + test -z "$ac_c_werror_flag" || | ||
10152 | + test ! -s conftest.err | ||
10153 | + } && test -s conftest$ac_exeext && | ||
10154 | + $as_test_x conftest$ac_exeext; then | ||
10155 | ac_cv_lib_dag_dag_get_stream_erf_types=yes | ||
10156 | else | ||
10157 | - ac_cv_lib_dag_dag_get_stream_erf_types=no | ||
10158 | + echo "$as_me: failed program was:" >&5 | ||
10159 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
10160 | + | ||
10161 | + ac_cv_lib_dag_dag_get_stream_erf_types=no | ||
10162 | fi | ||
10163 | -rm -f core conftest.err conftest.$ac_objext \ | ||
10164 | - conftest$ac_exeext conftest.$ac_ext | ||
10165 | + | ||
10166 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10167 | + conftest$ac_exeext conftest.$ac_ext | ||
10168 | LIBS=$ac_check_lib_save_LIBS | ||
10169 | fi | ||
10170 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dag_dag_get_stream_erf_types" >&5 | ||
10171 | -$as_echo "$ac_cv_lib_dag_dag_get_stream_erf_types" >&6; } | ||
10172 | -if test "x$ac_cv_lib_dag_dag_get_stream_erf_types" = x""yes; then : | ||
10173 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dag_dag_get_stream_erf_types" >&5 | ||
10174 | +echo "${ECHO_T}$ac_cv_lib_dag_dag_get_stream_erf_types" >&6; } | ||
10175 | +if test $ac_cv_lib_dag_dag_get_stream_erf_types = yes; then | ||
10176 | |||
10177 | |||
10178 | -$as_echo "#define HAVE_DAG_GET_STREAM_ERF_TYPES 1" >>confdefs.h | ||
10179 | +cat >>confdefs.h <<\_ACEOF | ||
10180 | +#define HAVE_DAG_GET_STREAM_ERF_TYPES 1 | ||
10181 | +_ACEOF | ||
10182 | |||
10183 | fi | ||
10184 | |||
10185 | @@ -6176,19 +9273,25 @@ fi | ||
10186 | |||
10187 | if test "$dag_streams" = 1; then | ||
10188 | |||
10189 | -$as_echo "#define HAVE_DAG_STREAMS_API 1" >>confdefs.h | ||
10190 | +cat >>confdefs.h <<\_ACEOF | ||
10191 | +#define HAVE_DAG_STREAMS_API 1 | ||
10192 | +_ACEOF | ||
10193 | |||
10194 | LIBS="$LIBS -ldag" | ||
10195 | LDFLAGS="$LDFLAGS -L$dag_lib_dir" | ||
10196 | |||
10197 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vdag_set_device_info in -lvdag" >&5 | ||
10198 | -$as_echo_n "checking for vdag_set_device_info in -lvdag... " >&6; } | ||
10199 | -if test "${ac_cv_lib_vdag_vdag_set_device_info+set}" = set; then : | ||
10200 | - $as_echo_n "(cached) " >&6 | ||
10201 | + { echo "$as_me:$LINENO: checking for vdag_set_device_info in -lvdag" >&5 | ||
10202 | +echo $ECHO_N "checking for vdag_set_device_info in -lvdag... $ECHO_C" >&6; } | ||
10203 | +if test "${ac_cv_lib_vdag_vdag_set_device_info+set}" = set; then | ||
10204 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10205 | else | ||
10206 | ac_check_lib_save_LIBS=$LIBS | ||
10207 | LIBS="-lvdag $LIBS" | ||
10208 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10209 | +cat >conftest.$ac_ext <<_ACEOF | ||
10210 | +/* confdefs.h. */ | ||
10211 | +_ACEOF | ||
10212 | +cat confdefs.h >>conftest.$ac_ext | ||
10213 | +cat >>conftest.$ac_ext <<_ACEOF | ||
10214 | /* end confdefs.h. */ | ||
10215 | |||
10216 | /* Override any GCC internal prototype to avoid an error. | ||
10217 | @@ -6206,18 +9309,39 @@ return vdag_set_device_info (); | ||
10218 | return 0; | ||
10219 | } | ||
10220 | _ACEOF | ||
10221 | -if ac_fn_c_try_link "$LINENO"; then : | ||
10222 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
10223 | +if { (ac_try="$ac_link" | ||
10224 | +case "(($ac_try" in | ||
10225 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10226 | + *) ac_try_echo=$ac_try;; | ||
10227 | +esac | ||
10228 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10229 | + (eval "$ac_link") 2>conftest.er1 | ||
10230 | + ac_status=$? | ||
10231 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
10232 | + rm -f conftest.er1 | ||
10233 | + cat conftest.err >&5 | ||
10234 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10235 | + (exit $ac_status); } && { | ||
10236 | + test -z "$ac_c_werror_flag" || | ||
10237 | + test ! -s conftest.err | ||
10238 | + } && test -s conftest$ac_exeext && | ||
10239 | + $as_test_x conftest$ac_exeext; then | ||
10240 | ac_cv_lib_vdag_vdag_set_device_info=yes | ||
10241 | else | ||
10242 | - ac_cv_lib_vdag_vdag_set_device_info=no | ||
10243 | + echo "$as_me: failed program was:" >&5 | ||
10244 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
10245 | + | ||
10246 | + ac_cv_lib_vdag_vdag_set_device_info=no | ||
10247 | fi | ||
10248 | -rm -f core conftest.err conftest.$ac_objext \ | ||
10249 | - conftest$ac_exeext conftest.$ac_ext | ||
10250 | + | ||
10251 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10252 | + conftest$ac_exeext conftest.$ac_ext | ||
10253 | LIBS=$ac_check_lib_save_LIBS | ||
10254 | fi | ||
10255 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vdag_vdag_set_device_info" >&5 | ||
10256 | -$as_echo "$ac_cv_lib_vdag_vdag_set_device_info" >&6; } | ||
10257 | -if test "x$ac_cv_lib_vdag_vdag_set_device_info" = x""yes; then : | ||
10258 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_vdag_vdag_set_device_info" >&5 | ||
10259 | +echo "${ECHO_T}$ac_cv_lib_vdag_vdag_set_device_info" >&6; } | ||
10260 | +if test $ac_cv_lib_vdag_vdag_set_device_info = yes; then | ||
10261 | ac_dag_have_vdag="1" | ||
10262 | else | ||
10263 | ac_dag_have_vdag="0" | ||
10264 | @@ -6225,41 +9349,49 @@ fi | ||
10265 | |||
10266 | if test "$ac_dag_have_vdag" = 1; then | ||
10267 | |||
10268 | -$as_echo "#define HAVE_DAG_VDAG 1" >>confdefs.h | ||
10269 | +cat >>confdefs.h <<\_ACEOF | ||
10270 | +#define HAVE_DAG_VDAG 1 | ||
10271 | +_ACEOF | ||
10272 | |||
10273 | LIBS="$LIBS -lpthread" | ||
10274 | fi | ||
10275 | fi | ||
10276 | |||
10277 | |||
10278 | -$as_echo "#define HAVE_DAG_API 1" >>confdefs.h | ||
10279 | +cat >>confdefs.h <<\_ACEOF | ||
10280 | +#define HAVE_DAG_API 1 | ||
10281 | +_ACEOF | ||
10282 | |||
10283 | fi | ||
10284 | |||
10285 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have the DAG API" >&5 | ||
10286 | -$as_echo_n "checking whether we have the DAG API... " >&6; } | ||
10287 | +{ echo "$as_me:$LINENO: checking whether we have the DAG API" >&5 | ||
10288 | +echo $ECHO_N "checking whether we have the DAG API... $ECHO_C" >&6; } | ||
10289 | |||
10290 | if test $ac_cv_lbl_dag_api = no; then | ||
10291 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10292 | -$as_echo "no" >&6; } | ||
10293 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10294 | +echo "${ECHO_T}no" >&6; } | ||
10295 | if test "$want_dag" = yes; then | ||
10296 | # User wanted DAG support but we couldn't find it. | ||
10297 | - as_fn_error $? "DAG API requested, but not found at $dag_root: use --without-dag" "$LINENO" 5 | ||
10298 | + { { echo "$as_me:$LINENO: error: DAG API requested, but not found at $dag_root: use --without-dag" >&5 | ||
10299 | +echo "$as_me: error: DAG API requested, but not found at $dag_root: use --without-dag" >&2;} | ||
10300 | + { (exit 1); exit 1; }; } | ||
10301 | fi | ||
10302 | |||
10303 | if test "$V_PCAP" = dag; then | ||
10304 | # User requested "dag" capture type but the DAG API wasn't | ||
10305 | # found. | ||
10306 | - as_fn_error $? "Specifying the capture type as \"dag\" requires the DAG API to be present; use the --with-dag options to specify the location. (Try \"./configure --help\" for more information.)" "$LINENO" 5 | ||
10307 | + { { echo "$as_me:$LINENO: error: Specifying the capture type as \"dag\" requires the DAG API to be present; use the --with-dag options to specify the location. (Try \"./configure --help\" for more information.)" >&5 | ||
10308 | +echo "$as_me: error: Specifying the capture type as \"dag\" requires the DAG API to be present; use the --with-dag options to specify the location. (Try \"./configure --help\" for more information.)" >&2;} | ||
10309 | + { (exit 1); exit 1; }; } | ||
10310 | fi | ||
10311 | else | ||
10312 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
10313 | -$as_echo "yes" >&6; } | ||
10314 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
10315 | +echo "${ECHO_T}yes" >&6; } | ||
10316 | fi | ||
10317 | |||
10318 | |||
10319 | # Check whether --with-septel was given. | ||
10320 | -if test "${with_septel+set}" = set; then : | ||
10321 | +if test "${with_septel+set}" = set; then | ||
10322 | withval=$with_septel; | ||
10323 | if test "$withval" = no | ||
10324 | then | ||
10325 | @@ -6299,7 +9431,9 @@ linux|septel) | ||
10326 | # If they expressed no preference, don't include it. | ||
10327 | # | ||
10328 | if test $want_septel = yes; then | ||
10329 | - as_fn_error $? "Septel support only available with 'linux' and 'septel' packet capture types" "$LINENO" 5 | ||
10330 | + { { echo "$as_me:$LINENO: error: Septel support only available with 'linux' and 'septel' packet capture types" >&5 | ||
10331 | +echo "$as_me: error: Septel support only available with 'linux' and 'septel' packet capture types" >&2;} | ||
10332 | + { (exit 1); exit 1; }; } | ||
10333 | elif test $want_septel = yes; then | ||
10334 | want_septel=no | ||
10335 | fi | ||
10336 | @@ -6307,8 +9441,8 @@ linux|septel) | ||
10337 | esac | ||
10338 | |||
10339 | if test "$with_septel" != no; then | ||
10340 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have Septel API" >&5 | ||
10341 | -$as_echo_n "checking whether we have Septel API... " >&6; } | ||
10342 | + { echo "$as_me:$LINENO: checking whether we have Septel API" >&5 | ||
10343 | +echo $ECHO_N "checking whether we have Septel API... $ECHO_C" >&6; } | ||
10344 | |||
10345 | if test -z "$septel_root"; then | ||
10346 | septel_root=$srcdir/../septel | ||
10347 | @@ -6329,27 +9463,33 @@ $as_echo_n "checking whether we have Septel API... " >&6; } | ||
10348 | ac_cv_lbl_septel_api=yes | ||
10349 | fi | ||
10350 | |||
10351 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_septel_api" >&5 | ||
10352 | -$as_echo "$ac_cv_lbl_septel_api" >&6; } | ||
10353 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_septel_api" >&5 | ||
10354 | +echo "${ECHO_T}$ac_cv_lbl_septel_api" >&6; } | ||
10355 | if test $ac_cv_lbl_septel_api = no; then | ||
10356 | if test "$want_septel" = yes; then | ||
10357 | - as_fn_error $? "Septel API not found under directory $septel_root; use --without-septel" "$LINENO" 5 | ||
10358 | + { { echo "$as_me:$LINENO: error: Septel API not found under directory $septel_root; use --without-septel" >&5 | ||
10359 | +echo "$as_me: error: Septel API not found under directory $septel_root; use --without-septel" >&2;} | ||
10360 | + { (exit 1); exit 1; }; } | ||
10361 | fi | ||
10362 | else | ||
10363 | |||
10364 | -$as_echo "#define HAVE_SEPTEL_API 1" >>confdefs.h | ||
10365 | +cat >>confdefs.h <<\_ACEOF | ||
10366 | +#define HAVE_SEPTEL_API 1 | ||
10367 | +_ACEOF | ||
10368 | |||
10369 | fi | ||
10370 | fi | ||
10371 | |||
10372 | if test "$V_PCAP" = septel -a "$ac_cv_lbl_septel_api" = no; then | ||
10373 | - as_fn_error $? "Specifying the capture type as 'septel' requires the Septel API to be present; use --with-septel=DIR" "$LINENO" 5 | ||
10374 | + { { echo "$as_me:$LINENO: error: Specifying the capture type as 'septel' requires the Septel API to be present; use --with-septel=DIR" >&5 | ||
10375 | +echo "$as_me: error: Specifying the capture type as 'septel' requires the Septel API to be present; use --with-septel=DIR" >&2;} | ||
10376 | + { (exit 1); exit 1; }; } | ||
10377 | fi | ||
10378 | |||
10379 | # Check for Myricom SNF support. | ||
10380 | |||
10381 | # Check whether --with-snf was given. | ||
10382 | -if test "${with_snf+set}" = set; then : | ||
10383 | +if test "${with_snf+set}" = set; then | ||
10384 | withval=$with_snf; | ||
10385 | if test "$withval" = no | ||
10386 | then | ||
10387 | @@ -6377,7 +9517,7 @@ fi | ||
10388 | |||
10389 | |||
10390 | # Check whether --with-snf-includes was given. | ||
10391 | -if test "${with_snf_includes+set}" = set; then : | ||
10392 | +if test "${with_snf_includes+set}" = set; then | ||
10393 | withval=$with_snf_includes; | ||
10394 | # User wants SNF with specific header directory | ||
10395 | want_snf=yes | ||
10396 | @@ -6388,7 +9528,7 @@ fi | ||
10397 | |||
10398 | |||
10399 | # Check whether --with-snf-libraries was given. | ||
10400 | -if test "${with_snf_libraries+set}" = set; then : | ||
10401 | +if test "${with_snf_libraries+set}" = set; then | ||
10402 | withval=$with_snf_libraries; | ||
10403 | # User wants SNF with specific lib directory | ||
10404 | want_snf=yes | ||
10405 | @@ -6412,7 +9552,9 @@ bpf|linux|snf) | ||
10406 | # If they expressed no preference, don't include it. | ||
10407 | # | ||
10408 | if test $want_snf = yes; then | ||
10409 | - as_fn_error $? "Myricom SNF support only available with 'bpf' 'linux' and 'snf' packet capture types" "$LINENO" 5 | ||
10410 | + { { echo "$as_me:$LINENO: error: Myricom SNF support only available with 'bpf' 'linux' and 'snf' packet capture types" >&5 | ||
10411 | +echo "$as_me: error: Myricom SNF support only available with 'bpf' 'linux' and 'snf' packet capture types" >&2;} | ||
10412 | + { (exit 1); exit 1; }; } | ||
10413 | elif test $want_snf = yes; then | ||
10414 | want_snf=no | ||
10415 | fi | ||
10416 | @@ -6422,8 +9564,8 @@ esac | ||
10417 | ac_cv_lbl_snf_api=no | ||
10418 | if test "$with_snf" != no; then | ||
10419 | |||
10420 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have Myricom Sniffer API" >&5 | ||
10421 | -$as_echo_n "checking whether we have Myricom Sniffer API... " >&6; } | ||
10422 | + { echo "$as_me:$LINENO: checking whether we have Myricom Sniffer API" >&5 | ||
10423 | +echo $ECHO_N "checking whether we have Myricom Sniffer API... $ECHO_C" >&6; } | ||
10424 | |||
10425 | if test -z "$snf_root"; then | ||
10426 | snf_root=/opt/snf | ||
10427 | @@ -6440,24 +9582,30 @@ $as_echo_n "checking whether we have Myricom Sniffer API... " >&6; } | ||
10428 | if test -f "$snf_include_dir/snf.h"; then | ||
10429 | ac_cv_lbl_snf_api=yes | ||
10430 | fi | ||
10431 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_snf_api ($snf_root)" >&5 | ||
10432 | -$as_echo "$ac_cv_lbl_snf_api ($snf_root)" >&6; } | ||
10433 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_snf_api ($snf_root)" >&5 | ||
10434 | +echo "${ECHO_T}$ac_cv_lbl_snf_api ($snf_root)" >&6; } | ||
10435 | |||
10436 | if test $ac_cv_lbl_snf_api = no; then | ||
10437 | if test "$want_snf" = yes; then | ||
10438 | - as_fn_error $? "SNF API headers not found under $snf_include_dir; use --without-snf" "$LINENO" 5 | ||
10439 | + { { echo "$as_me:$LINENO: error: SNF API headers not found under $snf_include_dir; use --without-snf" >&5 | ||
10440 | +echo "$as_me: error: SNF API headers not found under $snf_include_dir; use --without-snf" >&2;} | ||
10441 | + { (exit 1); exit 1; }; } | ||
10442 | fi | ||
10443 | else | ||
10444 | saved_ldflags=$LDFLAGS | ||
10445 | LDFLAGS="$LDFLAGS -L$snf_lib_dir" | ||
10446 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snf_init in -lsnf" >&5 | ||
10447 | -$as_echo_n "checking for snf_init in -lsnf... " >&6; } | ||
10448 | -if test "${ac_cv_lib_snf_snf_init+set}" = set; then : | ||
10449 | - $as_echo_n "(cached) " >&6 | ||
10450 | + { echo "$as_me:$LINENO: checking for snf_init in -lsnf" >&5 | ||
10451 | +echo $ECHO_N "checking for snf_init in -lsnf... $ECHO_C" >&6; } | ||
10452 | +if test "${ac_cv_lib_snf_snf_init+set}" = set; then | ||
10453 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10454 | else | ||
10455 | ac_check_lib_save_LIBS=$LIBS | ||
10456 | LIBS="-lsnf $LIBS" | ||
10457 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10458 | +cat >conftest.$ac_ext <<_ACEOF | ||
10459 | +/* confdefs.h. */ | ||
10460 | +_ACEOF | ||
10461 | +cat confdefs.h >>conftest.$ac_ext | ||
10462 | +cat >>conftest.$ac_ext <<_ACEOF | ||
10463 | /* end confdefs.h. */ | ||
10464 | |||
10465 | /* Override any GCC internal prototype to avoid an error. | ||
10466 | @@ -6475,18 +9623,39 @@ return snf_init (); | ||
10467 | return 0; | ||
10468 | } | ||
10469 | _ACEOF | ||
10470 | -if ac_fn_c_try_link "$LINENO"; then : | ||
10471 | +rm -f conftest.$ac_objext conftest$ac_exeext | ||
10472 | +if { (ac_try="$ac_link" | ||
10473 | +case "(($ac_try" in | ||
10474 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10475 | + *) ac_try_echo=$ac_try;; | ||
10476 | +esac | ||
10477 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10478 | + (eval "$ac_link") 2>conftest.er1 | ||
10479 | + ac_status=$? | ||
10480 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
10481 | + rm -f conftest.er1 | ||
10482 | + cat conftest.err >&5 | ||
10483 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10484 | + (exit $ac_status); } && { | ||
10485 | + test -z "$ac_c_werror_flag" || | ||
10486 | + test ! -s conftest.err | ||
10487 | + } && test -s conftest$ac_exeext && | ||
10488 | + $as_test_x conftest$ac_exeext; then | ||
10489 | ac_cv_lib_snf_snf_init=yes | ||
10490 | else | ||
10491 | - ac_cv_lib_snf_snf_init=no | ||
10492 | + echo "$as_me: failed program was:" >&5 | ||
10493 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
10494 | + | ||
10495 | + ac_cv_lib_snf_snf_init=no | ||
10496 | fi | ||
10497 | -rm -f core conftest.err conftest.$ac_objext \ | ||
10498 | - conftest$ac_exeext conftest.$ac_ext | ||
10499 | + | ||
10500 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10501 | + conftest$ac_exeext conftest.$ac_ext | ||
10502 | LIBS=$ac_check_lib_save_LIBS | ||
10503 | fi | ||
10504 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_snf_snf_init" >&5 | ||
10505 | -$as_echo "$ac_cv_lib_snf_snf_init" >&6; } | ||
10506 | -if test "x$ac_cv_lib_snf_snf_init" = x""yes; then : | ||
10507 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_snf_snf_init" >&5 | ||
10508 | +echo "${ECHO_T}$ac_cv_lib_snf_snf_init" >&6; } | ||
10509 | +if test $ac_cv_lib_snf_snf_init = yes; then | ||
10510 | ac_cv_lbl_snf_api="yes" | ||
10511 | else | ||
10512 | ac_cv_lbl_snf_api="no" | ||
10513 | @@ -6496,7 +9665,9 @@ fi | ||
10514 | |||
10515 | if test $ac_cv_lbl_snf_api = no; then | ||
10516 | if test "$want_snf" = yes; then | ||
10517 | - as_fn_error $? "SNF API cannot correctly be linked check config.log; use --without-snf" "$LINENO" 5 | ||
10518 | + { { echo "$as_me:$LINENO: error: SNF API cannot correctly be linked check config.log; use --without-snf" >&5 | ||
10519 | +echo "$as_me: error: SNF API cannot correctly be linked check config.log; use --without-snf" >&2;} | ||
10520 | + { (exit 1); exit 1; }; } | ||
10521 | fi | ||
10522 | else | ||
10523 | V_INCLS="$V_INCLS -I$snf_include_dir" | ||
10524 | @@ -6506,25 +9677,29 @@ fi | ||
10525 | SSRC="pcap-snf.c" | ||
10526 | fi | ||
10527 | |||
10528 | -$as_echo "#define HAVE_SNF_API 1" >>confdefs.h | ||
10529 | +cat >>confdefs.h <<\_ACEOF | ||
10530 | +#define HAVE_SNF_API 1 | ||
10531 | +_ACEOF | ||
10532 | |||
10533 | fi | ||
10534 | fi | ||
10535 | fi | ||
10536 | |||
10537 | if test "$V_PCAP" = snf -a "$ac_cv_lbl_snf_api" = no; then | ||
10538 | - as_fn_error $? "Specifying the capture type as 'snf' requires the Myricom Sniffer API to be present; use --with-snf=DIR" "$LINENO" 5 | ||
10539 | + { { echo "$as_me:$LINENO: error: Specifying the capture type as 'snf' requires the Myricom Sniffer API to be present; use --with-snf=DIR" >&5 | ||
10540 | +echo "$as_me: error: Specifying the capture type as 'snf' requires the Myricom Sniffer API to be present; use --with-snf=DIR" >&2;} | ||
10541 | + { (exit 1); exit 1; }; } | ||
10542 | fi | ||
10543 | |||
10544 | |||
10545 | # Check whether --with-flex was given. | ||
10546 | -if test "${with_flex+set}" = set; then : | ||
10547 | +if test "${with_flex+set}" = set; then | ||
10548 | withval=$with_flex; | ||
10549 | fi | ||
10550 | |||
10551 | |||
10552 | # Check whether --with-bison was given. | ||
10553 | -if test "${with_bison+set}" = set; then : | ||
10554 | +if test "${with_bison+set}" = set; then | ||
10555 | withval=$with_bison; | ||
10556 | fi | ||
10557 | |||
10558 | @@ -6535,10 +9710,10 @@ fi | ||
10559 | do | ||
10560 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
10561 | set dummy $ac_prog; ac_word=$2 | ||
10562 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10563 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
10564 | -if test "${ac_cv_prog_V_LEX+set}" = set; then : | ||
10565 | - $as_echo_n "(cached) " >&6 | ||
10566 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10567 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
10568 | +if test "${ac_cv_prog_V_LEX+set}" = set; then | ||
10569 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10570 | else | ||
10571 | if test -n "$V_LEX"; then | ||
10572 | ac_cv_prog_V_LEX="$V_LEX" # Let the user override the test. | ||
10573 | @@ -6548,25 +9723,25 @@ for as_dir in $PATH | ||
10574 | do | ||
10575 | IFS=$as_save_IFS | ||
10576 | test -z "$as_dir" && as_dir=. | ||
10577 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10578 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10579 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10580 | ac_cv_prog_V_LEX="$ac_prog" | ||
10581 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10582 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10583 | break 2 | ||
10584 | fi | ||
10585 | done | ||
10586 | - done | ||
10587 | +done | ||
10588 | IFS=$as_save_IFS | ||
10589 | |||
10590 | fi | ||
10591 | fi | ||
10592 | V_LEX=$ac_cv_prog_V_LEX | ||
10593 | if test -n "$V_LEX"; then | ||
10594 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_LEX" >&5 | ||
10595 | -$as_echo "$V_LEX" >&6; } | ||
10596 | + { echo "$as_me:$LINENO: result: $V_LEX" >&5 | ||
10597 | +echo "${ECHO_T}$V_LEX" >&6; } | ||
10598 | else | ||
10599 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10600 | -$as_echo "no" >&6; } | ||
10601 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10602 | +echo "${ECHO_T}no" >&6; } | ||
10603 | fi | ||
10604 | |||
10605 | |||
10606 | @@ -6577,10 +9752,10 @@ test -n "$V_LEX" || V_LEX="lex" | ||
10607 | fi | ||
10608 | if test "$V_LEX" = flex ; then | ||
10609 | # The -V flag was added in 2.4 | ||
10610 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flex 2.4 or higher" >&5 | ||
10611 | -$as_echo_n "checking for flex 2.4 or higher... " >&6; } | ||
10612 | - if test "${ac_cv_lbl_flex_v24+set}" = set; then : | ||
10613 | - $as_echo_n "(cached) " >&6 | ||
10614 | + { echo "$as_me:$LINENO: checking for flex 2.4 or higher" >&5 | ||
10615 | +echo $ECHO_N "checking for flex 2.4 or higher... $ECHO_C" >&6; } | ||
10616 | + if test "${ac_cv_lbl_flex_v24+set}" = set; then | ||
10617 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10618 | else | ||
10619 | if flex -V >/dev/null 2>&1; then | ||
10620 | ac_cv_lbl_flex_v24=yes | ||
10621 | @@ -6589,12 +9764,12 @@ else | ||
10622 | fi | ||
10623 | fi | ||
10624 | |||
10625 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_flex_v24" >&5 | ||
10626 | -$as_echo "$ac_cv_lbl_flex_v24" >&6; } | ||
10627 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_flex_v24" >&5 | ||
10628 | +echo "${ECHO_T}$ac_cv_lbl_flex_v24" >&6; } | ||
10629 | if test $ac_cv_lbl_flex_v24 = no ; then | ||
10630 | s="2.4 or higher required" | ||
10631 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring obsolete flex executable ($s)" >&5 | ||
10632 | -$as_echo "$as_me: WARNING: ignoring obsolete flex executable ($s)" >&2;} | ||
10633 | + { echo "$as_me:$LINENO: WARNING: ignoring obsolete flex executable ($s)" >&5 | ||
10634 | +echo "$as_me: WARNING: ignoring obsolete flex executable ($s)" >&2;} | ||
10635 | V_LEX=lex | ||
10636 | fi | ||
10637 | fi | ||
10638 | @@ -6605,10 +9780,10 @@ $as_echo "$as_me: WARNING: ignoring obsolete flex executable ($s)" >&2;} | ||
10639 | do | ||
10640 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
10641 | set dummy $ac_prog; ac_word=$2 | ||
10642 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10643 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
10644 | -if test "${ac_cv_prog_V_YACC+set}" = set; then : | ||
10645 | - $as_echo_n "(cached) " >&6 | ||
10646 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10647 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
10648 | +if test "${ac_cv_prog_V_YACC+set}" = set; then | ||
10649 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10650 | else | ||
10651 | if test -n "$V_YACC"; then | ||
10652 | ac_cv_prog_V_YACC="$V_YACC" # Let the user override the test. | ||
10653 | @@ -6618,25 +9793,25 @@ for as_dir in $PATH | ||
10654 | do | ||
10655 | IFS=$as_save_IFS | ||
10656 | test -z "$as_dir" && as_dir=. | ||
10657 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10658 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10659 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10660 | ac_cv_prog_V_YACC="$ac_prog" | ||
10661 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10662 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10663 | break 2 | ||
10664 | fi | ||
10665 | done | ||
10666 | - done | ||
10667 | +done | ||
10668 | IFS=$as_save_IFS | ||
10669 | |||
10670 | fi | ||
10671 | fi | ||
10672 | V_YACC=$ac_cv_prog_V_YACC | ||
10673 | if test -n "$V_YACC"; then | ||
10674 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $V_YACC" >&5 | ||
10675 | -$as_echo "$V_YACC" >&6; } | ||
10676 | + { echo "$as_me:$LINENO: result: $V_YACC" >&5 | ||
10677 | +echo "${ECHO_T}$V_YACC" >&6; } | ||
10678 | else | ||
10679 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10680 | -$as_echo "no" >&6; } | ||
10681 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10682 | +echo "${ECHO_T}no" >&6; } | ||
10683 | fi | ||
10684 | |||
10685 | |||
10686 | @@ -6649,8 +9824,8 @@ test -n "$V_YACC" || V_YACC="yacc" | ||
10687 | V_YACC="$V_YACC -y" | ||
10688 | fi | ||
10689 | if test "$V_LEX" != lex -a "$V_YACC" = yacc -o "$V_LEX" = lex -a "$V_YACC" != yacc ; then | ||
10690 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: don't have both flex and bison; reverting to lex/yacc" >&5 | ||
10691 | -$as_echo "$as_me: WARNING: don't have both flex and bison; reverting to lex/yacc" >&2;} | ||
10692 | + { echo "$as_me:$LINENO: WARNING: don't have both flex and bison; reverting to lex/yacc" >&5 | ||
10693 | +echo "$as_me: WARNING: don't have both flex and bison; reverting to lex/yacc" >&2;} | ||
10694 | V_LEX=lex | ||
10695 | V_YACC=yacc | ||
10696 | fi | ||
10697 | @@ -6661,10 +9836,10 @@ $as_echo "$as_me: WARNING: don't have both flex and bison; reverting to lex/yacc | ||
10698 | if test "$V_LEX" = lex ; then | ||
10699 | # Some versions of lex can't handle the definitions section of scanner.l . | ||
10700 | # Try lexing it and complain if it can't deal. | ||
10701 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capable lex" >&5 | ||
10702 | -$as_echo_n "checking for capable lex... " >&6; } | ||
10703 | -if test "${tcpdump_cv_capable_lex+set}" = set; then : | ||
10704 | - $as_echo_n "(cached) " >&6 | ||
10705 | + { echo "$as_me:$LINENO: checking for capable lex" >&5 | ||
10706 | +echo $ECHO_N "checking for capable lex... $ECHO_C" >&6; } | ||
10707 | +if test "${tcpdump_cv_capable_lex+set}" = set; then | ||
10708 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10709 | else | ||
10710 | if lex -t scanner.l > /dev/null 2>&1; then | ||
10711 | tcpdump_cv_capable_lex=yes | ||
10712 | @@ -6672,13 +9847,18 @@ else | ||
10713 | tcpdump_cv_capable_lex=insufficient | ||
10714 | fi | ||
10715 | fi | ||
10716 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcpdump_cv_capable_lex" >&5 | ||
10717 | -$as_echo "$tcpdump_cv_capable_lex" >&6; } | ||
10718 | +{ echo "$as_me:$LINENO: result: $tcpdump_cv_capable_lex" >&5 | ||
10719 | +echo "${ECHO_T}$tcpdump_cv_capable_lex" >&6; } | ||
10720 | if test $tcpdump_cv_capable_lex = insufficient ; then | ||
10721 | - as_fn_error $? "Your operating system's lex is insufficient to compile | ||
10722 | + { { echo "$as_me:$LINENO: error: Your operating system's lex is insufficient to compile | ||
10723 | libpcap. flex is a lex replacement that has many advantages, including | ||
10724 | being able to compile libpcap. For more information, see | ||
10725 | - http://www.gnu.org/software/flex/flex.html ." "$LINENO" 5 | ||
10726 | + http://www.gnu.org/software/flex/flex.html ." >&5 | ||
10727 | +echo "$as_me: error: Your operating system's lex is insufficient to compile | ||
10728 | + libpcap. flex is a lex replacement that has many advantages, including | ||
10729 | + being able to compile libpcap. For more information, see | ||
10730 | + http://www.gnu.org/software/flex/flex.html ." >&2;} | ||
10731 | + { (exit 1); exit 1; }; } | ||
10732 | fi | ||
10733 | fi | ||
10734 | |||
10735 | @@ -6694,7 +9874,9 @@ case "$host_os" in | ||
10736 | |||
10737 | aix*) | ||
10738 | |||
10739 | -$as_echo "#define _SUN 1" >>confdefs.h | ||
10740 | +cat >>confdefs.h <<\_ACEOF | ||
10741 | +#define _SUN 1 | ||
10742 | +_ACEOF | ||
10743 | |||
10744 | |||
10745 | # | ||
10746 | @@ -6718,11 +9900,11 @@ $as_echo "#define _SUN 1" >>confdefs.h | ||
10747 | # STREAMS routines. | ||
10748 | # | ||
10749 | pseexe="/lib/pse.exp" | ||
10750 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $pseexe" >&5 | ||
10751 | -$as_echo_n "checking for $pseexe... " >&6; } | ||
10752 | + { echo "$as_me:$LINENO: checking for $pseexe" >&5 | ||
10753 | +echo $ECHO_N "checking for $pseexe... $ECHO_C" >&6; } | ||
10754 | if test -f $pseexe ; then | ||
10755 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
10756 | -$as_echo "yes" >&6; } | ||
10757 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
10758 | +echo "${ECHO_T}yes" >&6; } | ||
10759 | LIBS="-I:$pseexe" | ||
10760 | fi | ||
10761 | ;; | ||
10762 | @@ -6741,7 +9923,7 @@ darwin*) | ||
10763 | DYEXT="dylib" | ||
10764 | V_CCOPT="$V_CCOPT -fno-common" | ||
10765 | # Check whether --enable-universal was given. | ||
10766 | -if test "${enable_universal+set}" = set; then : | ||
10767 | +if test "${enable_universal+set}" = set; then | ||
10768 | enableval=$enable_universal; | ||
10769 | fi | ||
10770 | |||
10771 | @@ -6787,7 +9969,9 @@ fi | ||
10772 | |||
10773 | hpux9*) | ||
10774 | |||
10775 | -$as_echo "#define HAVE_HPUX9 1" >>confdefs.h | ||
10776 | +cat >>confdefs.h <<\_ACEOF | ||
10777 | +#define HAVE_HPUX9 1 | ||
10778 | +_ACEOF | ||
10779 | |||
10780 | |||
10781 | # | ||
10782 | @@ -6817,7 +10001,9 @@ hpux10.1*) | ||
10783 | |||
10784 | hpux*) | ||
10785 | |||
10786 | -$as_echo "#define HAVE_HPUX10_20_OR_LATER 1" >>confdefs.h | ||
10787 | +cat >>confdefs.h <<\_ACEOF | ||
10788 | +#define HAVE_HPUX10_20_OR_LATER 1 | ||
10789 | +_ACEOF | ||
10790 | |||
10791 | if test "`uname -m`" = "ia64"; then | ||
10792 | DYEXT="so" | ||
10793 | @@ -6869,12 +10055,16 @@ osf*) | ||
10794 | ;; | ||
10795 | |||
10796 | sinix*) | ||
10797 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SINIX compiler defines sinix" >&5 | ||
10798 | -$as_echo_n "checking if SINIX compiler defines sinix... " >&6; } | ||
10799 | - if test "${ac_cv_cc_sinix_defined+set}" = set; then : | ||
10800 | - $as_echo_n "(cached) " >&6 | ||
10801 | + { echo "$as_me:$LINENO: checking if SINIX compiler defines sinix" >&5 | ||
10802 | +echo $ECHO_N "checking if SINIX compiler defines sinix... $ECHO_C" >&6; } | ||
10803 | + if test "${ac_cv_cc_sinix_defined+set}" = set; then | ||
10804 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10805 | else | ||
10806 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
10807 | + cat >conftest.$ac_ext <<_ACEOF | ||
10808 | +/* confdefs.h. */ | ||
10809 | +_ACEOF | ||
10810 | +cat confdefs.h >>conftest.$ac_ext | ||
10811 | +cat >>conftest.$ac_ext <<_ACEOF | ||
10812 | /* end confdefs.h. */ | ||
10813 | |||
10814 | int | ||
10815 | @@ -6885,26 +10075,50 @@ int i = sinix; | ||
10816 | return 0; | ||
10817 | } | ||
10818 | _ACEOF | ||
10819 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
10820 | +rm -f conftest.$ac_objext | ||
10821 | +if { (ac_try="$ac_compile" | ||
10822 | +case "(($ac_try" in | ||
10823 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10824 | + *) ac_try_echo=$ac_try;; | ||
10825 | +esac | ||
10826 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10827 | + (eval "$ac_compile") 2>conftest.er1 | ||
10828 | + ac_status=$? | ||
10829 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
10830 | + rm -f conftest.er1 | ||
10831 | + cat conftest.err >&5 | ||
10832 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10833 | + (exit $ac_status); } && { | ||
10834 | + test -z "$ac_c_werror_flag" || | ||
10835 | + test ! -s conftest.err | ||
10836 | + } && test -s conftest.$ac_objext; then | ||
10837 | ac_cv_cc_sinix_defined=yes | ||
10838 | else | ||
10839 | - ac_cv_cc_sinix_defined=no | ||
10840 | + echo "$as_me: failed program was:" >&5 | ||
10841 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
10842 | + | ||
10843 | + ac_cv_cc_sinix_defined=no | ||
10844 | fi | ||
10845 | + | ||
10846 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10847 | fi | ||
10848 | |||
10849 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_sinix_defined" >&5 | ||
10850 | -$as_echo "$ac_cv_cc_sinix_defined" >&6; } | ||
10851 | + { echo "$as_me:$LINENO: result: $ac_cv_cc_sinix_defined" >&5 | ||
10852 | +echo "${ECHO_T}$ac_cv_cc_sinix_defined" >&6; } | ||
10853 | if test $ac_cv_cc_sinix_defined = no ; then | ||
10854 | |||
10855 | -$as_echo "#define sinix 1" >>confdefs.h | ||
10856 | +cat >>confdefs.h <<\_ACEOF | ||
10857 | +#define sinix 1 | ||
10858 | +_ACEOF | ||
10859 | |||
10860 | fi | ||
10861 | ;; | ||
10862 | |||
10863 | solaris*) | ||
10864 | |||
10865 | -$as_echo "#define HAVE_SOLARIS 1" >>confdefs.h | ||
10866 | +cat >>confdefs.h <<\_ACEOF | ||
10867 | +#define HAVE_SOLARIS 1 | ||
10868 | +_ACEOF | ||
10869 | |||
10870 | |||
10871 | DYEXT="so" | ||
10872 | @@ -6916,13 +10130,20 @@ $as_echo "#define HAVE_SOLARIS 1" >>confdefs.h | ||
10873 | ;; | ||
10874 | esac | ||
10875 | |||
10876 | +# Check whether --enable-shared was given. | ||
10877 | +if test "${enable_shared+set}" = set; then | ||
10878 | + enableval=$enable_shared; | ||
10879 | +fi | ||
10880 | + | ||
10881 | +test "x$enable_shared" = "xno" && DYEXT="none" | ||
10882 | + | ||
10883 | if test -n "$ac_tool_prefix"; then | ||
10884 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | ||
10885 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | ||
10886 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10887 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
10888 | -if test "${ac_cv_prog_RANLIB+set}" = set; then : | ||
10889 | - $as_echo_n "(cached) " >&6 | ||
10890 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10891 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
10892 | +if test "${ac_cv_prog_RANLIB+set}" = set; then | ||
10893 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10894 | else | ||
10895 | if test -n "$RANLIB"; then | ||
10896 | ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. | ||
10897 | @@ -6932,25 +10153,25 @@ for as_dir in $PATH | ||
10898 | do | ||
10899 | IFS=$as_save_IFS | ||
10900 | test -z "$as_dir" && as_dir=. | ||
10901 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10902 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10903 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10904 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | ||
10905 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10906 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10907 | break 2 | ||
10908 | fi | ||
10909 | done | ||
10910 | - done | ||
10911 | +done | ||
10912 | IFS=$as_save_IFS | ||
10913 | |||
10914 | fi | ||
10915 | fi | ||
10916 | RANLIB=$ac_cv_prog_RANLIB | ||
10917 | if test -n "$RANLIB"; then | ||
10918 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 | ||
10919 | -$as_echo "$RANLIB" >&6; } | ||
10920 | + { echo "$as_me:$LINENO: result: $RANLIB" >&5 | ||
10921 | +echo "${ECHO_T}$RANLIB" >&6; } | ||
10922 | else | ||
10923 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10924 | -$as_echo "no" >&6; } | ||
10925 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10926 | +echo "${ECHO_T}no" >&6; } | ||
10927 | fi | ||
10928 | |||
10929 | |||
10930 | @@ -6959,10 +10180,10 @@ if test -z "$ac_cv_prog_RANLIB"; then | ||
10931 | ac_ct_RANLIB=$RANLIB | ||
10932 | # Extract the first word of "ranlib", so it can be a program name with args. | ||
10933 | set dummy ranlib; ac_word=$2 | ||
10934 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10935 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
10936 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : | ||
10937 | - $as_echo_n "(cached) " >&6 | ||
10938 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10939 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
10940 | +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | ||
10941 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10942 | else | ||
10943 | if test -n "$ac_ct_RANLIB"; then | ||
10944 | ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. | ||
10945 | @@ -6972,25 +10193,25 @@ for as_dir in $PATH | ||
10946 | do | ||
10947 | IFS=$as_save_IFS | ||
10948 | test -z "$as_dir" && as_dir=. | ||
10949 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
10950 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
10951 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10952 | ac_cv_prog_ac_ct_RANLIB="ranlib" | ||
10953 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10954 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10955 | break 2 | ||
10956 | fi | ||
10957 | done | ||
10958 | - done | ||
10959 | +done | ||
10960 | IFS=$as_save_IFS | ||
10961 | |||
10962 | fi | ||
10963 | fi | ||
10964 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | ||
10965 | if test -n "$ac_ct_RANLIB"; then | ||
10966 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 | ||
10967 | -$as_echo "$ac_ct_RANLIB" >&6; } | ||
10968 | + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | ||
10969 | +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } | ||
10970 | else | ||
10971 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
10972 | -$as_echo "no" >&6; } | ||
10973 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10974 | +echo "${ECHO_T}no" >&6; } | ||
10975 | fi | ||
10976 | |||
10977 | if test "x$ac_ct_RANLIB" = x; then | ||
10978 | @@ -6998,8 +10219,12 @@ fi | ||
10979 | else | ||
10980 | case $cross_compiling:$ac_tool_warned in | ||
10981 | yes:) | ||
10982 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
10983 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
10984 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
10985 | +whose name does not start with the host triplet. If you think this | ||
10986 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
10987 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
10988 | +whose name does not start with the host triplet. If you think this | ||
10989 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
10990 | ac_tool_warned=yes ;; | ||
10991 | esac | ||
10992 | RANLIB=$ac_ct_RANLIB | ||
10993 | @@ -7011,10 +10236,10 @@ fi | ||
10994 | if test -n "$ac_tool_prefix"; then | ||
10995 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
10996 | set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
10997 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
10998 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
10999 | -if test "${ac_cv_prog_AR+set}" = set; then : | ||
11000 | - $as_echo_n "(cached) " >&6 | ||
11001 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11002 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
11003 | +if test "${ac_cv_prog_AR+set}" = set; then | ||
11004 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11005 | else | ||
11006 | if test -n "$AR"; then | ||
11007 | ac_cv_prog_AR="$AR" # Let the user override the test. | ||
11008 | @@ -7024,25 +10249,25 @@ for as_dir in $PATH | ||
11009 | do | ||
11010 | IFS=$as_save_IFS | ||
11011 | test -z "$as_dir" && as_dir=. | ||
11012 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
11013 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
11014 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11015 | ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
11016 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11017 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11018 | break 2 | ||
11019 | fi | ||
11020 | done | ||
11021 | - done | ||
11022 | +done | ||
11023 | IFS=$as_save_IFS | ||
11024 | |||
11025 | fi | ||
11026 | fi | ||
11027 | AR=$ac_cv_prog_AR | ||
11028 | if test -n "$AR"; then | ||
11029 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 | ||
11030 | -$as_echo "$AR" >&6; } | ||
11031 | + { echo "$as_me:$LINENO: result: $AR" >&5 | ||
11032 | +echo "${ECHO_T}$AR" >&6; } | ||
11033 | else | ||
11034 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
11035 | -$as_echo "no" >&6; } | ||
11036 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11037 | +echo "${ECHO_T}no" >&6; } | ||
11038 | fi | ||
11039 | |||
11040 | |||
11041 | @@ -7051,10 +10276,10 @@ if test -z "$ac_cv_prog_AR"; then | ||
11042 | ac_ct_AR=$AR | ||
11043 | # Extract the first word of "ar", so it can be a program name with args. | ||
11044 | set dummy ar; ac_word=$2 | ||
11045 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
11046 | -$as_echo_n "checking for $ac_word... " >&6; } | ||
11047 | -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | ||
11048 | - $as_echo_n "(cached) " >&6 | ||
11049 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11050 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
11051 | +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | ||
11052 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11053 | else | ||
11054 | if test -n "$ac_ct_AR"; then | ||
11055 | ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. | ||
11056 | @@ -7064,25 +10289,25 @@ for as_dir in $PATH | ||
11057 | do | ||
11058 | IFS=$as_save_IFS | ||
11059 | test -z "$as_dir" && as_dir=. | ||
11060 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
11061 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
11062 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11063 | ac_cv_prog_ac_ct_AR="ar" | ||
11064 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11065 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11066 | break 2 | ||
11067 | fi | ||
11068 | done | ||
11069 | - done | ||
11070 | +done | ||
11071 | IFS=$as_save_IFS | ||
11072 | |||
11073 | fi | ||
11074 | fi | ||
11075 | ac_ct_AR=$ac_cv_prog_ac_ct_AR | ||
11076 | if test -n "$ac_ct_AR"; then | ||
11077 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 | ||
11078 | -$as_echo "$ac_ct_AR" >&6; } | ||
11079 | + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | ||
11080 | +echo "${ECHO_T}$ac_ct_AR" >&6; } | ||
11081 | else | ||
11082 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
11083 | -$as_echo "no" >&6; } | ||
11084 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11085 | +echo "${ECHO_T}no" >&6; } | ||
11086 | fi | ||
11087 | |||
11088 | if test "x$ac_ct_AR" = x; then | ||
11089 | @@ -7090,8 +10315,12 @@ fi | ||
11090 | else | ||
11091 | case $cross_compiling:$ac_tool_warned in | ||
11092 | yes:) | ||
11093 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
11094 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
11095 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
11096 | +whose name does not start with the host triplet. If you think this | ||
11097 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
11098 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
11099 | +whose name does not start with the host triplet. If you think this | ||
11100 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
11101 | ac_tool_warned=yes ;; | ||
11102 | esac | ||
11103 | AR=$ac_ct_AR | ||
11104 | @@ -7132,20 +10361,26 @@ rm -f os-proto.h | ||
11105 | if test -f $name ; then | ||
11106 | ln -s $name os-proto.h | ||
11107 | |||
11108 | -$as_echo "#define HAVE_OS_PROTO_H 1" >>confdefs.h | ||
11109 | +cat >>confdefs.h <<\_ACEOF | ||
11110 | +#define HAVE_OS_PROTO_H 1 | ||
11111 | +_ACEOF | ||
11112 | |||
11113 | else | ||
11114 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find $name" >&5 | ||
11115 | -$as_echo "$as_me: WARNING: can't find $name" >&2;} | ||
11116 | + { echo "$as_me:$LINENO: WARNING: can't find $name" >&5 | ||
11117 | +echo "$as_me: WARNING: can't find $name" >&2;} | ||
11118 | fi | ||
11119 | fi | ||
11120 | |||
11121 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr struct has the sa_len member" >&5 | ||
11122 | -$as_echo_n "checking if sockaddr struct has the sa_len member... " >&6; } | ||
11123 | - if test "${ac_cv_lbl_sockaddr_has_sa_len+set}" = set; then : | ||
11124 | - $as_echo_n "(cached) " >&6 | ||
11125 | +{ echo "$as_me:$LINENO: checking if sockaddr struct has the sa_len member" >&5 | ||
11126 | +echo $ECHO_N "checking if sockaddr struct has the sa_len member... $ECHO_C" >&6; } | ||
11127 | + if test "${ac_cv_lbl_sockaddr_has_sa_len+set}" = set; then | ||
11128 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11129 | else | ||
11130 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11131 | + cat >conftest.$ac_ext <<_ACEOF | ||
11132 | +/* confdefs.h. */ | ||
11133 | +_ACEOF | ||
11134 | +cat confdefs.h >>conftest.$ac_ext | ||
11135 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11136 | /* end confdefs.h. */ | ||
11137 | |||
11138 | # include <sys/types.h> | ||
11139 | @@ -7158,28 +10393,54 @@ u_int i = sizeof(((struct sockaddr *)0)->sa_len) | ||
11140 | return 0; | ||
11141 | } | ||
11142 | _ACEOF | ||
11143 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
11144 | +rm -f conftest.$ac_objext | ||
11145 | +if { (ac_try="$ac_compile" | ||
11146 | +case "(($ac_try" in | ||
11147 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11148 | + *) ac_try_echo=$ac_try;; | ||
11149 | +esac | ||
11150 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11151 | + (eval "$ac_compile") 2>conftest.er1 | ||
11152 | + ac_status=$? | ||
11153 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11154 | + rm -f conftest.er1 | ||
11155 | + cat conftest.err >&5 | ||
11156 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11157 | + (exit $ac_status); } && { | ||
11158 | + test -z "$ac_c_werror_flag" || | ||
11159 | + test ! -s conftest.err | ||
11160 | + } && test -s conftest.$ac_objext; then | ||
11161 | ac_cv_lbl_sockaddr_has_sa_len=yes | ||
11162 | else | ||
11163 | - ac_cv_lbl_sockaddr_has_sa_len=no | ||
11164 | + echo "$as_me: failed program was:" >&5 | ||
11165 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11166 | + | ||
11167 | + ac_cv_lbl_sockaddr_has_sa_len=no | ||
11168 | fi | ||
11169 | + | ||
11170 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11171 | fi | ||
11172 | |||
11173 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_sockaddr_has_sa_len" >&5 | ||
11174 | -$as_echo "$ac_cv_lbl_sockaddr_has_sa_len" >&6; } | ||
11175 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_sockaddr_has_sa_len" >&5 | ||
11176 | +echo "${ECHO_T}$ac_cv_lbl_sockaddr_has_sa_len" >&6; } | ||
11177 | if test $ac_cv_lbl_sockaddr_has_sa_len = yes ; then | ||
11178 | |||
11179 | -$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h | ||
11180 | +cat >>confdefs.h <<\_ACEOF | ||
11181 | +#define HAVE_SOCKADDR_SA_LEN 1 | ||
11182 | +_ACEOF | ||
11183 | |||
11184 | fi | ||
11185 | |||
11186 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr_storage struct exists" >&5 | ||
11187 | -$as_echo_n "checking if sockaddr_storage struct exists... " >&6; } | ||
11188 | - if test "${ac_cv_lbl_has_sockaddr_storage+set}" = set; then : | ||
11189 | - $as_echo_n "(cached) " >&6 | ||
11190 | +{ echo "$as_me:$LINENO: checking if sockaddr_storage struct exists" >&5 | ||
11191 | +echo $ECHO_N "checking if sockaddr_storage struct exists... $ECHO_C" >&6; } | ||
11192 | + if test "${ac_cv_lbl_has_sockaddr_storage+set}" = set; then | ||
11193 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11194 | else | ||
11195 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11196 | + cat >conftest.$ac_ext <<_ACEOF | ||
11197 | +/* confdefs.h. */ | ||
11198 | +_ACEOF | ||
11199 | +cat confdefs.h >>conftest.$ac_ext | ||
11200 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11201 | /* end confdefs.h. */ | ||
11202 | |||
11203 | # include <sys/types.h> | ||
11204 | @@ -7192,28 +10453,54 @@ u_int i = sizeof (struct sockaddr_storage) | ||
11205 | return 0; | ||
11206 | } | ||
11207 | _ACEOF | ||
11208 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
11209 | +rm -f conftest.$ac_objext | ||
11210 | +if { (ac_try="$ac_compile" | ||
11211 | +case "(($ac_try" in | ||
11212 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11213 | + *) ac_try_echo=$ac_try;; | ||
11214 | +esac | ||
11215 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11216 | + (eval "$ac_compile") 2>conftest.er1 | ||
11217 | + ac_status=$? | ||
11218 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11219 | + rm -f conftest.er1 | ||
11220 | + cat conftest.err >&5 | ||
11221 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11222 | + (exit $ac_status); } && { | ||
11223 | + test -z "$ac_c_werror_flag" || | ||
11224 | + test ! -s conftest.err | ||
11225 | + } && test -s conftest.$ac_objext; then | ||
11226 | ac_cv_lbl_has_sockaddr_storage=yes | ||
11227 | else | ||
11228 | - ac_cv_lbl_has_sockaddr_storage=no | ||
11229 | + echo "$as_me: failed program was:" >&5 | ||
11230 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11231 | + | ||
11232 | + ac_cv_lbl_has_sockaddr_storage=no | ||
11233 | fi | ||
11234 | + | ||
11235 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11236 | fi | ||
11237 | |||
11238 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_has_sockaddr_storage" >&5 | ||
11239 | -$as_echo "$ac_cv_lbl_has_sockaddr_storage" >&6; } | ||
11240 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_has_sockaddr_storage" >&5 | ||
11241 | +echo "${ECHO_T}$ac_cv_lbl_has_sockaddr_storage" >&6; } | ||
11242 | if test $ac_cv_lbl_has_sockaddr_storage = yes ; then | ||
11243 | |||
11244 | -$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h | ||
11245 | +cat >>confdefs.h <<\_ACEOF | ||
11246 | +#define HAVE_SOCKADDR_STORAGE 1 | ||
11247 | +_ACEOF | ||
11248 | |||
11249 | fi | ||
11250 | |||
11251 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dl_hp_ppa_info_t struct has dl_module_id_1 member" >&5 | ||
11252 | -$as_echo_n "checking if dl_hp_ppa_info_t struct has dl_module_id_1 member... " >&6; } | ||
11253 | - if test "${ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1+set}" = set; then : | ||
11254 | - $as_echo_n "(cached) " >&6 | ||
11255 | +{ echo "$as_me:$LINENO: checking if dl_hp_ppa_info_t struct has dl_module_id_1 member" >&5 | ||
11256 | +echo $ECHO_N "checking if dl_hp_ppa_info_t struct has dl_module_id_1 member... $ECHO_C" >&6; } | ||
11257 | + if test "${ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1+set}" = set; then | ||
11258 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11259 | else | ||
11260 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11261 | + cat >conftest.$ac_ext <<_ACEOF | ||
11262 | +/* confdefs.h. */ | ||
11263 | +_ACEOF | ||
11264 | +cat confdefs.h >>conftest.$ac_ext | ||
11265 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11266 | /* end confdefs.h. */ | ||
11267 | |||
11268 | # include <sys/types.h> | ||
11269 | @@ -7227,26 +10514,48 @@ u_int i = sizeof(((dl_hp_ppa_info_t *)0)->dl_module_id_1) | ||
11270 | return 0; | ||
11271 | } | ||
11272 | _ACEOF | ||
11273 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
11274 | +rm -f conftest.$ac_objext | ||
11275 | +if { (ac_try="$ac_compile" | ||
11276 | +case "(($ac_try" in | ||
11277 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11278 | + *) ac_try_echo=$ac_try;; | ||
11279 | +esac | ||
11280 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11281 | + (eval "$ac_compile") 2>conftest.er1 | ||
11282 | + ac_status=$? | ||
11283 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11284 | + rm -f conftest.er1 | ||
11285 | + cat conftest.err >&5 | ||
11286 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11287 | + (exit $ac_status); } && { | ||
11288 | + test -z "$ac_c_werror_flag" || | ||
11289 | + test ! -s conftest.err | ||
11290 | + } && test -s conftest.$ac_objext; then | ||
11291 | ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1=yes | ||
11292 | else | ||
11293 | - ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1=no | ||
11294 | + echo "$as_me: failed program was:" >&5 | ||
11295 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11296 | + | ||
11297 | + ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1=no | ||
11298 | fi | ||
11299 | + | ||
11300 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11301 | fi | ||
11302 | |||
11303 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1" >&5 | ||
11304 | -$as_echo "$ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1" >&6; } | ||
11305 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1" >&5 | ||
11306 | +echo "${ECHO_T}$ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1" >&6; } | ||
11307 | if test $ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1 = yes ; then | ||
11308 | |||
11309 | -$as_echo "#define HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1 1" >>confdefs.h | ||
11310 | +cat >>confdefs.h <<\_ACEOF | ||
11311 | +#define HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1 1 | ||
11312 | +_ACEOF | ||
11313 | |||
11314 | fi | ||
11315 | |||
11316 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if unaligned accesses fail" >&5 | ||
11317 | -$as_echo_n "checking if unaligned accesses fail... " >&6; } | ||
11318 | - if test "${ac_cv_lbl_unaligned_fail+set}" = set; then : | ||
11319 | - $as_echo_n "(cached) " >&6 | ||
11320 | +{ echo "$as_me:$LINENO: checking if unaligned accesses fail" >&5 | ||
11321 | +echo $ECHO_N "checking if unaligned accesses fail... $ECHO_C" >&6; } | ||
11322 | + if test "${ac_cv_lbl_unaligned_fail+set}" = set; then | ||
11323 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11324 | else | ||
11325 | case "$host_cpu" in | ||
11326 | |||
11327 | @@ -7330,11 +10639,13 @@ EOF | ||
11328 | esac | ||
11329 | fi | ||
11330 | |||
11331 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_unaligned_fail" >&5 | ||
11332 | -$as_echo "$ac_cv_lbl_unaligned_fail" >&6; } | ||
11333 | + { echo "$as_me:$LINENO: result: $ac_cv_lbl_unaligned_fail" >&5 | ||
11334 | +echo "${ECHO_T}$ac_cv_lbl_unaligned_fail" >&6; } | ||
11335 | if test $ac_cv_lbl_unaligned_fail = yes ; then | ||
11336 | |||
11337 | -$as_echo "#define LBL_ALIGN 1" >>confdefs.h | ||
11338 | +cat >>confdefs.h <<\_ACEOF | ||
11339 | +#define LBL_ALIGN 1 | ||
11340 | +_ACEOF | ||
11341 | |||
11342 | fi | ||
11343 | |||
11344 | @@ -7343,7 +10654,9 @@ $as_echo "#define LBL_ALIGN 1" >>confdefs.h | ||
11345 | # that it will be generated if autoconf is used. | ||
11346 | # | ||
11347 | |||
11348 | -$as_echo "#define HAVE_VERSION_H 1" >>confdefs.h | ||
11349 | +cat >>confdefs.h <<\_ACEOF | ||
11350 | +#define HAVE_VERSION_H 1 | ||
11351 | +_ACEOF | ||
11352 | |||
11353 | |||
11354 | rm -f net | ||
11355 | @@ -7367,67 +10680,370 @@ ln -s ${srcdir}/bpf/net net | ||
11356 | |||
11357 | |||
11358 | |||
11359 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB sniffing support" >&5 | ||
11360 | -$as_echo_n "checking for USB sniffing support... " >&6; } | ||
11361 | +{ echo "$as_me:$LINENO: checking for USB sniffing support" >&5 | ||
11362 | +echo $ECHO_N "checking for USB sniffing support... $ECHO_C" >&6; } | ||
11363 | case "$host_os" in | ||
11364 | linux*) | ||
11365 | |||
11366 | -$as_echo "#define PCAP_SUPPORT_USB 1" >>confdefs.h | ||
11367 | +cat >>confdefs.h <<\_ACEOF | ||
11368 | +#define PCAP_SUPPORT_USB 1 | ||
11369 | +_ACEOF | ||
11370 | + | ||
11371 | + USB_SRC=pcap-usb-linux.c | ||
11372 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
11373 | +echo "${ECHO_T}yes" >&6; } | ||
11374 | + ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null` | ||
11375 | + if test $? -ne 0 ; then | ||
11376 | + ac_usb_dev_name="usbmon" | ||
11377 | + fi | ||
11378 | + | ||
11379 | +cat >>confdefs.h <<_ACEOF | ||
11380 | +#define LINUX_USB_MON_DEV "/dev/$ac_usb_dev_name" | ||
11381 | +_ACEOF | ||
11382 | + | ||
11383 | + { echo "$as_me:$LINENO: Device for USB sniffing is /dev/$ac_usb_dev_name" >&5 | ||
11384 | +echo "$as_me: Device for USB sniffing is /dev/$ac_usb_dev_name" >&6;} | ||
11385 | + # | ||
11386 | + # Do we have a version of <linux/compiler.h> available? | ||
11387 | + # If so, we might need it for <linux/usbdevice_fs.h>. | ||
11388 | + # | ||
11389 | + | ||
11390 | +for ac_header in linux/compiler.h | ||
11391 | +do | ||
11392 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
11393 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
11394 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
11395 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
11396 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
11397 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11398 | +fi | ||
11399 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
11400 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
11401 | +echo "${ECHO_T}$ac_res" >&6; } | ||
11402 | +else | ||
11403 | + # Is the header compilable? | ||
11404 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
11405 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
11406 | +cat >conftest.$ac_ext <<_ACEOF | ||
11407 | +/* confdefs.h. */ | ||
11408 | +_ACEOF | ||
11409 | +cat confdefs.h >>conftest.$ac_ext | ||
11410 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11411 | +/* end confdefs.h. */ | ||
11412 | +$ac_includes_default | ||
11413 | +#include <$ac_header> | ||
11414 | +_ACEOF | ||
11415 | +rm -f conftest.$ac_objext | ||
11416 | +if { (ac_try="$ac_compile" | ||
11417 | +case "(($ac_try" in | ||
11418 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11419 | + *) ac_try_echo=$ac_try;; | ||
11420 | +esac | ||
11421 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11422 | + (eval "$ac_compile") 2>conftest.er1 | ||
11423 | + ac_status=$? | ||
11424 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11425 | + rm -f conftest.er1 | ||
11426 | + cat conftest.err >&5 | ||
11427 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11428 | + (exit $ac_status); } && { | ||
11429 | + test -z "$ac_c_werror_flag" || | ||
11430 | + test ! -s conftest.err | ||
11431 | + } && test -s conftest.$ac_objext; then | ||
11432 | + ac_header_compiler=yes | ||
11433 | +else | ||
11434 | + echo "$as_me: failed program was:" >&5 | ||
11435 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11436 | + | ||
11437 | + ac_header_compiler=no | ||
11438 | +fi | ||
11439 | + | ||
11440 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11441 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
11442 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
11443 | + | ||
11444 | +# Is the header present? | ||
11445 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
11446 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
11447 | +cat >conftest.$ac_ext <<_ACEOF | ||
11448 | +/* confdefs.h. */ | ||
11449 | +_ACEOF | ||
11450 | +cat confdefs.h >>conftest.$ac_ext | ||
11451 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11452 | +/* end confdefs.h. */ | ||
11453 | +#include <$ac_header> | ||
11454 | +_ACEOF | ||
11455 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
11456 | +case "(($ac_try" in | ||
11457 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11458 | + *) ac_try_echo=$ac_try;; | ||
11459 | +esac | ||
11460 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11461 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
11462 | + ac_status=$? | ||
11463 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11464 | + rm -f conftest.er1 | ||
11465 | + cat conftest.err >&5 | ||
11466 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11467 | + (exit $ac_status); } >/dev/null && { | ||
11468 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
11469 | + test ! -s conftest.err | ||
11470 | + }; then | ||
11471 | + ac_header_preproc=yes | ||
11472 | +else | ||
11473 | + echo "$as_me: failed program was:" >&5 | ||
11474 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11475 | + | ||
11476 | + ac_header_preproc=no | ||
11477 | +fi | ||
11478 | + | ||
11479 | +rm -f conftest.err conftest.$ac_ext | ||
11480 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
11481 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
11482 | + | ||
11483 | +# So? What about this header? | ||
11484 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
11485 | + yes:no: ) | ||
11486 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
11487 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
11488 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
11489 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
11490 | + ac_header_preproc=yes | ||
11491 | + ;; | ||
11492 | + no:yes:* ) | ||
11493 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
11494 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
11495 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
11496 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
11497 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
11498 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
11499 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
11500 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
11501 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
11502 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
11503 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
11504 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
11505 | + | ||
11506 | + ;; | ||
11507 | +esac | ||
11508 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
11509 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
11510 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
11511 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11512 | +else | ||
11513 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
11514 | +fi | ||
11515 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
11516 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
11517 | +echo "${ECHO_T}$ac_res" >&6; } | ||
11518 | + | ||
11519 | +fi | ||
11520 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
11521 | + cat >>confdefs.h <<_ACEOF | ||
11522 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
11523 | +_ACEOF | ||
11524 | + | ||
11525 | +fi | ||
11526 | + | ||
11527 | +done | ||
11528 | + | ||
11529 | + if test "$ac_cv_header_linux_compiler_h" = yes; then | ||
11530 | + # | ||
11531 | + # Yes - include it when testing for <linux/usbdevice_fs.h>. | ||
11532 | + # | ||
11533 | + | ||
11534 | +for ac_header in linux/usbdevice_fs.h | ||
11535 | +do | ||
11536 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
11537 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
11538 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
11539 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
11540 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11541 | +else | ||
11542 | + cat >conftest.$ac_ext <<_ACEOF | ||
11543 | +/* confdefs.h. */ | ||
11544 | +_ACEOF | ||
11545 | +cat confdefs.h >>conftest.$ac_ext | ||
11546 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11547 | +/* end confdefs.h. */ | ||
11548 | +#include <linux/compiler.h> | ||
11549 | + | ||
11550 | +#include <$ac_header> | ||
11551 | +_ACEOF | ||
11552 | +rm -f conftest.$ac_objext | ||
11553 | +if { (ac_try="$ac_compile" | ||
11554 | +case "(($ac_try" in | ||
11555 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11556 | + *) ac_try_echo=$ac_try;; | ||
11557 | +esac | ||
11558 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11559 | + (eval "$ac_compile") 2>conftest.er1 | ||
11560 | + ac_status=$? | ||
11561 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11562 | + rm -f conftest.er1 | ||
11563 | + cat conftest.err >&5 | ||
11564 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11565 | + (exit $ac_status); } && { | ||
11566 | + test -z "$ac_c_werror_flag" || | ||
11567 | + test ! -s conftest.err | ||
11568 | + } && test -s conftest.$ac_objext; then | ||
11569 | + eval "$as_ac_Header=yes" | ||
11570 | +else | ||
11571 | + echo "$as_me: failed program was:" >&5 | ||
11572 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11573 | + | ||
11574 | + eval "$as_ac_Header=no" | ||
11575 | +fi | ||
11576 | + | ||
11577 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11578 | +fi | ||
11579 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
11580 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
11581 | +echo "${ECHO_T}$ac_res" >&6; } | ||
11582 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
11583 | + cat >>confdefs.h <<_ACEOF | ||
11584 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
11585 | +_ACEOF | ||
11586 | + | ||
11587 | +fi | ||
11588 | + | ||
11589 | +done | ||
11590 | + | ||
11591 | + else | ||
11592 | + | ||
11593 | +for ac_header in linux/usbdevice_fs.h | ||
11594 | +do | ||
11595 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
11596 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
11597 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
11598 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
11599 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
11600 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11601 | +fi | ||
11602 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
11603 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
11604 | +echo "${ECHO_T}$ac_res" >&6; } | ||
11605 | +else | ||
11606 | + # Is the header compilable? | ||
11607 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
11608 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
11609 | +cat >conftest.$ac_ext <<_ACEOF | ||
11610 | +/* confdefs.h. */ | ||
11611 | +_ACEOF | ||
11612 | +cat confdefs.h >>conftest.$ac_ext | ||
11613 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11614 | +/* end confdefs.h. */ | ||
11615 | +$ac_includes_default | ||
11616 | +#include <$ac_header> | ||
11617 | +_ACEOF | ||
11618 | +rm -f conftest.$ac_objext | ||
11619 | +if { (ac_try="$ac_compile" | ||
11620 | +case "(($ac_try" in | ||
11621 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11622 | + *) ac_try_echo=$ac_try;; | ||
11623 | +esac | ||
11624 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11625 | + (eval "$ac_compile") 2>conftest.er1 | ||
11626 | + ac_status=$? | ||
11627 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11628 | + rm -f conftest.er1 | ||
11629 | + cat conftest.err >&5 | ||
11630 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11631 | + (exit $ac_status); } && { | ||
11632 | + test -z "$ac_c_werror_flag" || | ||
11633 | + test ! -s conftest.err | ||
11634 | + } && test -s conftest.$ac_objext; then | ||
11635 | + ac_header_compiler=yes | ||
11636 | +else | ||
11637 | + echo "$as_me: failed program was:" >&5 | ||
11638 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11639 | + | ||
11640 | + ac_header_compiler=no | ||
11641 | +fi | ||
11642 | |||
11643 | - USB_SRC=pcap-usb-linux.c | ||
11644 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
11645 | -$as_echo "yes" >&6; } | ||
11646 | - ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null` | ||
11647 | - if test $? -ne 0 ; then | ||
11648 | - ac_usb_dev_name="usbmon" | ||
11649 | - fi | ||
11650 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11651 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
11652 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
11653 | |||
11654 | -cat >>confdefs.h <<_ACEOF | ||
11655 | -#define LINUX_USB_MON_DEV "/dev/$ac_usb_dev_name" | ||
11656 | +# Is the header present? | ||
11657 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
11658 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
11659 | +cat >conftest.$ac_ext <<_ACEOF | ||
11660 | +/* confdefs.h. */ | ||
11661 | _ACEOF | ||
11662 | - | ||
11663 | - { $as_echo "$as_me:${as_lineno-$LINENO}: Device for USB sniffing is /dev/$ac_usb_dev_name" >&5 | ||
11664 | -$as_echo "$as_me: Device for USB sniffing is /dev/$ac_usb_dev_name" >&6;} | ||
11665 | - # | ||
11666 | - # Do we have a version of <linux/compiler.h> available? | ||
11667 | - # If so, we might need it for <linux/usbdevice_fs.h>. | ||
11668 | - # | ||
11669 | - for ac_header in linux/compiler.h | ||
11670 | -do : | ||
11671 | - ac_fn_c_check_header_mongrel "$LINENO" "linux/compiler.h" "ac_cv_header_linux_compiler_h" "$ac_includes_default" | ||
11672 | -if test "x$ac_cv_header_linux_compiler_h" = x""yes; then : | ||
11673 | - cat >>confdefs.h <<_ACEOF | ||
11674 | -#define HAVE_LINUX_COMPILER_H 1 | ||
11675 | +cat confdefs.h >>conftest.$ac_ext | ||
11676 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11677 | +/* end confdefs.h. */ | ||
11678 | +#include <$ac_header> | ||
11679 | _ACEOF | ||
11680 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
11681 | +case "(($ac_try" in | ||
11682 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11683 | + *) ac_try_echo=$ac_try;; | ||
11684 | +esac | ||
11685 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11686 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
11687 | + ac_status=$? | ||
11688 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11689 | + rm -f conftest.er1 | ||
11690 | + cat conftest.err >&5 | ||
11691 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11692 | + (exit $ac_status); } >/dev/null && { | ||
11693 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
11694 | + test ! -s conftest.err | ||
11695 | + }; then | ||
11696 | + ac_header_preproc=yes | ||
11697 | +else | ||
11698 | + echo "$as_me: failed program was:" >&5 | ||
11699 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11700 | |||
11701 | + ac_header_preproc=no | ||
11702 | fi | ||
11703 | |||
11704 | -done | ||
11705 | +rm -f conftest.err conftest.$ac_ext | ||
11706 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
11707 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
11708 | |||
11709 | - if test "$ac_cv_header_linux_compiler_h" = yes; then | ||
11710 | - # | ||
11711 | - # Yes - include it when testing for <linux/usbdevice_fs.h>. | ||
11712 | - # | ||
11713 | - for ac_header in linux/usbdevice_fs.h | ||
11714 | -do : | ||
11715 | - ac_fn_c_check_header_compile "$LINENO" "linux/usbdevice_fs.h" "ac_cv_header_linux_usbdevice_fs_h" "#include <linux/compiler.h> | ||
11716 | -" | ||
11717 | -if test "x$ac_cv_header_linux_usbdevice_fs_h" = x""yes; then : | ||
11718 | - cat >>confdefs.h <<_ACEOF | ||
11719 | -#define HAVE_LINUX_USBDEVICE_FS_H 1 | ||
11720 | -_ACEOF | ||
11721 | +# So? What about this header? | ||
11722 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
11723 | + yes:no: ) | ||
11724 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
11725 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
11726 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
11727 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
11728 | + ac_header_preproc=yes | ||
11729 | + ;; | ||
11730 | + no:yes:* ) | ||
11731 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
11732 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
11733 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
11734 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
11735 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
11736 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
11737 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
11738 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
11739 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
11740 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
11741 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
11742 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
11743 | |||
11744 | + ;; | ||
11745 | +esac | ||
11746 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
11747 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
11748 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
11749 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11750 | +else | ||
11751 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
11752 | fi | ||
11753 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
11754 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
11755 | +echo "${ECHO_T}$ac_res" >&6; } | ||
11756 | |||
11757 | -done | ||
11758 | - | ||
11759 | - else | ||
11760 | - for ac_header in linux/usbdevice_fs.h | ||
11761 | -do : | ||
11762 | - ac_fn_c_check_header_mongrel "$LINENO" "linux/usbdevice_fs.h" "ac_cv_header_linux_usbdevice_fs_h" "$ac_includes_default" | ||
11763 | -if test "x$ac_cv_header_linux_usbdevice_fs_h" = x""yes; then : | ||
11764 | +fi | ||
11765 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
11766 | cat >>confdefs.h <<_ACEOF | ||
11767 | -#define HAVE_LINUX_USBDEVICE_FS_H 1 | ||
11768 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
11769 | _ACEOF | ||
11770 | |||
11771 | fi | ||
11772 | @@ -7442,12 +11058,16 @@ done | ||
11773 | # "value", rather than "bRequestType", "bRequest", and | ||
11774 | # "wValue". | ||
11775 | # | ||
11776 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if usbdevfs_ctrltransfer struct has bRequestType member" >&5 | ||
11777 | -$as_echo_n "checking if usbdevfs_ctrltransfer struct has bRequestType member... " >&6; } | ||
11778 | - if test "${ac_cv_usbdevfs_ctrltransfer_has_bRequestType+set}" = set; then : | ||
11779 | - $as_echo_n "(cached) " >&6 | ||
11780 | + { echo "$as_me:$LINENO: checking if usbdevfs_ctrltransfer struct has bRequestType member" >&5 | ||
11781 | +echo $ECHO_N "checking if usbdevfs_ctrltransfer struct has bRequestType member... $ECHO_C" >&6; } | ||
11782 | + if test "${ac_cv_usbdevfs_ctrltransfer_has_bRequestType+set}" = set; then | ||
11783 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11784 | else | ||
11785 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11786 | + cat >conftest.$ac_ext <<_ACEOF | ||
11787 | +/* confdefs.h. */ | ||
11788 | +_ACEOF | ||
11789 | +cat confdefs.h >>conftest.$ac_ext | ||
11790 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11791 | /* end confdefs.h. */ | ||
11792 | |||
11793 | $ac_includes_default | ||
11794 | @@ -7466,37 +11086,59 @@ u_int i = sizeof(((struct usbdevfs_ctrltransfer *)0)->bRequestType) | ||
11795 | return 0; | ||
11796 | } | ||
11797 | _ACEOF | ||
11798 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
11799 | +rm -f conftest.$ac_objext | ||
11800 | +if { (ac_try="$ac_compile" | ||
11801 | +case "(($ac_try" in | ||
11802 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11803 | + *) ac_try_echo=$ac_try;; | ||
11804 | +esac | ||
11805 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11806 | + (eval "$ac_compile") 2>conftest.er1 | ||
11807 | + ac_status=$? | ||
11808 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11809 | + rm -f conftest.er1 | ||
11810 | + cat conftest.err >&5 | ||
11811 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11812 | + (exit $ac_status); } && { | ||
11813 | + test -z "$ac_c_werror_flag" || | ||
11814 | + test ! -s conftest.err | ||
11815 | + } && test -s conftest.$ac_objext; then | ||
11816 | ac_cv_usbdevfs_ctrltransfer_has_bRequestType=yes | ||
11817 | else | ||
11818 | - ac_cv_usbdevfs_ctrltransfer_has_bRequestType=no | ||
11819 | + echo "$as_me: failed program was:" >&5 | ||
11820 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11821 | + | ||
11822 | + ac_cv_usbdevfs_ctrltransfer_has_bRequestType=no | ||
11823 | fi | ||
11824 | + | ||
11825 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11826 | fi | ||
11827 | |||
11828 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_usbdevfs_ctrltransfer_has_bRequestType" >&5 | ||
11829 | -$as_echo "$ac_cv_usbdevfs_ctrltransfer_has_bRequestType" >&6; } | ||
11830 | + { echo "$as_me:$LINENO: result: $ac_cv_usbdevfs_ctrltransfer_has_bRequestType" >&5 | ||
11831 | +echo "${ECHO_T}$ac_cv_usbdevfs_ctrltransfer_has_bRequestType" >&6; } | ||
11832 | if test $ac_cv_usbdevfs_ctrltransfer_has_bRequestType = yes ; then | ||
11833 | |||
11834 | -$as_echo "#define HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1" >>confdefs.h | ||
11835 | +cat >>confdefs.h <<\_ACEOF | ||
11836 | +#define HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1 | ||
11837 | +_ACEOF | ||
11838 | |||
11839 | fi | ||
11840 | fi | ||
11841 | ;; | ||
11842 | *) | ||
11843 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
11844 | -$as_echo "no" >&6; } | ||
11845 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11846 | +echo "${ECHO_T}no" >&6; } | ||
11847 | ;; | ||
11848 | esac | ||
11849 | |||
11850 | |||
11851 | |||
11852 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the platform could support netfilter sniffing" >&5 | ||
11853 | -$as_echo_n "checking whether the platform could support netfilter sniffing... " >&6; } | ||
11854 | +{ echo "$as_me:$LINENO: checking whether the platform could support netfilter sniffing" >&5 | ||
11855 | +echo $ECHO_N "checking whether the platform could support netfilter sniffing... $ECHO_C" >&6; } | ||
11856 | case "$host_os" in | ||
11857 | linux*) | ||
11858 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
11859 | -$as_echo "yes" >&6; } | ||
11860 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
11861 | +echo "${ECHO_T}yes" >&6; } | ||
11862 | # | ||
11863 | # Life's too short to deal with trying to get this to compile | ||
11864 | # if you don't get the right types defined with | ||
11865 | @@ -7505,12 +11147,16 @@ $as_echo "yes" >&6; } | ||
11866 | # Check whether the includes Just Work. If not, don't turn on | ||
11867 | # netfilter support. | ||
11868 | # | ||
11869 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile the netfilter support" >&5 | ||
11870 | -$as_echo_n "checking whether we can compile the netfilter support... " >&6; } | ||
11871 | - if test "${ac_cv_netfilter_can_compile+set}" = set; then : | ||
11872 | - $as_echo_n "(cached) " >&6 | ||
11873 | + { echo "$as_me:$LINENO: checking whether we can compile the netfilter support" >&5 | ||
11874 | +echo $ECHO_N "checking whether we can compile the netfilter support... $ECHO_C" >&6; } | ||
11875 | + if test "${ac_cv_netfilter_can_compile+set}" = set; then | ||
11876 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11877 | else | ||
11878 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
11879 | + cat >conftest.$ac_ext <<_ACEOF | ||
11880 | +/* confdefs.h. */ | ||
11881 | +_ACEOF | ||
11882 | +cat confdefs.h >>conftest.$ac_ext | ||
11883 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11884 | /* end confdefs.h. */ | ||
11885 | |||
11886 | $ac_includes_default | ||
11887 | @@ -7528,63 +11174,224 @@ main () | ||
11888 | return 0; | ||
11889 | } | ||
11890 | _ACEOF | ||
11891 | -if ac_fn_c_try_compile "$LINENO"; then : | ||
11892 | +rm -f conftest.$ac_objext | ||
11893 | +if { (ac_try="$ac_compile" | ||
11894 | +case "(($ac_try" in | ||
11895 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11896 | + *) ac_try_echo=$ac_try;; | ||
11897 | +esac | ||
11898 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11899 | + (eval "$ac_compile") 2>conftest.er1 | ||
11900 | + ac_status=$? | ||
11901 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11902 | + rm -f conftest.er1 | ||
11903 | + cat conftest.err >&5 | ||
11904 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11905 | + (exit $ac_status); } && { | ||
11906 | + test -z "$ac_c_werror_flag" || | ||
11907 | + test ! -s conftest.err | ||
11908 | + } && test -s conftest.$ac_objext; then | ||
11909 | ac_cv_netfilter_can_compile=yes | ||
11910 | else | ||
11911 | - ac_cv_netfilter_can_compile=no | ||
11912 | + echo "$as_me: failed program was:" >&5 | ||
11913 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
11914 | + | ||
11915 | + ac_cv_netfilter_can_compile=no | ||
11916 | fi | ||
11917 | + | ||
11918 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11919 | fi | ||
11920 | |||
11921 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_netfilter_can_compile" >&5 | ||
11922 | -$as_echo "$ac_cv_netfilter_can_compile" >&6; } | ||
11923 | + { echo "$as_me:$LINENO: result: $ac_cv_netfilter_can_compile" >&5 | ||
11924 | +echo "${ECHO_T}$ac_cv_netfilter_can_compile" >&6; } | ||
11925 | if test $ac_cv_netfilter_can_compile = yes ; then | ||
11926 | |||
11927 | -$as_echo "#define PCAP_SUPPORT_NETFILTER 1" >>confdefs.h | ||
11928 | +cat >>confdefs.h <<\_ACEOF | ||
11929 | +#define PCAP_SUPPORT_NETFILTER 1 | ||
11930 | +_ACEOF | ||
11931 | |||
11932 | NETFILTER_SRC=pcap-netfilter-linux.c | ||
11933 | fi | ||
11934 | ;; | ||
11935 | *) | ||
11936 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
11937 | -$as_echo "no" >&6; } | ||
11938 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11939 | +echo "${ECHO_T}no" >&6; } | ||
11940 | ;; | ||
11941 | esac | ||
11942 | |||
11943 | |||
11944 | |||
11945 | # Check whether --enable-bluetooth was given. | ||
11946 | -if test "${enable_bluetooth+set}" = set; then : | ||
11947 | +if test "${enable_bluetooth+set}" = set; then | ||
11948 | enableval=$enable_bluetooth; | ||
11949 | else | ||
11950 | - enable_bluetooth=yes | ||
11951 | + enable_bluetooth=ifavailable | ||
11952 | fi | ||
11953 | |||
11954 | |||
11955 | if test "x$enable_bluetooth" != "xno" ; then | ||
11956 | case "$host_os" in | ||
11957 | linux*) | ||
11958 | - ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default" | ||
11959 | -if test "x$ac_cv_header_bluetooth_bluetooth_h" = x""yes; then : | ||
11960 | + if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then | ||
11961 | + { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 | ||
11962 | +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } | ||
11963 | +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then | ||
11964 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11965 | +fi | ||
11966 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 | ||
11967 | +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } | ||
11968 | +else | ||
11969 | + # Is the header compilable? | ||
11970 | +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5 | ||
11971 | +echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; } | ||
11972 | +cat >conftest.$ac_ext <<_ACEOF | ||
11973 | +/* confdefs.h. */ | ||
11974 | +_ACEOF | ||
11975 | +cat confdefs.h >>conftest.$ac_ext | ||
11976 | +cat >>conftest.$ac_ext <<_ACEOF | ||
11977 | +/* end confdefs.h. */ | ||
11978 | +$ac_includes_default | ||
11979 | +#include <bluetooth/bluetooth.h> | ||
11980 | +_ACEOF | ||
11981 | +rm -f conftest.$ac_objext | ||
11982 | +if { (ac_try="$ac_compile" | ||
11983 | +case "(($ac_try" in | ||
11984 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11985 | + *) ac_try_echo=$ac_try;; | ||
11986 | +esac | ||
11987 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11988 | + (eval "$ac_compile") 2>conftest.er1 | ||
11989 | + ac_status=$? | ||
11990 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
11991 | + rm -f conftest.er1 | ||
11992 | + cat conftest.err >&5 | ||
11993 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11994 | + (exit $ac_status); } && { | ||
11995 | + test -z "$ac_c_werror_flag" || | ||
11996 | + test ! -s conftest.err | ||
11997 | + } && test -s conftest.$ac_objext; then | ||
11998 | + ac_header_compiler=yes | ||
11999 | +else | ||
12000 | + echo "$as_me: failed program was:" >&5 | ||
12001 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
12002 | + | ||
12003 | + ac_header_compiler=no | ||
12004 | +fi | ||
12005 | + | ||
12006 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12007 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
12008 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
12009 | + | ||
12010 | +# Is the header present? | ||
12011 | +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5 | ||
12012 | +echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; } | ||
12013 | +cat >conftest.$ac_ext <<_ACEOF | ||
12014 | +/* confdefs.h. */ | ||
12015 | +_ACEOF | ||
12016 | +cat confdefs.h >>conftest.$ac_ext | ||
12017 | +cat >>conftest.$ac_ext <<_ACEOF | ||
12018 | +/* end confdefs.h. */ | ||
12019 | +#include <bluetooth/bluetooth.h> | ||
12020 | +_ACEOF | ||
12021 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
12022 | +case "(($ac_try" in | ||
12023 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12024 | + *) ac_try_echo=$ac_try;; | ||
12025 | +esac | ||
12026 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12027 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
12028 | + ac_status=$? | ||
12029 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
12030 | + rm -f conftest.er1 | ||
12031 | + cat conftest.err >&5 | ||
12032 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12033 | + (exit $ac_status); } >/dev/null && { | ||
12034 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
12035 | + test ! -s conftest.err | ||
12036 | + }; then | ||
12037 | + ac_header_preproc=yes | ||
12038 | +else | ||
12039 | + echo "$as_me: failed program was:" >&5 | ||
12040 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
12041 | + | ||
12042 | + ac_header_preproc=no | ||
12043 | +fi | ||
12044 | + | ||
12045 | +rm -f conftest.err conftest.$ac_ext | ||
12046 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
12047 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
12048 | + | ||
12049 | +# So? What about this header? | ||
12050 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
12051 | + yes:no: ) | ||
12052 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
12053 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
12054 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5 | ||
12055 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;} | ||
12056 | + ac_header_preproc=yes | ||
12057 | + ;; | ||
12058 | + no:yes:* ) | ||
12059 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5 | ||
12060 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;} | ||
12061 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&5 | ||
12062 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&2;} | ||
12063 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5 | ||
12064 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;} | ||
12065 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
12066 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
12067 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5 | ||
12068 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;} | ||
12069 | + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5 | ||
12070 | +echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;} | ||
12071 | + | ||
12072 | + ;; | ||
12073 | +esac | ||
12074 | +{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 | ||
12075 | +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } | ||
12076 | +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then | ||
12077 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12078 | +else | ||
12079 | + ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc | ||
12080 | +fi | ||
12081 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 | ||
12082 | +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } | ||
12083 | + | ||
12084 | +fi | ||
12085 | +if test $ac_cv_header_bluetooth_bluetooth_h = yes; then | ||
12086 | |||
12087 | |||
12088 | -$as_echo "#define PCAP_SUPPORT_BT 1" >>confdefs.h | ||
12089 | +cat >>confdefs.h <<\_ACEOF | ||
12090 | +#define PCAP_SUPPORT_BT 1 | ||
12091 | +_ACEOF | ||
12092 | |||
12093 | BT_SRC=pcap-bt-linux.c | ||
12094 | - { $as_echo "$as_me:${as_lineno-$LINENO}: Bluetooth sniffing is supported" >&5 | ||
12095 | -$as_echo "$as_me: Bluetooth sniffing is supported" >&6;} | ||
12096 | + { echo "$as_me:$LINENO: Bluetooth sniffing is supported" >&5 | ||
12097 | +echo "$as_me: Bluetooth sniffing is supported" >&6;} | ||
12098 | |||
12099 | else | ||
12100 | - { $as_echo "$as_me:${as_lineno-$LINENO}: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&5 | ||
12101 | -$as_echo "$as_me: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&6;} | ||
12102 | + | ||
12103 | + if test "$enable_bluetooth" = "ifavailable"; then | ||
12104 | + { echo "$as_me:$LINENO: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&5 | ||
12105 | +echo "$as_me: Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&6;} | ||
12106 | + else | ||
12107 | + { { echo "$as_me:$LINENO: error: --enable-bluetooth was specified, but Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&5 | ||
12108 | +echo "$as_me: error: --enable-bluetooth was specified, but Bluetooth sniffing is not supported; install bluez-lib devel to enable it" >&2;} | ||
12109 | + { (exit 1); exit 1; }; } | ||
12110 | + fi | ||
12111 | |||
12112 | fi | ||
12113 | |||
12114 | |||
12115 | ;; | ||
12116 | *) | ||
12117 | - { $as_echo "$as_me:${as_lineno-$LINENO}: no Bluetooth sniffing support implemented for $host_os" >&5 | ||
12118 | -$as_echo "$as_me: no Bluetooth sniffing support implemented for $host_os" >&6;} | ||
12119 | + if test "$enable_bluetooth" = "ifavailable"; then | ||
12120 | + { echo "$as_me:$LINENO: no Bluetooth sniffing support implemented for $host_os" >&5 | ||
12121 | +echo "$as_me: no Bluetooth sniffing support implemented for $host_os" >&6;} | ||
12122 | + else | ||
12123 | + { { echo "$as_me:$LINENO: error: --enable-bluetooth was specified, but no Bluetooth sniffing support implemented for $host_os" >&5 | ||
12124 | +echo "$as_me: error: --enable-bluetooth was specified, but no Bluetooth sniffing support implemented for $host_os" >&2;} | ||
12125 | + { (exit 1); exit 1; }; } | ||
12126 | + fi | ||
12127 | ;; | ||
12128 | esac | ||
12129 | |||
12130 | @@ -7592,36 +11399,177 @@ $as_echo "$as_me: no Bluetooth sniffing support implemented for $host_os" >&6;} | ||
12131 | fi | ||
12132 | |||
12133 | # Check whether --enable-canusb was given. | ||
12134 | -if test "${enable_canusb+set}" = set; then : | ||
12135 | - enableval=$enable_canusb; enable_canusb=yes | ||
12136 | +if test "${enable_canusb+set}" = set; then | ||
12137 | + enableval=$enable_canusb; | ||
12138 | +else | ||
12139 | + enable_canusb=ifavailable | ||
12140 | fi | ||
12141 | |||
12142 | |||
12143 | if test "x$enable_canusb" != "xno" ; then | ||
12144 | case "$host_os" in | ||
12145 | linux*) | ||
12146 | - ac_fn_c_check_header_mongrel "$LINENO" "libusb-1.0/libusb.h" "ac_cv_header_libusb_1_0_libusb_h" "$ac_includes_default" | ||
12147 | -if test "x$ac_cv_header_libusb_1_0_libusb_h" = x""yes; then : | ||
12148 | + if test "${ac_cv_header_libusb_1_0_libusb_h+set}" = set; then | ||
12149 | + { echo "$as_me:$LINENO: checking for libusb-1.0/libusb.h" >&5 | ||
12150 | +echo $ECHO_N "checking for libusb-1.0/libusb.h... $ECHO_C" >&6; } | ||
12151 | +if test "${ac_cv_header_libusb_1_0_libusb_h+set}" = set; then | ||
12152 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12153 | +fi | ||
12154 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_libusb_1_0_libusb_h" >&5 | ||
12155 | +echo "${ECHO_T}$ac_cv_header_libusb_1_0_libusb_h" >&6; } | ||
12156 | +else | ||
12157 | + # Is the header compilable? | ||
12158 | +{ echo "$as_me:$LINENO: checking libusb-1.0/libusb.h usability" >&5 | ||
12159 | +echo $ECHO_N "checking libusb-1.0/libusb.h usability... $ECHO_C" >&6; } | ||
12160 | +cat >conftest.$ac_ext <<_ACEOF | ||
12161 | +/* confdefs.h. */ | ||
12162 | +_ACEOF | ||
12163 | +cat confdefs.h >>conftest.$ac_ext | ||
12164 | +cat >>conftest.$ac_ext <<_ACEOF | ||
12165 | +/* end confdefs.h. */ | ||
12166 | +$ac_includes_default | ||
12167 | +#include <libusb-1.0/libusb.h> | ||
12168 | +_ACEOF | ||
12169 | +rm -f conftest.$ac_objext | ||
12170 | +if { (ac_try="$ac_compile" | ||
12171 | +case "(($ac_try" in | ||
12172 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12173 | + *) ac_try_echo=$ac_try;; | ||
12174 | +esac | ||
12175 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12176 | + (eval "$ac_compile") 2>conftest.er1 | ||
12177 | + ac_status=$? | ||
12178 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
12179 | + rm -f conftest.er1 | ||
12180 | + cat conftest.err >&5 | ||
12181 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12182 | + (exit $ac_status); } && { | ||
12183 | + test -z "$ac_c_werror_flag" || | ||
12184 | + test ! -s conftest.err | ||
12185 | + } && test -s conftest.$ac_objext; then | ||
12186 | + ac_header_compiler=yes | ||
12187 | +else | ||
12188 | + echo "$as_me: failed program was:" >&5 | ||
12189 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
12190 | + | ||
12191 | + ac_header_compiler=no | ||
12192 | +fi | ||
12193 | + | ||
12194 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12195 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
12196 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
12197 | |||
12198 | +# Is the header present? | ||
12199 | +{ echo "$as_me:$LINENO: checking libusb-1.0/libusb.h presence" >&5 | ||
12200 | +echo $ECHO_N "checking libusb-1.0/libusb.h presence... $ECHO_C" >&6; } | ||
12201 | +cat >conftest.$ac_ext <<_ACEOF | ||
12202 | +/* confdefs.h. */ | ||
12203 | +_ACEOF | ||
12204 | +cat confdefs.h >>conftest.$ac_ext | ||
12205 | +cat >>conftest.$ac_ext <<_ACEOF | ||
12206 | +/* end confdefs.h. */ | ||
12207 | +#include <libusb-1.0/libusb.h> | ||
12208 | +_ACEOF | ||
12209 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
12210 | +case "(($ac_try" in | ||
12211 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12212 | + *) ac_try_echo=$ac_try;; | ||
12213 | +esac | ||
12214 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12215 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
12216 | + ac_status=$? | ||
12217 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
12218 | + rm -f conftest.er1 | ||
12219 | + cat conftest.err >&5 | ||
12220 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12221 | + (exit $ac_status); } >/dev/null && { | ||
12222 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
12223 | + test ! -s conftest.err | ||
12224 | + }; then | ||
12225 | + ac_header_preproc=yes | ||
12226 | +else | ||
12227 | + echo "$as_me: failed program was:" >&5 | ||
12228 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
12229 | + | ||
12230 | + ac_header_preproc=no | ||
12231 | +fi | ||
12232 | + | ||
12233 | +rm -f conftest.err conftest.$ac_ext | ||
12234 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
12235 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
12236 | + | ||
12237 | +# So? What about this header? | ||
12238 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
12239 | + yes:no: ) | ||
12240 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
12241 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
12242 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: proceeding with the compiler's result" >&5 | ||
12243 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: proceeding with the compiler's result" >&2;} | ||
12244 | + ac_header_preproc=yes | ||
12245 | + ;; | ||
12246 | + no:yes:* ) | ||
12247 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: present but cannot be compiled" >&5 | ||
12248 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: present but cannot be compiled" >&2;} | ||
12249 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: check for missing prerequisite headers?" >&5 | ||
12250 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: check for missing prerequisite headers?" >&2;} | ||
12251 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: see the Autoconf documentation" >&5 | ||
12252 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: see the Autoconf documentation" >&2;} | ||
12253 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
12254 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
12255 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: proceeding with the preprocessor's result" >&5 | ||
12256 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: proceeding with the preprocessor's result" >&2;} | ||
12257 | + { echo "$as_me:$LINENO: WARNING: libusb-1.0/libusb.h: in the future, the compiler will take precedence" >&5 | ||
12258 | +echo "$as_me: WARNING: libusb-1.0/libusb.h: in the future, the compiler will take precedence" >&2;} | ||
12259 | + | ||
12260 | + ;; | ||
12261 | +esac | ||
12262 | +{ echo "$as_me:$LINENO: checking for libusb-1.0/libusb.h" >&5 | ||
12263 | +echo $ECHO_N "checking for libusb-1.0/libusb.h... $ECHO_C" >&6; } | ||
12264 | +if test "${ac_cv_header_libusb_1_0_libusb_h+set}" = set; then | ||
12265 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12266 | +else | ||
12267 | + ac_cv_header_libusb_1_0_libusb_h=$ac_header_preproc | ||
12268 | +fi | ||
12269 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_libusb_1_0_libusb_h" >&5 | ||
12270 | +echo "${ECHO_T}$ac_cv_header_libusb_1_0_libusb_h" >&6; } | ||
12271 | |||
12272 | -$as_echo "#define PCAP_SUPPORT_CANUSB 1" >>confdefs.h | ||
12273 | +fi | ||
12274 | +if test $ac_cv_header_libusb_1_0_libusb_h = yes; then | ||
12275 | + | ||
12276 | + | ||
12277 | +cat >>confdefs.h <<\_ACEOF | ||
12278 | +#define PCAP_SUPPORT_CANUSB 1 | ||
12279 | +_ACEOF | ||
12280 | |||
12281 | CANUSB_SRC=pcap-canusb-linux.c | ||
12282 | LIBS="-lusb-1.0 $LIBS" | ||
12283 | - { $as_echo "$as_me:${as_lineno-$LINENO}: canusb sniffing is supported" >&5 | ||
12284 | -$as_echo "$as_me: canusb sniffing is supported" >&6;} | ||
12285 | + { echo "$as_me:$LINENO: canusb sniffing is supported" >&5 | ||
12286 | +echo "$as_me: canusb sniffing is supported" >&6;} | ||
12287 | |||
12288 | else | ||
12289 | - { $as_echo "$as_me:${as_lineno-$LINENO}: canusb sniffing is not supported; install libusb1.0 lib devel to enable it" >&5 | ||
12290 | -$as_echo "$as_me: canusb sniffing is not supported; install libusb1.0 lib devel to enable it" >&6;} | ||
12291 | + | ||
12292 | + if test "$enable_canusb" = "ifavailable"; then | ||
12293 | + { echo "$as_me:$LINENO: canusb sniffing is not supported; install libusb1.0 lib devel to enable it" >&5 | ||
12294 | +echo "$as_me: canusb sniffing is not supported; install libusb1.0 lib devel to enable it" >&6;} | ||
12295 | + else | ||
12296 | + { { echo "$as_me:$LINENO: error: --enable-canusb was given, but canusb sniffing is not supported; install libusb1.0 lib devel to enable it" >&5 | ||
12297 | +echo "$as_me: error: --enable-canusb was given, but canusb sniffing is not supported; install libusb1.0 lib devel to enable it" >&2;} | ||
12298 | + { (exit 1); exit 1; }; } | ||
12299 | + fi | ||
12300 | |||
12301 | fi | ||
12302 | |||
12303 | |||
12304 | ;; | ||
12305 | *) | ||
12306 | - { $as_echo "$as_me:${as_lineno-$LINENO}: no canusb support implemented for $host_os" >&5 | ||
12307 | -$as_echo "$as_me: no canusb support implemented for $host_os" >&6;} | ||
12308 | + if test "$enable_canusb" = "ifavailable"; then | ||
12309 | + { echo "$as_me:$LINENO: no canusb support implemented for $host_os" >&5 | ||
12310 | +echo "$as_me: no canusb support implemented for $host_os" >&6;} | ||
12311 | + else | ||
12312 | + { { echo "$as_me:$LINENO: error: --enable-canusb was given, but no canusb support implemented for $host_os" >&5 | ||
12313 | +echo "$as_me: error: --enable-canusb was given, but no canusb support implemented for $host_os" >&2;} | ||
12314 | + { (exit 1); exit 1; }; } | ||
12315 | + fi | ||
12316 | ;; | ||
12317 | esac | ||
12318 | |||
12319 | @@ -7629,50 +11577,190 @@ $as_echo "$as_me: no canusb support implemented for $host_os" >&6;} | ||
12320 | fi | ||
12321 | |||
12322 | # Check whether --enable-can was given. | ||
12323 | -if test "${enable_can+set}" = set; then : | ||
12324 | +if test "${enable_can+set}" = set; then | ||
12325 | enableval=$enable_can; | ||
12326 | else | ||
12327 | - enable_can=yes | ||
12328 | + enable_can=ifavailable | ||
12329 | fi | ||
12330 | |||
12331 | |||
12332 | if test "x$enable_can" != "xno" ; then | ||
12333 | case "$host_os" in | ||
12334 | linux*) | ||
12335 | - ac_fn_c_check_header_compile "$LINENO" "linux/can.h" "ac_cv_header_linux_can_h" "#include <sys/socket.h> | ||
12336 | + #include <sys/socket.h>], | ||
12337 | + -, _AC_CHECK_HEADER_OLD([linux/can.h],[ | ||
12338 | + AC_DEFINE(PCAP_SUPPORT_CAN, 1, [target host supports CAN sniffing]) | ||
12339 | + CAN_SRC=pcap-can-linux.c | ||
12340 | + AC_MSG_NOTICE(CAN sniffing is supported)],[], | ||
12341 | + if test "$enable_can" = "ifavailable"; then | ||
12342 | + AC_MSG_NOTICE([CAN sniffing is not supported]) | ||
12343 | + else | ||
12344 | + AC_MSG_ERROR([--enable-can was specified, but CANbus sniffing is not supported]) | ||
12345 | + fi | ||
12346 | + ,#include <sys/socket.h>)], | ||
12347 | + _AC_CHECK_HEADER_NEW([linux/can.h],[ | ||
12348 | + AC_DEFINE(PCAP_SUPPORT_CAN, 1, [target host supports CAN sniffing]) | ||
12349 | + CAN_SRC=pcap-can-linux.c | ||
12350 | + AC_MSG_NOTICE(CAN sniffing is supported)],[], | ||
12351 | + if test "$enable_can" = "ifavailable"; then | ||
12352 | + AC_MSG_NOTICE([CAN sniffing is not supported]) | ||
12353 | + else | ||
12354 | + AC_MSG_ERROR([--enable-can was specified, but CANbus sniffing is not supported]) | ||
12355 | + fi | ||
12356 | + ,#include <sys/socket.h>)]) | ||
12357 | |||
12358 | -" | ||
12359 | -if test "x$ac_cv_header_linux_can_h" = x""yes; then : | ||
12360 | + ;; | ||
12361 | + *) | ||
12362 | + if test "$enable_can" = "ifavailable"; then | ||
12363 | + { echo "$as_me:$LINENO: no CAN sniffing support implemented for $host_os" >&5 | ||
12364 | +echo "$as_me: no CAN sniffing support implemented for $host_os" >&6;} | ||
12365 | + else | ||
12366 | + { { echo "$as_me:$LINENO: error: --enable-can was specified, but no CAN sniffing support implemented for $host_os" >&5 | ||
12367 | +echo "$as_me: error: --enable-can was specified, but no CAN sniffing support implemented for $host_os" >&2;} | ||
12368 | + { (exit 1); exit 1; }; } | ||
12369 | + fi | ||
12370 | + ;; | ||
12371 | + esac | ||
12372 | + | ||
12373 | + | ||
12374 | +fi | ||
12375 | |||
12376 | -$as_echo "#define PCAP_SUPPORT_CAN 1" >>confdefs.h | ||
12377 | +case "$host_os" in | ||
12378 | +linux*) | ||
12379 | |||
12380 | - CAN_SRC=pcap-can-linux.c | ||
12381 | - { $as_echo "$as_me:${as_lineno-$LINENO}: CAN sniffing is supported" >&5 | ||
12382 | -$as_echo "$as_me: CAN sniffing is supported" >&6;} | ||
12383 | +for ac_header in linux/net_tstamp.h | ||
12384 | +do | ||
12385 | +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
12386 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
12387 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
12388 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
12389 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
12390 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12391 | +fi | ||
12392 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
12393 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
12394 | +echo "${ECHO_T}$ac_res" >&6; } | ||
12395 | +else | ||
12396 | + # Is the header compilable? | ||
12397 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
12398 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
12399 | +cat >conftest.$ac_ext <<_ACEOF | ||
12400 | +/* confdefs.h. */ | ||
12401 | +_ACEOF | ||
12402 | +cat confdefs.h >>conftest.$ac_ext | ||
12403 | +cat >>conftest.$ac_ext <<_ACEOF | ||
12404 | +/* end confdefs.h. */ | ||
12405 | +$ac_includes_default | ||
12406 | +#include <$ac_header> | ||
12407 | +_ACEOF | ||
12408 | +rm -f conftest.$ac_objext | ||
12409 | +if { (ac_try="$ac_compile" | ||
12410 | +case "(($ac_try" in | ||
12411 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12412 | + *) ac_try_echo=$ac_try;; | ||
12413 | +esac | ||
12414 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12415 | + (eval "$ac_compile") 2>conftest.er1 | ||
12416 | + ac_status=$? | ||
12417 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
12418 | + rm -f conftest.er1 | ||
12419 | + cat conftest.err >&5 | ||
12420 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12421 | + (exit $ac_status); } && { | ||
12422 | + test -z "$ac_c_werror_flag" || | ||
12423 | + test ! -s conftest.err | ||
12424 | + } && test -s conftest.$ac_objext; then | ||
12425 | + ac_header_compiler=yes | ||
12426 | else | ||
12427 | - { $as_echo "$as_me:${as_lineno-$LINENO}: CAN sniffing is not supported" >&5 | ||
12428 | -$as_echo "$as_me: CAN sniffing is not supported" >&6;} | ||
12429 | + echo "$as_me: failed program was:" >&5 | ||
12430 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
12431 | + | ||
12432 | + ac_header_compiler=no | ||
12433 | fi | ||
12434 | |||
12435 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12436 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
12437 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
12438 | |||
12439 | - ;; | ||
12440 | - *) | ||
12441 | - { $as_echo "$as_me:${as_lineno-$LINENO}: no CAN sniffing support implemented for $host_os" >&5 | ||
12442 | -$as_echo "$as_me: no CAN sniffing support implemented for $host_os" >&6;} | ||
12443 | - ;; | ||
12444 | - esac | ||
12445 | +# Is the header present? | ||
12446 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
12447 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
12448 | +cat >conftest.$ac_ext <<_ACEOF | ||
12449 | +/* confdefs.h. */ | ||
12450 | +_ACEOF | ||
12451 | +cat confdefs.h >>conftest.$ac_ext | ||
12452 | +cat >>conftest.$ac_ext <<_ACEOF | ||
12453 | +/* end confdefs.h. */ | ||
12454 | +#include <$ac_header> | ||
12455 | +_ACEOF | ||
12456 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
12457 | +case "(($ac_try" in | ||
12458 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12459 | + *) ac_try_echo=$ac_try;; | ||
12460 | +esac | ||
12461 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12462 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
12463 | + ac_status=$? | ||
12464 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
12465 | + rm -f conftest.er1 | ||
12466 | + cat conftest.err >&5 | ||
12467 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12468 | + (exit $ac_status); } >/dev/null && { | ||
12469 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
12470 | + test ! -s conftest.err | ||
12471 | + }; then | ||
12472 | + ac_header_preproc=yes | ||
12473 | +else | ||
12474 | + echo "$as_me: failed program was:" >&5 | ||
12475 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
12476 | + | ||
12477 | + ac_header_preproc=no | ||
12478 | +fi | ||
12479 | |||
12480 | +rm -f conftest.err conftest.$ac_ext | ||
12481 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
12482 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
12483 | + | ||
12484 | +# So? What about this header? | ||
12485 | +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
12486 | + yes:no: ) | ||
12487 | + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
12488 | +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
12489 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
12490 | +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
12491 | + ac_header_preproc=yes | ||
12492 | + ;; | ||
12493 | + no:yes:* ) | ||
12494 | + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
12495 | +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
12496 | + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
12497 | +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
12498 | + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
12499 | +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
12500 | + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
12501 | +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
12502 | + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
12503 | +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
12504 | + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
12505 | +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
12506 | |||
12507 | + ;; | ||
12508 | +esac | ||
12509 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
12510 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
12511 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
12512 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12513 | +else | ||
12514 | + eval "$as_ac_Header=\$ac_header_preproc" | ||
12515 | fi | ||
12516 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
12517 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
12518 | +echo "${ECHO_T}$ac_res" >&6; } | ||
12519 | |||
12520 | -case "$host_os" in | ||
12521 | -linux*) | ||
12522 | - for ac_header in linux/net_tstamp.h | ||
12523 | -do : | ||
12524 | - ac_fn_c_check_header_mongrel "$LINENO" "linux/net_tstamp.h" "ac_cv_header_linux_net_tstamp_h" "$ac_includes_default" | ||
12525 | -if test "x$ac_cv_header_linux_net_tstamp_h" = x""yes; then : | ||
12526 | +fi | ||
12527 | +if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
12528 | cat >>confdefs.h <<_ACEOF | ||
12529 | -#define HAVE_LINUX_NET_TSTAMP_H 1 | ||
12530 | +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
12531 | _ACEOF | ||
12532 | |||
12533 | fi | ||
12534 | @@ -7681,8 +11769,8 @@ done | ||
12535 | |||
12536 | ;; | ||
12537 | *) | ||
12538 | - { $as_echo "$as_me:${as_lineno-$LINENO}: no hardware timestamp support implemented for $host_os" >&5 | ||
12539 | -$as_echo "$as_me: no hardware timestamp support implemented for $host_os" >&6;} | ||
12540 | + { echo "$as_me:$LINENO: no hardware timestamp support implemented for $host_os" >&5 | ||
12541 | +echo "$as_me: no hardware timestamp support implemented for $host_os" >&6;} | ||
12542 | ;; | ||
12543 | esac | ||
12544 | |||
12545 | @@ -7699,23 +11787,22 @@ esac | ||
12546 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
12547 | # OS/2's system install, which has a completely different semantic | ||
12548 | # ./install, which can be erroneously created by make from ./install.sh. | ||
12549 | -# Reject install programs that cannot install multiple files. | ||
12550 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 | ||
12551 | -$as_echo_n "checking for a BSD-compatible install... " >&6; } | ||
12552 | +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
12553 | +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } | ||
12554 | if test -z "$INSTALL"; then | ||
12555 | -if test "${ac_cv_path_install+set}" = set; then : | ||
12556 | - $as_echo_n "(cached) " >&6 | ||
12557 | +if test "${ac_cv_path_install+set}" = set; then | ||
12558 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12559 | else | ||
12560 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
12561 | for as_dir in $PATH | ||
12562 | do | ||
12563 | IFS=$as_save_IFS | ||
12564 | test -z "$as_dir" && as_dir=. | ||
12565 | - # Account for people who put trailing slashes in PATH elements. | ||
12566 | -case $as_dir/ in #(( | ||
12567 | - ./ | .// | /[cC]/* | \ | ||
12568 | + # Account for people who put trailing slashes in PATH elements. | ||
12569 | +case $as_dir/ in | ||
12570 | + ./ | .// | /cC/* | \ | ||
12571 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | ||
12572 | - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ | ||
12573 | + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ | ||
12574 | /usr/ucb/* ) ;; | ||
12575 | *) | ||
12576 | # OSF1 and SCO ODT 3.0 have their own names for install. | ||
12577 | @@ -7733,29 +11820,17 @@ case $as_dir/ in #(( | ||
12578 | # program-specific install script used by HP pwplus--don't use. | ||
12579 | : | ||
12580 | else | ||
12581 | - rm -rf conftest.one conftest.two conftest.dir | ||
12582 | - echo one > conftest.one | ||
12583 | - echo two > conftest.two | ||
12584 | - mkdir conftest.dir | ||
12585 | - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && | ||
12586 | - test -s conftest.one && test -s conftest.two && | ||
12587 | - test -s conftest.dir/conftest.one && | ||
12588 | - test -s conftest.dir/conftest.two | ||
12589 | - then | ||
12590 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
12591 | - break 3 | ||
12592 | - fi | ||
12593 | + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
12594 | + break 3 | ||
12595 | fi | ||
12596 | fi | ||
12597 | done | ||
12598 | done | ||
12599 | ;; | ||
12600 | esac | ||
12601 | - | ||
12602 | - done | ||
12603 | +done | ||
12604 | IFS=$as_save_IFS | ||
12605 | |||
12606 | -rm -rf conftest.one conftest.two conftest.dir | ||
12607 | |||
12608 | fi | ||
12609 | if test "${ac_cv_path_install+set}" = set; then | ||
12610 | @@ -7768,8 +11843,8 @@ fi | ||
12611 | INSTALL=$ac_install_sh | ||
12612 | fi | ||
12613 | fi | ||
12614 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 | ||
12615 | -$as_echo "$INSTALL" >&6; } | ||
12616 | +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 | ||
12617 | +echo "${ECHO_T}$INSTALL" >&6; } | ||
12618 | |||
12619 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
12620 | # It thinks the first close brace ends the variable substitution. | ||
12621 | @@ -7812,13 +11887,12 @@ _ACEOF | ||
12622 | case $ac_val in #( | ||
12623 | *${as_nl}*) | ||
12624 | case $ac_var in #( | ||
12625 | - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 | ||
12626 | -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | ||
12627 | + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | ||
12628 | +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | ||
12629 | esac | ||
12630 | case $ac_var in #( | ||
12631 | _ | IFS | as_nl) ;; #( | ||
12632 | - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( | ||
12633 | - *) { eval $ac_var=; unset $ac_var;} ;; | ||
12634 | + *) $as_unset $ac_var ;; | ||
12635 | esac ;; | ||
12636 | esac | ||
12637 | done | ||
12638 | @@ -7826,8 +11900,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | ||
12639 | (set) 2>&1 | | ||
12640 | case $as_nl`(ac_space=' '; set) 2>&1` in #( | ||
12641 | *${as_nl}ac_space=\ *) | ||
12642 | - # `set' does not quote correctly, so add quotes: double-quote | ||
12643 | - # substitution turns \\\\ into \\, and sed turns \\ into \. | ||
12644 | + # `set' does not quote correctly, so add quotes (double-quote | ||
12645 | + # substitution turns \\\\ into \\, and sed turns \\ into \). | ||
12646 | sed -n \ | ||
12647 | "s/'/'\\\\''/g; | ||
12648 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
12649 | @@ -7850,12 +11924,12 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | ||
12650 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else | ||
12651 | if test -w "$cache_file"; then | ||
12652 | test "x$cache_file" != "x/dev/null" && | ||
12653 | - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 | ||
12654 | -$as_echo "$as_me: updating cache $cache_file" >&6;} | ||
12655 | + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 | ||
12656 | +echo "$as_me: updating cache $cache_file" >&6;} | ||
12657 | cat confcache >$cache_file | ||
12658 | else | ||
12659 | - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 | ||
12660 | -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} | ||
12661 | + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 | ||
12662 | +echo "$as_me: not updating unwritable cache $cache_file" >&6;} | ||
12663 | fi | ||
12664 | fi | ||
12665 | rm -f confcache | ||
12666 | @@ -7868,15 +11942,14 @@ DEFS=-DHAVE_CONFIG_H | ||
12667 | |||
12668 | ac_libobjs= | ||
12669 | ac_ltlibobjs= | ||
12670 | -U= | ||
12671 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | ||
12672 | # 1. Remove the extension, and $U if already installed. | ||
12673 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | ||
12674 | - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` | ||
12675 | + ac_i=`echo "$ac_i" | sed "$ac_script"` | ||
12676 | # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR | ||
12677 | # will be set to the directory where LIBOBJS objects are built. | ||
12678 | - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" | ||
12679 | - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' | ||
12680 | + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" | ||
12681 | + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' | ||
12682 | done | ||
12683 | LIBOBJS=$ac_libobjs | ||
12684 | |||
12685 | @@ -7885,13 +11958,11 @@ LTLIBOBJS=$ac_ltlibobjs | ||
12686 | |||
12687 | |||
12688 | : ${CONFIG_STATUS=./config.status} | ||
12689 | -ac_write_fail=0 | ||
12690 | ac_clean_files_save=$ac_clean_files | ||
12691 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" | ||
12692 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 | ||
12693 | -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} | ||
12694 | -as_write_fail=0 | ||
12695 | -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 | ||
12696 | +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 | ||
12697 | +echo "$as_me: creating $CONFIG_STATUS" >&6;} | ||
12698 | +cat >$CONFIG_STATUS <<_ACEOF | ||
12699 | #! $SHELL | ||
12700 | # Generated by $as_me. | ||
12701 | # Run this file to recreate the current configuration. | ||
12702 | @@ -7901,79 +11972,59 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 | ||
12703 | debug=false | ||
12704 | ac_cs_recheck=false | ||
12705 | ac_cs_silent=false | ||
12706 | - | ||
12707 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
12708 | -export SHELL | ||
12709 | -_ASEOF | ||
12710 | -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 | ||
12711 | -## -------------------- ## | ||
12712 | -## M4sh Initialization. ## | ||
12713 | -## -------------------- ## | ||
12714 | +_ACEOF | ||
12715 | + | ||
12716 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
12717 | +## --------------------- ## | ||
12718 | +## M4sh Initialization. ## | ||
12719 | +## --------------------- ## | ||
12720 | |||
12721 | # Be more Bourne compatible | ||
12722 | DUALCASE=1; export DUALCASE # for MKS sh | ||
12723 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : | ||
12724 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
12725 | emulate sh | ||
12726 | NULLCMD=: | ||
12727 | - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | ||
12728 | + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
12729 | # is contrary to our usage. Disable this feature. | ||
12730 | alias -g '${1+"$@"}'='"$@"' | ||
12731 | setopt NO_GLOB_SUBST | ||
12732 | else | ||
12733 | - case `(set -o) 2>/dev/null` in #( | ||
12734 | - *posix*) : | ||
12735 | - set -o posix ;; #( | ||
12736 | - *) : | ||
12737 | - ;; | ||
12738 | + case `(set -o) 2>/dev/null` in | ||
12739 | + *posix*) set -o posix ;; | ||
12740 | esac | ||
12741 | + | ||
12742 | fi | ||
12743 | |||
12744 | |||
12745 | -as_nl=' | ||
12746 | -' | ||
12747 | -export as_nl | ||
12748 | -# Printing a long string crashes Solaris 7 /usr/bin/printf. | ||
12749 | -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | ||
12750 | -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo | ||
12751 | -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo | ||
12752 | -# Prefer a ksh shell builtin over an external printf program on Solaris, | ||
12753 | -# but without wasting forks for bash or zsh. | ||
12754 | -if test -z "$BASH_VERSION$ZSH_VERSION" \ | ||
12755 | - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
12756 | - as_echo='print -r --' | ||
12757 | - as_echo_n='print -rn --' | ||
12758 | -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
12759 | - as_echo='printf %s\n' | ||
12760 | - as_echo_n='printf %s' | ||
12761 | -else | ||
12762 | - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then | ||
12763 | - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' | ||
12764 | - as_echo_n='/usr/ucb/echo -n' | ||
12765 | + | ||
12766 | + | ||
12767 | +# PATH needs CR | ||
12768 | +# Avoid depending upon Character Ranges. | ||
12769 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
12770 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
12771 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
12772 | +as_cr_digits='0123456789' | ||
12773 | +as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
12774 | + | ||
12775 | +# The user is always right. | ||
12776 | +if test "${PATH_SEPARATOR+set}" != set; then | ||
12777 | + echo "#! /bin/sh" >conf$$.sh | ||
12778 | + echo "exit 0" >>conf$$.sh | ||
12779 | + chmod +x conf$$.sh | ||
12780 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
12781 | + PATH_SEPARATOR=';' | ||
12782 | else | ||
12783 | - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' | ||
12784 | - as_echo_n_body='eval | ||
12785 | - arg=$1; | ||
12786 | - case $arg in #( | ||
12787 | - *"$as_nl"*) | ||
12788 | - expr "X$arg" : "X\\(.*\\)$as_nl"; | ||
12789 | - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; | ||
12790 | - esac; | ||
12791 | - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" | ||
12792 | - ' | ||
12793 | - export as_echo_n_body | ||
12794 | - as_echo_n='sh -c $as_echo_n_body as_echo' | ||
12795 | + PATH_SEPARATOR=: | ||
12796 | fi | ||
12797 | - export as_echo_body | ||
12798 | - as_echo='sh -c $as_echo_body as_echo' | ||
12799 | + rm -f conf$$.sh | ||
12800 | fi | ||
12801 | |||
12802 | -# The user is always right. | ||
12803 | -if test "${PATH_SEPARATOR+set}" != set; then | ||
12804 | - PATH_SEPARATOR=: | ||
12805 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { | ||
12806 | - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || | ||
12807 | - PATH_SEPARATOR=';' | ||
12808 | - } | ||
12809 | +# Support unset when possible. | ||
12810 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
12811 | + as_unset=unset | ||
12812 | +else | ||
12813 | + as_unset=false | ||
12814 | fi | ||
12815 | |||
12816 | |||
12817 | @@ -7982,18 +12033,20 @@ fi | ||
12818 | # there to prevent editors from complaining about space-tab. | ||
12819 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word | ||
12820 | # splitting by setting IFS to empty value.) | ||
12821 | +as_nl=' | ||
12822 | +' | ||
12823 | IFS=" "" $as_nl" | ||
12824 | |||
12825 | # Find who we are. Look in the path if we contain no directory separator. | ||
12826 | -case $0 in #(( | ||
12827 | +case $0 in | ||
12828 | *[\\/]* ) as_myself=$0 ;; | ||
12829 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
12830 | for as_dir in $PATH | ||
12831 | do | ||
12832 | IFS=$as_save_IFS | ||
12833 | test -z "$as_dir" && as_dir=. | ||
12834 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
12835 | - done | ||
12836 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
12837 | +done | ||
12838 | IFS=$as_save_IFS | ||
12839 | |||
12840 | ;; | ||
12841 | @@ -8004,111 +12057,32 @@ if test "x$as_myself" = x; then | ||
12842 | as_myself=$0 | ||
12843 | fi | ||
12844 | if test ! -f "$as_myself"; then | ||
12845 | - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
12846 | - exit 1 | ||
12847 | + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
12848 | + { (exit 1); exit 1; } | ||
12849 | fi | ||
12850 | |||
12851 | -# Unset variables that we do not need and which cause bugs (e.g. in | ||
12852 | -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" | ||
12853 | -# suppresses any "Segmentation fault" message there. '((' could | ||
12854 | -# trigger a bug in pdksh 5.2.14. | ||
12855 | -for as_var in BASH_ENV ENV MAIL MAILPATH | ||
12856 | -do eval test x\${$as_var+set} = xset \ | ||
12857 | - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : | ||
12858 | +# Work around bugs in pre-3.0 UWIN ksh. | ||
12859 | +for as_var in ENV MAIL MAILPATH | ||
12860 | +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
12861 | done | ||
12862 | PS1='$ ' | ||
12863 | PS2='> ' | ||
12864 | PS4='+ ' | ||
12865 | |||
12866 | # NLS nuisances. | ||
12867 | -LC_ALL=C | ||
12868 | -export LC_ALL | ||
12869 | -LANGUAGE=C | ||
12870 | -export LANGUAGE | ||
12871 | - | ||
12872 | -# CDPATH. | ||
12873 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
12874 | - | ||
12875 | - | ||
12876 | -# as_fn_error STATUS ERROR [LINENO LOG_FD] | ||
12877 | -# ---------------------------------------- | ||
12878 | -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are | ||
12879 | -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the | ||
12880 | -# script with STATUS, using 1 if that was 0. | ||
12881 | -as_fn_error () | ||
12882 | -{ | ||
12883 | - as_status=$1; test $as_status -eq 0 && as_status=1 | ||
12884 | - if test "$4"; then | ||
12885 | - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
12886 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 | ||
12887 | +for as_var in \ | ||
12888 | + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | ||
12889 | + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
12890 | + LC_TELEPHONE LC_TIME | ||
12891 | +do | ||
12892 | + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
12893 | + eval $as_var=C; export $as_var | ||
12894 | + else | ||
12895 | + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
12896 | fi | ||
12897 | - $as_echo "$as_me: error: $2" >&2 | ||
12898 | - as_fn_exit $as_status | ||
12899 | -} # as_fn_error | ||
12900 | - | ||
12901 | - | ||
12902 | -# as_fn_set_status STATUS | ||
12903 | -# ----------------------- | ||
12904 | -# Set $? to STATUS, without forking. | ||
12905 | -as_fn_set_status () | ||
12906 | -{ | ||
12907 | - return $1 | ||
12908 | -} # as_fn_set_status | ||
12909 | - | ||
12910 | -# as_fn_exit STATUS | ||
12911 | -# ----------------- | ||
12912 | -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. | ||
12913 | -as_fn_exit () | ||
12914 | -{ | ||
12915 | - set +e | ||
12916 | - as_fn_set_status $1 | ||
12917 | - exit $1 | ||
12918 | -} # as_fn_exit | ||
12919 | - | ||
12920 | -# as_fn_unset VAR | ||
12921 | -# --------------- | ||
12922 | -# Portably unset VAR. | ||
12923 | -as_fn_unset () | ||
12924 | -{ | ||
12925 | - { eval $1=; unset $1;} | ||
12926 | -} | ||
12927 | -as_unset=as_fn_unset | ||
12928 | -# as_fn_append VAR VALUE | ||
12929 | -# ---------------------- | ||
12930 | -# Append the text in VALUE to the end of the definition contained in VAR. Take | ||
12931 | -# advantage of any shell optimizations that allow amortized linear growth over | ||
12932 | -# repeated appends, instead of the typical quadratic growth present in naive | ||
12933 | -# implementations. | ||
12934 | -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : | ||
12935 | - eval 'as_fn_append () | ||
12936 | - { | ||
12937 | - eval $1+=\$2 | ||
12938 | - }' | ||
12939 | -else | ||
12940 | - as_fn_append () | ||
12941 | - { | ||
12942 | - eval $1=\$$1\$2 | ||
12943 | - } | ||
12944 | -fi # as_fn_append | ||
12945 | - | ||
12946 | -# as_fn_arith ARG... | ||
12947 | -# ------------------ | ||
12948 | -# Perform arithmetic evaluation on the ARGs, and store the result in the | ||
12949 | -# global $as_val. Take advantage of shells that can avoid forks. The arguments | ||
12950 | -# must be portable across $(()) and expr. | ||
12951 | -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : | ||
12952 | - eval 'as_fn_arith () | ||
12953 | - { | ||
12954 | - as_val=$(( $* )) | ||
12955 | - }' | ||
12956 | -else | ||
12957 | - as_fn_arith () | ||
12958 | - { | ||
12959 | - as_val=`expr "$@" || test $? -eq 1` | ||
12960 | - } | ||
12961 | -fi # as_fn_arith | ||
12962 | - | ||
12963 | +done | ||
12964 | |||
12965 | +# Required to use basename. | ||
12966 | if expr a : '\(a\)' >/dev/null 2>&1 && | ||
12967 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
12968 | as_expr=expr | ||
12969 | @@ -8122,17 +12096,13 @@ else | ||
12970 | as_basename=false | ||
12971 | fi | ||
12972 | |||
12973 | -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
12974 | - as_dirname=dirname | ||
12975 | -else | ||
12976 | - as_dirname=false | ||
12977 | -fi | ||
12978 | |||
12979 | +# Name of the executable. | ||
12980 | as_me=`$as_basename -- "$0" || | ||
12981 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
12982 | X"$0" : 'X\(//\)$' \| \ | ||
12983 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
12984 | -$as_echo X/"$0" | | ||
12985 | +echo X/"$0" | | ||
12986 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
12987 | s//\1/ | ||
12988 | q | ||
12989 | @@ -8147,103 +12117,104 @@ $as_echo X/"$0" | | ||
12990 | } | ||
12991 | s/.*/./; q'` | ||
12992 | |||
12993 | -# Avoid depending upon Character Ranges. | ||
12994 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
12995 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
12996 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
12997 | -as_cr_digits='0123456789' | ||
12998 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
12999 | +# CDPATH. | ||
13000 | +$as_unset CDPATH | ||
13001 | + | ||
13002 | + | ||
13003 | + | ||
13004 | + as_lineno_1=$LINENO | ||
13005 | + as_lineno_2=$LINENO | ||
13006 | + test "x$as_lineno_1" != "x$as_lineno_2" && | ||
13007 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | ||
13008 | + | ||
13009 | + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
13010 | + # uniformly replaced by the line number. The first 'sed' inserts a | ||
13011 | + # line-number line after each line using $LINENO; the second 'sed' | ||
13012 | + # does the real work. The second script uses 'N' to pair each | ||
13013 | + # line-number line with the line containing $LINENO, and appends | ||
13014 | + # trailing '-' during substitution so that $LINENO is not a special | ||
13015 | + # case at line end. | ||
13016 | + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
13017 | + # scripts with optimization help from Paolo Bonzini. Blame Lee | ||
13018 | + # E. McMahon (1931-1989) for sed's syntax. :-) | ||
13019 | + sed -n ' | ||
13020 | + p | ||
13021 | + /[$]LINENO/= | ||
13022 | + ' <$as_myself | | ||
13023 | + sed ' | ||
13024 | + s/[$]LINENO.*/&-/ | ||
13025 | + t lineno | ||
13026 | + b | ||
13027 | + :lineno | ||
13028 | + N | ||
13029 | + :loop | ||
13030 | + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | ||
13031 | + t loop | ||
13032 | + s/-\n.*// | ||
13033 | + ' >$as_me.lineno && | ||
13034 | + chmod +x "$as_me.lineno" || | ||
13035 | + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
13036 | + { (exit 1); exit 1; }; } | ||
13037 | + | ||
13038 | + # Don't try to exec as it changes $[0], causing all sort of problems | ||
13039 | + # (the dirname of $[0] is not the place where we might find the | ||
13040 | + # original and so on. Autoconf is especially sensitive to this). | ||
13041 | + . "./$as_me.lineno" | ||
13042 | + # Exit status is that of the last command. | ||
13043 | + exit | ||
13044 | +} | ||
13045 | + | ||
13046 | + | ||
13047 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
13048 | + as_dirname=dirname | ||
13049 | +else | ||
13050 | + as_dirname=false | ||
13051 | +fi | ||
13052 | |||
13053 | ECHO_C= ECHO_N= ECHO_T= | ||
13054 | -case `echo -n x` in #((((( | ||
13055 | +case `echo -n x` in | ||
13056 | -n*) | ||
13057 | - case `echo 'xy\c'` in | ||
13058 | + case `echo 'x\c'` in | ||
13059 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
13060 | - xy) ECHO_C='\c';; | ||
13061 | - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null | ||
13062 | - ECHO_T=' ';; | ||
13063 | + *) ECHO_C='\c';; | ||
13064 | esac;; | ||
13065 | *) | ||
13066 | ECHO_N='-n';; | ||
13067 | esac | ||
13068 | |||
13069 | +if expr a : '\(a\)' >/dev/null 2>&1 && | ||
13070 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
13071 | + as_expr=expr | ||
13072 | +else | ||
13073 | + as_expr=false | ||
13074 | +fi | ||
13075 | + | ||
13076 | rm -f conf$$ conf$$.exe conf$$.file | ||
13077 | if test -d conf$$.dir; then | ||
13078 | rm -f conf$$.dir/conf$$.file | ||
13079 | else | ||
13080 | rm -f conf$$.dir | ||
13081 | - mkdir conf$$.dir 2>/dev/null | ||
13082 | -fi | ||
13083 | -if (echo >conf$$.file) 2>/dev/null; then | ||
13084 | - if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
13085 | - as_ln_s='ln -s' | ||
13086 | - # ... but there are two gotchas: | ||
13087 | - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | ||
13088 | - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | ||
13089 | - # In both cases, we have to default to `cp -p'. | ||
13090 | - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
13091 | - as_ln_s='cp -p' | ||
13092 | - elif ln conf$$.file conf$$ 2>/dev/null; then | ||
13093 | - as_ln_s=ln | ||
13094 | - else | ||
13095 | + mkdir conf$$.dir | ||
13096 | +fi | ||
13097 | +echo >conf$$.file | ||
13098 | +if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
13099 | + as_ln_s='ln -s' | ||
13100 | + # ... but there are two gotchas: | ||
13101 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | ||
13102 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | ||
13103 | + # In both cases, we have to default to `cp -p'. | ||
13104 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
13105 | as_ln_s='cp -p' | ||
13106 | - fi | ||
13107 | +elif ln conf$$.file conf$$ 2>/dev/null; then | ||
13108 | + as_ln_s=ln | ||
13109 | else | ||
13110 | as_ln_s='cp -p' | ||
13111 | fi | ||
13112 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | ||
13113 | rmdir conf$$.dir 2>/dev/null | ||
13114 | |||
13115 | - | ||
13116 | -# as_fn_mkdir_p | ||
13117 | -# ------------- | ||
13118 | -# Create "$as_dir" as a directory, including parents if necessary. | ||
13119 | -as_fn_mkdir_p () | ||
13120 | -{ | ||
13121 | - | ||
13122 | - case $as_dir in #( | ||
13123 | - -*) as_dir=./$as_dir;; | ||
13124 | - esac | ||
13125 | - test -d "$as_dir" || eval $as_mkdir_p || { | ||
13126 | - as_dirs= | ||
13127 | - while :; do | ||
13128 | - case $as_dir in #( | ||
13129 | - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | ||
13130 | - *) as_qdir=$as_dir;; | ||
13131 | - esac | ||
13132 | - as_dirs="'$as_qdir' $as_dirs" | ||
13133 | - as_dir=`$as_dirname -- "$as_dir" || | ||
13134 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
13135 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
13136 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
13137 | - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
13138 | -$as_echo X"$as_dir" | | ||
13139 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
13140 | - s//\1/ | ||
13141 | - q | ||
13142 | - } | ||
13143 | - /^X\(\/\/\)[^/].*/{ | ||
13144 | - s//\1/ | ||
13145 | - q | ||
13146 | - } | ||
13147 | - /^X\(\/\/\)$/{ | ||
13148 | - s//\1/ | ||
13149 | - q | ||
13150 | - } | ||
13151 | - /^X\(\/\).*/{ | ||
13152 | - s//\1/ | ||
13153 | - q | ||
13154 | - } | ||
13155 | - s/.*/./; q'` | ||
13156 | - test -d "$as_dir" && break | ||
13157 | - done | ||
13158 | - test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
13159 | - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" | ||
13160 | - | ||
13161 | - | ||
13162 | -} # as_fn_mkdir_p | ||
13163 | if mkdir -p . 2>/dev/null; then | ||
13164 | - as_mkdir_p='mkdir -p "$as_dir"' | ||
13165 | + as_mkdir_p=: | ||
13166 | else | ||
13167 | test -d ./-p && rmdir ./-p | ||
13168 | as_mkdir_p=false | ||
13169 | @@ -8260,12 +12231,12 @@ else | ||
13170 | as_test_x=' | ||
13171 | eval sh -c '\'' | ||
13172 | if test -d "$1"; then | ||
13173 | - test -d "$1/."; | ||
13174 | + test -d "$1/."; | ||
13175 | else | ||
13176 | - case $1 in #( | ||
13177 | - -*)set "./$1";; | ||
13178 | + case $1 in | ||
13179 | + -*)set "./$1";; | ||
13180 | esac; | ||
13181 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
13182 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | ||
13183 | ???[sx]*):;;*)false;;esac;fi | ||
13184 | '\'' sh | ||
13185 | ' | ||
13186 | @@ -8280,19 +12251,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
13187 | |||
13188 | |||
13189 | exec 6>&1 | ||
13190 | -## ----------------------------------- ## | ||
13191 | -## Main body of $CONFIG_STATUS script. ## | ||
13192 | -## ----------------------------------- ## | ||
13193 | -_ASEOF | ||
13194 | -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 | ||
13195 | |||
13196 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13197 | -# Save the log message, to keep $0 and so on meaningful, and to | ||
13198 | +# Save the log message, to keep $[0] and so on meaningful, and to | ||
13199 | # report actual input values of CONFIG_FILES etc. instead of their | ||
13200 | # values after options handling. | ||
13201 | ac_log=" | ||
13202 | This file was extended by $as_me, which was | ||
13203 | -generated by GNU Autoconf 2.67. Invocation command line was | ||
13204 | +generated by GNU Autoconf 2.61. Invocation command line was | ||
13205 | |||
13206 | CONFIG_FILES = $CONFIG_FILES | ||
13207 | CONFIG_HEADERS = $CONFIG_HEADERS | ||
13208 | @@ -8305,41 +12270,29 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` | ||
13209 | |||
13210 | _ACEOF | ||
13211 | |||
13212 | -case $ac_config_files in *" | ||
13213 | -"*) set x $ac_config_files; shift; ac_config_files=$*;; | ||
13214 | -esac | ||
13215 | - | ||
13216 | -case $ac_config_headers in *" | ||
13217 | -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; | ||
13218 | -esac | ||
13219 | - | ||
13220 | - | ||
13221 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
13222 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
13223 | # Files that config.status was made for. | ||
13224 | config_files="$ac_config_files" | ||
13225 | config_headers="$ac_config_headers" | ||
13226 | |||
13227 | _ACEOF | ||
13228 | |||
13229 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13230 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
13231 | ac_cs_usage="\ | ||
13232 | -\`$as_me' instantiates files and other configuration actions | ||
13233 | -from templates according to the current configuration. Unless the files | ||
13234 | -and actions are specified as TAGs, all are instantiated by default. | ||
13235 | +\`$as_me' instantiates files from templates according to the | ||
13236 | +current configuration. | ||
13237 | |||
13238 | -Usage: $0 [OPTION]... [TAG]... | ||
13239 | +Usage: $0 [OPTIONS] [FILE]... | ||
13240 | |||
13241 | -h, --help print this help, then exit | ||
13242 | -V, --version print version number and configuration settings, then exit | ||
13243 | - --config print configuration, then exit | ||
13244 | - -q, --quiet, --silent | ||
13245 | - do not print progress messages | ||
13246 | + -q, --quiet do not print progress messages | ||
13247 | -d, --debug don't remove temporary files | ||
13248 | --recheck update $as_me by reconfiguring in the same conditions | ||
13249 | - --file=FILE[:TEMPLATE] | ||
13250 | - instantiate the configuration file FILE | ||
13251 | - --header=FILE[:TEMPLATE] | ||
13252 | - instantiate the configuration header FILE | ||
13253 | + --file=FILE[:TEMPLATE] | ||
13254 | + instantiate the configuration file FILE | ||
13255 | + --header=FILE[:TEMPLATE] | ||
13256 | + instantiate the configuration header FILE | ||
13257 | |||
13258 | Configuration files: | ||
13259 | $config_files | ||
13260 | @@ -8347,42 +12300,36 @@ $config_files | ||
13261 | Configuration headers: | ||
13262 | $config_headers | ||
13263 | |||
13264 | -Report bugs to the package provider." | ||
13265 | +Report bugs to <bug-autoconf@gnu.org>." | ||
13266 | |||
13267 | _ACEOF | ||
13268 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
13269 | -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | ||
13270 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
13271 | ac_cs_version="\\ | ||
13272 | config.status | ||
13273 | -configured by $0, generated by GNU Autoconf 2.67, | ||
13274 | - with options \\"\$ac_cs_config\\" | ||
13275 | +configured by $0, generated by GNU Autoconf 2.61, | ||
13276 | + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | ||
13277 | |||
13278 | -Copyright (C) 2010 Free Software Foundation, Inc. | ||
13279 | +Copyright (C) 2006 Free Software Foundation, Inc. | ||
13280 | This config.status script is free software; the Free Software Foundation | ||
13281 | gives unlimited permission to copy, distribute and modify it." | ||
13282 | |||
13283 | ac_pwd='$ac_pwd' | ||
13284 | srcdir='$srcdir' | ||
13285 | INSTALL='$INSTALL' | ||
13286 | -test -n "\$AWK" || AWK=awk | ||
13287 | _ACEOF | ||
13288 | |||
13289 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13290 | -# The default lists apply if the user does not specify any file. | ||
13291 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
13292 | +# If no file are specified by the user, then we need to provide default | ||
13293 | +# value. By we need to know if files were specified by the user. | ||
13294 | ac_need_defaults=: | ||
13295 | while test $# != 0 | ||
13296 | do | ||
13297 | case $1 in | ||
13298 | - --*=?*) | ||
13299 | + --*=*) | ||
13300 | ac_option=`expr "X$1" : 'X\([^=]*\)='` | ||
13301 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` | ||
13302 | ac_shift=: | ||
13303 | ;; | ||
13304 | - --*=) | ||
13305 | - ac_option=`expr "X$1" : 'X\([^=]*\)='` | ||
13306 | - ac_optarg= | ||
13307 | - ac_shift=: | ||
13308 | - ;; | ||
13309 | *) | ||
13310 | ac_option=$1 | ||
13311 | ac_optarg=$2 | ||
13312 | @@ -8395,41 +12342,34 @@ do | ||
13313 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | ||
13314 | ac_cs_recheck=: ;; | ||
13315 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | ||
13316 | - $as_echo "$ac_cs_version"; exit ;; | ||
13317 | - --config | --confi | --conf | --con | --co | --c ) | ||
13318 | - $as_echo "$ac_cs_config"; exit ;; | ||
13319 | + echo "$ac_cs_version"; exit ;; | ||
13320 | --debug | --debu | --deb | --de | --d | -d ) | ||
13321 | debug=: ;; | ||
13322 | --file | --fil | --fi | --f ) | ||
13323 | $ac_shift | ||
13324 | - case $ac_optarg in | ||
13325 | - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
13326 | - '') as_fn_error $? "missing file argument" ;; | ||
13327 | - esac | ||
13328 | - as_fn_append CONFIG_FILES " '$ac_optarg'" | ||
13329 | + CONFIG_FILES="$CONFIG_FILES $ac_optarg" | ||
13330 | ac_need_defaults=false;; | ||
13331 | --header | --heade | --head | --hea ) | ||
13332 | $ac_shift | ||
13333 | - case $ac_optarg in | ||
13334 | - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
13335 | - esac | ||
13336 | - as_fn_append CONFIG_HEADERS " '$ac_optarg'" | ||
13337 | + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" | ||
13338 | ac_need_defaults=false;; | ||
13339 | --he | --h) | ||
13340 | # Conflict between --help and --header | ||
13341 | - as_fn_error $? "ambiguous option: \`$1' | ||
13342 | -Try \`$0 --help' for more information.";; | ||
13343 | + { echo "$as_me: error: ambiguous option: $1 | ||
13344 | +Try \`$0 --help' for more information." >&2 | ||
13345 | + { (exit 1); exit 1; }; };; | ||
13346 | --help | --hel | -h ) | ||
13347 | - $as_echo "$ac_cs_usage"; exit ;; | ||
13348 | + echo "$ac_cs_usage"; exit ;; | ||
13349 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
13350 | | -silent | --silent | --silen | --sile | --sil | --si | --s) | ||
13351 | ac_cs_silent=: ;; | ||
13352 | |||
13353 | # This is an error. | ||
13354 | - -*) as_fn_error $? "unrecognized option: \`$1' | ||
13355 | -Try \`$0 --help' for more information." ;; | ||
13356 | + -*) { echo "$as_me: error: unrecognized option: $1 | ||
13357 | +Try \`$0 --help' for more information." >&2 | ||
13358 | + { (exit 1); exit 1; }; } ;; | ||
13359 | |||
13360 | - *) as_fn_append ac_config_targets " $1" | ||
13361 | + *) ac_config_targets="$ac_config_targets $1" | ||
13362 | ac_need_defaults=false ;; | ||
13363 | |||
13364 | esac | ||
13365 | @@ -8444,32 +12384,30 @@ if $ac_cs_silent; then | ||
13366 | fi | ||
13367 | |||
13368 | _ACEOF | ||
13369 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
13370 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
13371 | if \$ac_cs_recheck; then | ||
13372 | - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | ||
13373 | - shift | ||
13374 | - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 | ||
13375 | - CONFIG_SHELL='$SHELL' | ||
13376 | + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | ||
13377 | + CONFIG_SHELL=$SHELL | ||
13378 | export CONFIG_SHELL | ||
13379 | - exec "\$@" | ||
13380 | + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | ||
13381 | fi | ||
13382 | |||
13383 | _ACEOF | ||
13384 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13385 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
13386 | exec 5>>config.log | ||
13387 | { | ||
13388 | echo | ||
13389 | sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | ||
13390 | ## Running $as_me. ## | ||
13391 | _ASBOX | ||
13392 | - $as_echo "$ac_log" | ||
13393 | + echo "$ac_log" | ||
13394 | } >&5 | ||
13395 | |||
13396 | _ACEOF | ||
13397 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
13398 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
13399 | _ACEOF | ||
13400 | |||
13401 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13402 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
13403 | |||
13404 | # Handling of arguments. | ||
13405 | for ac_config_target in $ac_config_targets | ||
13406 | @@ -8491,7 +12429,9 @@ do | ||
13407 | "pcap_open_offline.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_open_offline.3pcap" ;; | ||
13408 | "pcap_set_tstamp_type.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_type.3pcap" ;; | ||
13409 | |||
13410 | - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; | ||
13411 | + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | ||
13412 | +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | ||
13413 | + { (exit 1); exit 1; }; };; | ||
13414 | esac | ||
13415 | done | ||
13416 | |||
13417 | @@ -8517,7 +12457,7 @@ $debug || | ||
13418 | trap 'exit_status=$? | ||
13419 | { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status | ||
13420 | ' 0 | ||
13421 | - trap 'as_fn_exit 1' 1 2 13 15 | ||
13422 | + trap '{ (exit 1); exit 1; }' 1 2 13 15 | ||
13423 | } | ||
13424 | # Create a (secure) tmp directory for tmp files. | ||
13425 | |||
13426 | @@ -8528,285 +12468,191 @@ $debug || | ||
13427 | { | ||
13428 | tmp=./conf$$-$RANDOM | ||
13429 | (umask 077 && mkdir "$tmp") | ||
13430 | -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 | ||
13431 | - | ||
13432 | -# Set up the scripts for CONFIG_FILES section. | ||
13433 | -# No need to generate them if there are no CONFIG_FILES. | ||
13434 | -# This happens for instance with `./config.status config.h'. | ||
13435 | -if test -n "$CONFIG_FILES"; then | ||
13436 | +} || | ||
13437 | +{ | ||
13438 | + echo "$me: cannot create a temporary directory in ." >&2 | ||
13439 | + { (exit 1); exit 1; } | ||
13440 | +} | ||
13441 | |||
13442 | +# | ||
13443 | +# Set up the sed scripts for CONFIG_FILES section. | ||
13444 | +# | ||
13445 | |||
13446 | -ac_cr=`echo X | tr X '\015'` | ||
13447 | -# On cygwin, bash can eat \r inside `` if the user requested igncr. | ||
13448 | -# But we know of no other shell where ac_cr would be empty at this | ||
13449 | -# point, so we can use a bashism as a fallback. | ||
13450 | -if test "x$ac_cr" = x; then | ||
13451 | - eval ac_cr=\$\'\\r\' | ||
13452 | -fi | ||
13453 | -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` | ||
13454 | -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then | ||
13455 | - ac_cs_awk_cr='\\r' | ||
13456 | -else | ||
13457 | - ac_cs_awk_cr=$ac_cr | ||
13458 | -fi | ||
13459 | +# No need to generate the scripts if there are no CONFIG_FILES. | ||
13460 | +# This happens for instance when ./config.status config.h | ||
13461 | +if test -n "$CONFIG_FILES"; then | ||
13462 | |||
13463 | -echo 'BEGIN {' >"$tmp/subs1.awk" && | ||
13464 | _ACEOF | ||
13465 | |||
13466 | |||
13467 | -{ | ||
13468 | - echo "cat >conf$$subs.awk <<_ACEOF" && | ||
13469 | - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && | ||
13470 | - echo "_ACEOF" | ||
13471 | -} >conf$$subs.sh || | ||
13472 | - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 | ||
13473 | -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` | ||
13474 | + | ||
13475 | ac_delim='%!_!# ' | ||
13476 | for ac_last_try in false false false false false :; do | ||
13477 | - . ./conf$$subs.sh || | ||
13478 | - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 | ||
13479 | + cat >conf$$subs.sed <<_ACEOF | ||
13480 | +SHELL!$SHELL$ac_delim | ||
13481 | +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim | ||
13482 | +PACKAGE_NAME!$PACKAGE_NAME$ac_delim | ||
13483 | +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim | ||
13484 | +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim | ||
13485 | +PACKAGE_STRING!$PACKAGE_STRING$ac_delim | ||
13486 | +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim | ||
13487 | +exec_prefix!$exec_prefix$ac_delim | ||
13488 | +prefix!$prefix$ac_delim | ||
13489 | +program_transform_name!$program_transform_name$ac_delim | ||
13490 | +bindir!$bindir$ac_delim | ||
13491 | +sbindir!$sbindir$ac_delim | ||
13492 | +libexecdir!$libexecdir$ac_delim | ||
13493 | +datarootdir!$datarootdir$ac_delim | ||
13494 | +datadir!$datadir$ac_delim | ||
13495 | +sysconfdir!$sysconfdir$ac_delim | ||
13496 | +sharedstatedir!$sharedstatedir$ac_delim | ||
13497 | +localstatedir!$localstatedir$ac_delim | ||
13498 | +includedir!$includedir$ac_delim | ||
13499 | +oldincludedir!$oldincludedir$ac_delim | ||
13500 | +docdir!$docdir$ac_delim | ||
13501 | +infodir!$infodir$ac_delim | ||
13502 | +htmldir!$htmldir$ac_delim | ||
13503 | +dvidir!$dvidir$ac_delim | ||
13504 | +pdfdir!$pdfdir$ac_delim | ||
13505 | +psdir!$psdir$ac_delim | ||
13506 | +libdir!$libdir$ac_delim | ||
13507 | +localedir!$localedir$ac_delim | ||
13508 | +mandir!$mandir$ac_delim | ||
13509 | +DEFS!$DEFS$ac_delim | ||
13510 | +ECHO_C!$ECHO_C$ac_delim | ||
13511 | +ECHO_N!$ECHO_N$ac_delim | ||
13512 | +ECHO_T!$ECHO_T$ac_delim | ||
13513 | +LIBS!$LIBS$ac_delim | ||
13514 | +build_alias!$build_alias$ac_delim | ||
13515 | +host_alias!$host_alias$ac_delim | ||
13516 | +target_alias!$target_alias$ac_delim | ||
13517 | +build!$build$ac_delim | ||
13518 | +build_cpu!$build_cpu$ac_delim | ||
13519 | +build_vendor!$build_vendor$ac_delim | ||
13520 | +build_os!$build_os$ac_delim | ||
13521 | +host!$host$ac_delim | ||
13522 | +host_cpu!$host_cpu$ac_delim | ||
13523 | +host_vendor!$host_vendor$ac_delim | ||
13524 | +host_os!$host_os$ac_delim | ||
13525 | +target!$target$ac_delim | ||
13526 | +target_cpu!$target_cpu$ac_delim | ||
13527 | +target_vendor!$target_vendor$ac_delim | ||
13528 | +target_os!$target_os$ac_delim | ||
13529 | +SHLICC2!$SHLICC2$ac_delim | ||
13530 | +CC!$CC$ac_delim | ||
13531 | +CFLAGS!$CFLAGS$ac_delim | ||
13532 | +LDFLAGS!$LDFLAGS$ac_delim | ||
13533 | +CPPFLAGS!$CPPFLAGS$ac_delim | ||
13534 | +ac_ct_CC!$ac_ct_CC$ac_delim | ||
13535 | +EXEEXT!$EXEEXT$ac_delim | ||
13536 | +OBJEXT!$OBJEXT$ac_delim | ||
13537 | +CPP!$CPP$ac_delim | ||
13538 | +GREP!$GREP$ac_delim | ||
13539 | +EGREP!$EGREP$ac_delim | ||
13540 | +LIBOBJS!$LIBOBJS$ac_delim | ||
13541 | +HAVE_LINUX_TPACKET_AUXDATA!$HAVE_LINUX_TPACKET_AUXDATA$ac_delim | ||
13542 | +V_LEX!$V_LEX$ac_delim | ||
13543 | +V_YACC!$V_YACC$ac_delim | ||
13544 | +RANLIB!$RANLIB$ac_delim | ||
13545 | +AR!$AR$ac_delim | ||
13546 | +V_CCOPT!$V_CCOPT$ac_delim | ||
13547 | +V_DEFS!$V_DEFS$ac_delim | ||
13548 | +V_FINDALLDEVS!$V_FINDALLDEVS$ac_delim | ||
13549 | +V_INCLS!$V_INCLS$ac_delim | ||
13550 | +V_PCAP!$V_PCAP$ac_delim | ||
13551 | +V_SHLIB_CMD!$V_SHLIB_CMD$ac_delim | ||
13552 | +V_SHLIB_OPT!$V_SHLIB_OPT$ac_delim | ||
13553 | +V_SONAME_OPT!$V_SONAME_OPT$ac_delim | ||
13554 | +V_RPATH_OPT!$V_RPATH_OPT$ac_delim | ||
13555 | +ADDLOBJS!$ADDLOBJS$ac_delim | ||
13556 | +ADDLARCHIVEOBJS!$ADDLARCHIVEOBJS$ac_delim | ||
13557 | +SSRC!$SSRC$ac_delim | ||
13558 | +DYEXT!$DYEXT$ac_delim | ||
13559 | +MAN_FILE_FORMATS!$MAN_FILE_FORMATS$ac_delim | ||
13560 | +MAN_MISC_INFO!$MAN_MISC_INFO$ac_delim | ||
13561 | +PCAP_SUPPORT_USB!$PCAP_SUPPORT_USB$ac_delim | ||
13562 | +USB_SRC!$USB_SRC$ac_delim | ||
13563 | +PCAP_SUPPORT_NETFILTER!$PCAP_SUPPORT_NETFILTER$ac_delim | ||
13564 | +NETFILTER_SRC!$NETFILTER_SRC$ac_delim | ||
13565 | +PCAP_SUPPORT_BT!$PCAP_SUPPORT_BT$ac_delim | ||
13566 | +BT_SRC!$BT_SRC$ac_delim | ||
13567 | +PCAP_SUPPORT_CANUSB!$PCAP_SUPPORT_CANUSB$ac_delim | ||
13568 | +CANUSB_SRC!$CANUSB_SRC$ac_delim | ||
13569 | +PCAP_SUPPORT_CAN!$PCAP_SUPPORT_CAN$ac_delim | ||
13570 | +CAN_SRC!$CAN_SRC$ac_delim | ||
13571 | +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim | ||
13572 | +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim | ||
13573 | +INSTALL_DATA!$INSTALL_DATA$ac_delim | ||
13574 | +LTLIBOBJS!$LTLIBOBJS$ac_delim | ||
13575 | +_ACEOF | ||
13576 | |||
13577 | - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` | ||
13578 | - if test $ac_delim_n = $ac_delim_num; then | ||
13579 | + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then | ||
13580 | break | ||
13581 | elif $ac_last_try; then | ||
13582 | - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 | ||
13583 | + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
13584 | +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
13585 | + { (exit 1); exit 1; }; } | ||
13586 | else | ||
13587 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
13588 | fi | ||
13589 | done | ||
13590 | -rm -f conf$$subs.sh | ||
13591 | - | ||
13592 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
13593 | -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && | ||
13594 | -_ACEOF | ||
13595 | -sed -n ' | ||
13596 | -h | ||
13597 | -s/^/S["/; s/!.*/"]=/ | ||
13598 | -p | ||
13599 | -g | ||
13600 | -s/^[^!]*!// | ||
13601 | -:repl | ||
13602 | -t repl | ||
13603 | -s/'"$ac_delim"'$// | ||
13604 | -t delim | ||
13605 | -:nl | ||
13606 | -h | ||
13607 | -s/\(.\{148\}\)..*/\1/ | ||
13608 | -t more1 | ||
13609 | -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ | ||
13610 | -p | ||
13611 | -n | ||
13612 | -b repl | ||
13613 | -:more1 | ||
13614 | -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ | ||
13615 | -p | ||
13616 | -g | ||
13617 | -s/.\{148\}// | ||
13618 | -t nl | ||
13619 | -:delim | ||
13620 | -h | ||
13621 | -s/\(.\{148\}\)..*/\1/ | ||
13622 | -t more2 | ||
13623 | -s/["\\]/\\&/g; s/^/"/; s/$/"/ | ||
13624 | -p | ||
13625 | -b | ||
13626 | -:more2 | ||
13627 | -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ | ||
13628 | -p | ||
13629 | -g | ||
13630 | -s/.\{148\}// | ||
13631 | -t delim | ||
13632 | -' <conf$$subs.awk | sed ' | ||
13633 | -/^[^""]/{ | ||
13634 | - N | ||
13635 | - s/\n// | ||
13636 | -} | ||
13637 | -' >>$CONFIG_STATUS || ac_write_fail=1 | ||
13638 | -rm -f conf$$subs.awk | ||
13639 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
13640 | -_ACAWK | ||
13641 | -cat >>"\$tmp/subs1.awk" <<_ACAWK && | ||
13642 | - for (key in S) S_is_set[key] = 1 | ||
13643 | - FS = "" | ||
13644 | |||
13645 | -} | ||
13646 | -{ | ||
13647 | - line = $ 0 | ||
13648 | - nfields = split(line, field, "@") | ||
13649 | - substed = 0 | ||
13650 | - len = length(field[1]) | ||
13651 | - for (i = 2; i < nfields; i++) { | ||
13652 | - key = field[i] | ||
13653 | - keylen = length(key) | ||
13654 | - if (S_is_set[key]) { | ||
13655 | - value = S[key] | ||
13656 | - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) | ||
13657 | - len += length(value) + length(field[++i]) | ||
13658 | - substed = 1 | ||
13659 | - } else | ||
13660 | - len += 1 + keylen | ||
13661 | - } | ||
13662 | - | ||
13663 | - print line | ||
13664 | -} | ||
13665 | +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
13666 | +if test -n "$ac_eof"; then | ||
13667 | + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
13668 | + ac_eof=`expr $ac_eof + 1` | ||
13669 | +fi | ||
13670 | |||
13671 | -_ACAWK | ||
13672 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
13673 | +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof | ||
13674 | +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end | ||
13675 | _ACEOF | ||
13676 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13677 | -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then | ||
13678 | - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" | ||
13679 | -else | ||
13680 | - cat | ||
13681 | -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ | ||
13682 | - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 | ||
13683 | +sed ' | ||
13684 | +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
13685 | +s/^/s,@/; s/!/@,|#_!!_#|/ | ||
13686 | +:n | ||
13687 | +t n | ||
13688 | +s/'"$ac_delim"'$/,g/; t | ||
13689 | +s/$/\\/; p | ||
13690 | +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
13691 | +' >>$CONFIG_STATUS <conf$$subs.sed | ||
13692 | +rm -f conf$$subs.sed | ||
13693 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
13694 | +:end | ||
13695 | +s/|#_!!_#|//g | ||
13696 | +CEOF$ac_eof | ||
13697 | _ACEOF | ||
13698 | |||
13699 | -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), | ||
13700 | -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and | ||
13701 | + | ||
13702 | +# VPATH may cause trouble with some makes, so we remove $(srcdir), | ||
13703 | +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | ||
13704 | # trailing colons and then remove the whole line if VPATH becomes empty | ||
13705 | # (actually we leave an empty line to preserve line numbers). | ||
13706 | if test "x$srcdir" = x.; then | ||
13707 | - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ | ||
13708 | -h | ||
13709 | -s/// | ||
13710 | -s/^/:/ | ||
13711 | -s/[ ]*$/:/ | ||
13712 | -s/:\$(srcdir):/:/g | ||
13713 | -s/:\${srcdir}:/:/g | ||
13714 | -s/:@srcdir@:/:/g | ||
13715 | -s/^:*// | ||
13716 | + ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
13717 | +s/:*\$(srcdir):*/:/ | ||
13718 | +s/:*\${srcdir}:*/:/ | ||
13719 | +s/:*@srcdir@:*/:/ | ||
13720 | +s/^\([^=]*=[ ]*\):*/\1/ | ||
13721 | s/:*$// | ||
13722 | -x | ||
13723 | -s/\(=[ ]*\).*/\1/ | ||
13724 | -G | ||
13725 | -s/\n// | ||
13726 | s/^[^=]*=[ ]*$// | ||
13727 | }' | ||
13728 | fi | ||
13729 | |||
13730 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13731 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
13732 | fi # test -n "$CONFIG_FILES" | ||
13733 | |||
13734 | -# Set up the scripts for CONFIG_HEADERS section. | ||
13735 | -# No need to generate them if there are no CONFIG_HEADERS. | ||
13736 | -# This happens for instance with `./config.status Makefile'. | ||
13737 | -if test -n "$CONFIG_HEADERS"; then | ||
13738 | -cat >"$tmp/defines.awk" <<\_ACAWK || | ||
13739 | -BEGIN { | ||
13740 | -_ACEOF | ||
13741 | - | ||
13742 | -# Transform confdefs.h into an awk script `defines.awk', embedded as | ||
13743 | -# here-document in config.status, that substitutes the proper values into | ||
13744 | -# config.h.in to produce config.h. | ||
13745 | - | ||
13746 | -# Create a delimiter string that does not exist in confdefs.h, to ease | ||
13747 | -# handling of long lines. | ||
13748 | -ac_delim='%!_!# ' | ||
13749 | -for ac_last_try in false false :; do | ||
13750 | - ac_t=`sed -n "/$ac_delim/p" confdefs.h` | ||
13751 | - if test -z "$ac_t"; then | ||
13752 | - break | ||
13753 | - elif $ac_last_try; then | ||
13754 | - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 | ||
13755 | - else | ||
13756 | - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
13757 | - fi | ||
13758 | -done | ||
13759 | - | ||
13760 | -# For the awk script, D is an array of macro values keyed by name, | ||
13761 | -# likewise P contains macro parameters if any. Preserve backslash | ||
13762 | -# newline sequences. | ||
13763 | - | ||
13764 | -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* | ||
13765 | -sed -n ' | ||
13766 | -s/.\{148\}/&'"$ac_delim"'/g | ||
13767 | -t rset | ||
13768 | -:rset | ||
13769 | -s/^[ ]*#[ ]*define[ ][ ]*/ / | ||
13770 | -t def | ||
13771 | -d | ||
13772 | -:def | ||
13773 | -s/\\$// | ||
13774 | -t bsnl | ||
13775 | -s/["\\]/\\&/g | ||
13776 | -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ | ||
13777 | -D["\1"]=" \3"/p | ||
13778 | -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p | ||
13779 | -d | ||
13780 | -:bsnl | ||
13781 | -s/["\\]/\\&/g | ||
13782 | -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ | ||
13783 | -D["\1"]=" \3\\\\\\n"\\/p | ||
13784 | -t cont | ||
13785 | -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p | ||
13786 | -t cont | ||
13787 | -d | ||
13788 | -:cont | ||
13789 | -n | ||
13790 | -s/.\{148\}/&'"$ac_delim"'/g | ||
13791 | -t clear | ||
13792 | -:clear | ||
13793 | -s/\\$// | ||
13794 | -t bsnlc | ||
13795 | -s/["\\]/\\&/g; s/^/"/; s/$/"/p | ||
13796 | -d | ||
13797 | -:bsnlc | ||
13798 | -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p | ||
13799 | -b cont | ||
13800 | -' <confdefs.h | sed ' | ||
13801 | -s/'"$ac_delim"'/"\\\ | ||
13802 | -"/g' >>$CONFIG_STATUS || ac_write_fail=1 | ||
13803 | - | ||
13804 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
13805 | - for (key in D) D_is_set[key] = 1 | ||
13806 | - FS = "" | ||
13807 | -} | ||
13808 | -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { | ||
13809 | - line = \$ 0 | ||
13810 | - split(line, arg, " ") | ||
13811 | - if (arg[1] == "#") { | ||
13812 | - defundef = arg[2] | ||
13813 | - mac1 = arg[3] | ||
13814 | - } else { | ||
13815 | - defundef = substr(arg[1], 2) | ||
13816 | - mac1 = arg[2] | ||
13817 | - } | ||
13818 | - split(mac1, mac2, "(") #) | ||
13819 | - macro = mac2[1] | ||
13820 | - prefix = substr(line, 1, index(line, defundef) - 1) | ||
13821 | - if (D_is_set[macro]) { | ||
13822 | - # Preserve the white space surrounding the "#". | ||
13823 | - print prefix "define", macro P[macro] D[macro] | ||
13824 | - next | ||
13825 | - } else { | ||
13826 | - # Replace #undef with comments. This is necessary, for example, | ||
13827 | - # in the case of _POSIX_SOURCE, which is predefined and required | ||
13828 | - # on some systems where configure will not decide to define it. | ||
13829 | - if (defundef == "undef") { | ||
13830 | - print "/*", prefix defundef, macro, "*/" | ||
13831 | - next | ||
13832 | - } | ||
13833 | - } | ||
13834 | -} | ||
13835 | -{ print } | ||
13836 | -_ACAWK | ||
13837 | -_ACEOF | ||
13838 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13839 | - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 | ||
13840 | -fi # test -n "$CONFIG_HEADERS" | ||
13841 | - | ||
13842 | |||
13843 | -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " | ||
13844 | -shift | ||
13845 | -for ac_tag | ||
13846 | +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS | ||
13847 | do | ||
13848 | case $ac_tag in | ||
13849 | :[FHLC]) ac_mode=$ac_tag; continue;; | ||
13850 | esac | ||
13851 | case $ac_mode$ac_tag in | ||
13852 | :[FHL]*:*);; | ||
13853 | - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; | ||
13854 | + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 | ||
13855 | +echo "$as_me: error: Invalid tag $ac_tag." >&2;} | ||
13856 | + { (exit 1); exit 1; }; };; | ||
13857 | :[FH]-) ac_tag=-:-;; | ||
13858 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | ||
13859 | esac | ||
13860 | @@ -8834,34 +12680,26 @@ do | ||
13861 | [\\/$]*) false;; | ||
13862 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | ||
13863 | esac || | ||
13864 | - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; | ||
13865 | + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 | ||
13866 | +echo "$as_me: error: cannot find input file: $ac_f" >&2;} | ||
13867 | + { (exit 1); exit 1; }; };; | ||
13868 | esac | ||
13869 | - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac | ||
13870 | - as_fn_append ac_file_inputs " '$ac_f'" | ||
13871 | + ac_file_inputs="$ac_file_inputs $ac_f" | ||
13872 | done | ||
13873 | |||
13874 | # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
13875 | # use $as_me), people would be surprised to read: | ||
13876 | # /* config.h. Generated by config.status. */ | ||
13877 | - configure_input='Generated from '` | ||
13878 | - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' | ||
13879 | - `' by configure.' | ||
13880 | + configure_input="Generated from "`IFS=: | ||
13881 | + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." | ||
13882 | if test x"$ac_file" != x-; then | ||
13883 | configure_input="$ac_file. $configure_input" | ||
13884 | - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 | ||
13885 | -$as_echo "$as_me: creating $ac_file" >&6;} | ||
13886 | + { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
13887 | +echo "$as_me: creating $ac_file" >&6;} | ||
13888 | fi | ||
13889 | - # Neutralize special characters interpreted by sed in replacement strings. | ||
13890 | - case $configure_input in #( | ||
13891 | - *\&* | *\|* | *\\* ) | ||
13892 | - ac_sed_conf_input=`$as_echo "$configure_input" | | ||
13893 | - sed 's/[\\\\&|]/\\\\&/g'`;; #( | ||
13894 | - *) ac_sed_conf_input=$configure_input;; | ||
13895 | - esac | ||
13896 | |||
13897 | case $ac_tag in | ||
13898 | - *:-:* | *:-) cat >"$tmp/stdin" \ | ||
13899 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; | ||
13900 | + *:-:* | *:-) cat >"$tmp/stdin";; | ||
13901 | esac | ||
13902 | ;; | ||
13903 | esac | ||
13904 | @@ -8871,7 +12709,42 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
13905 | X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
13906 | X"$ac_file" : 'X\(//\)$' \| \ | ||
13907 | X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || | ||
13908 | -$as_echo X"$ac_file" | | ||
13909 | +echo X"$ac_file" | | ||
13910 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
13911 | + s//\1/ | ||
13912 | + q | ||
13913 | + } | ||
13914 | + /^X\(\/\/\)[^/].*/{ | ||
13915 | + s//\1/ | ||
13916 | + q | ||
13917 | + } | ||
13918 | + /^X\(\/\/\)$/{ | ||
13919 | + s//\1/ | ||
13920 | + q | ||
13921 | + } | ||
13922 | + /^X\(\/\).*/{ | ||
13923 | + s//\1/ | ||
13924 | + q | ||
13925 | + } | ||
13926 | + s/.*/./; q'` | ||
13927 | + { as_dir="$ac_dir" | ||
13928 | + case $as_dir in #( | ||
13929 | + -*) as_dir=./$as_dir;; | ||
13930 | + esac | ||
13931 | + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
13932 | + as_dirs= | ||
13933 | + while :; do | ||
13934 | + case $as_dir in #( | ||
13935 | + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | ||
13936 | + *) as_qdir=$as_dir;; | ||
13937 | + esac | ||
13938 | + as_dirs="'$as_qdir' $as_dirs" | ||
13939 | + as_dir=`$as_dirname -- "$as_dir" || | ||
13940 | +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
13941 | + X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
13942 | + X"$as_dir" : 'X\(//\)$' \| \ | ||
13943 | + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
13944 | +echo X"$as_dir" | | ||
13945 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
13946 | s//\1/ | ||
13947 | q | ||
13948 | @@ -8889,15 +12762,20 @@ $as_echo X"$ac_file" | | ||
13949 | q | ||
13950 | } | ||
13951 | s/.*/./; q'` | ||
13952 | - as_dir="$ac_dir"; as_fn_mkdir_p | ||
13953 | + test -d "$as_dir" && break | ||
13954 | + done | ||
13955 | + test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
13956 | + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | ||
13957 | +echo "$as_me: error: cannot create directory $as_dir" >&2;} | ||
13958 | + { (exit 1); exit 1; }; }; } | ||
13959 | ac_builddir=. | ||
13960 | |||
13961 | case "$ac_dir" in | ||
13962 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
13963 | *) | ||
13964 | - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` | ||
13965 | + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
13966 | # A ".." for each directory in $ac_dir_suffix. | ||
13967 | - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` | ||
13968 | + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | ||
13969 | case $ac_top_builddir_sub in | ||
13970 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
13971 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | ||
13972 | @@ -8937,12 +12815,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | ||
13973 | esac | ||
13974 | _ACEOF | ||
13975 | |||
13976 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
13977 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
13978 | # If the template does not know about datarootdir, expand it. | ||
13979 | # FIXME: This hack should be removed a few years after 2.60. | ||
13980 | ac_datarootdir_hack=; ac_datarootdir_seen= | ||
13981 | -ac_sed_dataroot=' | ||
13982 | -/datarootdir/ { | ||
13983 | + | ||
13984 | +case `sed -n '/datarootdir/ { | ||
13985 | p | ||
13986 | q | ||
13987 | } | ||
13988 | @@ -8950,37 +12828,36 @@ ac_sed_dataroot=' | ||
13989 | /@docdir@/p | ||
13990 | /@infodir@/p | ||
13991 | /@localedir@/p | ||
13992 | -/@mandir@/p' | ||
13993 | -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in | ||
13994 | +/@mandir@/p | ||
13995 | +' $ac_file_inputs` in | ||
13996 | *datarootdir*) ac_datarootdir_seen=yes;; | ||
13997 | *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) | ||
13998 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | ||
13999 | -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | ||
14000 | + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | ||
14001 | +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | ||
14002 | _ACEOF | ||
14003 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
14004 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
14005 | ac_datarootdir_hack=' | ||
14006 | s&@datadir@&$datadir&g | ||
14007 | s&@docdir@&$docdir&g | ||
14008 | s&@infodir@&$infodir&g | ||
14009 | s&@localedir@&$localedir&g | ||
14010 | s&@mandir@&$mandir&g | ||
14011 | - s&\\\${datarootdir}&$datarootdir&g' ;; | ||
14012 | + s&\\\${datarootdir}&$datarootdir&g' ;; | ||
14013 | esac | ||
14014 | _ACEOF | ||
14015 | |||
14016 | # Neutralize VPATH when `$srcdir' = `.'. | ||
14017 | # Shell code in configure.ac might set extrasub. | ||
14018 | # FIXME: do we really want to maintain this feature? | ||
14019 | -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
14020 | -ac_sed_extra="$ac_vpsub | ||
14021 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
14022 | + sed "$ac_vpsub | ||
14023 | $extrasub | ||
14024 | _ACEOF | ||
14025 | -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
14026 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
14027 | :t | ||
14028 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
14029 | -s|@configure_input@|$ac_sed_conf_input|;t t | ||
14030 | +s&@configure_input@&$configure_input&;t t | ||
14031 | s&@top_builddir@&$ac_top_builddir_sub&;t t | ||
14032 | -s&@top_build_prefix@&$ac_top_build_prefix&;t t | ||
14033 | s&@srcdir@&$ac_srcdir&;t t | ||
14034 | s&@abs_srcdir@&$ac_abs_srcdir&;t t | ||
14035 | s&@top_srcdir@&$ac_top_srcdir&;t t | ||
14036 | @@ -8990,48 +12867,119 @@ s&@abs_builddir@&$ac_abs_builddir&;t t | ||
14037 | s&@abs_top_builddir@&$ac_abs_top_builddir&;t t | ||
14038 | s&@INSTALL@&$ac_INSTALL&;t t | ||
14039 | $ac_datarootdir_hack | ||
14040 | -" | ||
14041 | -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ | ||
14042 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
14043 | +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out | ||
14044 | |||
14045 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | ||
14046 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | ||
14047 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | ||
14048 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
14049 | -which seems to be undefined. Please make sure it is defined" >&5 | ||
14050 | -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
14051 | -which seems to be undefined. Please make sure it is defined" >&2;} | ||
14052 | + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
14053 | +which seems to be undefined. Please make sure it is defined." >&5 | ||
14054 | +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
14055 | +which seems to be undefined. Please make sure it is defined." >&2;} | ||
14056 | |||
14057 | rm -f "$tmp/stdin" | ||
14058 | case $ac_file in | ||
14059 | - -) cat "$tmp/out" && rm -f "$tmp/out";; | ||
14060 | - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; | ||
14061 | - esac \ | ||
14062 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
14063 | + -) cat "$tmp/out"; rm -f "$tmp/out";; | ||
14064 | + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; | ||
14065 | + esac | ||
14066 | ;; | ||
14067 | :H) | ||
14068 | # | ||
14069 | # CONFIG_HEADER | ||
14070 | # | ||
14071 | +_ACEOF | ||
14072 | + | ||
14073 | +# Transform confdefs.h into a sed script `conftest.defines', that | ||
14074 | +# substitutes the proper values into config.h.in to produce config.h. | ||
14075 | +rm -f conftest.defines conftest.tail | ||
14076 | +# First, append a space to every undef/define line, to ease matching. | ||
14077 | +echo 's/$/ /' >conftest.defines | ||
14078 | +# Then, protect against being on the right side of a sed subst, or in | ||
14079 | +# an unquoted here document, in config.status. If some macros were | ||
14080 | +# called several times there might be several #defines for the same | ||
14081 | +# symbol, which is useless. But do not sort them, since the last | ||
14082 | +# AC_DEFINE must be honored. | ||
14083 | +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* | ||
14084 | +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where | ||
14085 | +# NAME is the cpp macro being defined, VALUE is the value it is being given. | ||
14086 | +# PARAMS is the parameter list in the macro definition--in most cases, it's | ||
14087 | +# just an empty string. | ||
14088 | +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' | ||
14089 | +ac_dB='\\)[ (].*,\\1define\\2' | ||
14090 | +ac_dC=' ' | ||
14091 | +ac_dD=' ,' | ||
14092 | + | ||
14093 | +uniq confdefs.h | | ||
14094 | + sed -n ' | ||
14095 | + t rset | ||
14096 | + :rset | ||
14097 | + s/^[ ]*#[ ]*define[ ][ ]*// | ||
14098 | + t ok | ||
14099 | + d | ||
14100 | + :ok | ||
14101 | + s/[\\&,]/\\&/g | ||
14102 | + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p | ||
14103 | + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p | ||
14104 | + ' >>conftest.defines | ||
14105 | + | ||
14106 | +# Remove the space that was appended to ease matching. | ||
14107 | +# Then replace #undef with comments. This is necessary, for | ||
14108 | +# example, in the case of _POSIX_SOURCE, which is predefined and required | ||
14109 | +# on some systems where configure will not decide to define it. | ||
14110 | +# (The regexp can be short, since the line contains either #define or #undef.) | ||
14111 | +echo 's/ $// | ||
14112 | +s,^[ #]*u.*,/* & */,' >>conftest.defines | ||
14113 | + | ||
14114 | +# Break up conftest.defines: | ||
14115 | +ac_max_sed_lines=50 | ||
14116 | + | ||
14117 | +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" | ||
14118 | +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" | ||
14119 | +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" | ||
14120 | +# et cetera. | ||
14121 | +ac_in='$ac_file_inputs' | ||
14122 | +ac_out='"$tmp/out1"' | ||
14123 | +ac_nxt='"$tmp/out2"' | ||
14124 | + | ||
14125 | +while : | ||
14126 | +do | ||
14127 | + # Write a here document: | ||
14128 | + cat >>$CONFIG_STATUS <<_ACEOF | ||
14129 | + # First, check the format of the line: | ||
14130 | + cat >"\$tmp/defines.sed" <<\\CEOF | ||
14131 | +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def | ||
14132 | +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def | ||
14133 | +b | ||
14134 | +:def | ||
14135 | +_ACEOF | ||
14136 | + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS | ||
14137 | + echo 'CEOF | ||
14138 | + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS | ||
14139 | + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in | ||
14140 | + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail | ||
14141 | + grep . conftest.tail >/dev/null || break | ||
14142 | + rm -f conftest.defines | ||
14143 | + mv conftest.tail conftest.defines | ||
14144 | +done | ||
14145 | +rm -f conftest.defines conftest.tail | ||
14146 | + | ||
14147 | +echo "ac_result=$ac_in" >>$CONFIG_STATUS | ||
14148 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
14149 | if test x"$ac_file" != x-; then | ||
14150 | - { | ||
14151 | - $as_echo "/* $configure_input */" \ | ||
14152 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" | ||
14153 | - } >"$tmp/config.h" \ | ||
14154 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
14155 | - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then | ||
14156 | - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 | ||
14157 | -$as_echo "$as_me: $ac_file is unchanged" >&6;} | ||
14158 | + echo "/* $configure_input */" >"$tmp/config.h" | ||
14159 | + cat "$ac_result" >>"$tmp/config.h" | ||
14160 | + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then | ||
14161 | + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 | ||
14162 | +echo "$as_me: $ac_file is unchanged" >&6;} | ||
14163 | else | ||
14164 | - rm -f "$ac_file" | ||
14165 | - mv "$tmp/config.h" "$ac_file" \ | ||
14166 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | ||
14167 | + rm -f $ac_file | ||
14168 | + mv "$tmp/config.h" $ac_file | ||
14169 | fi | ||
14170 | else | ||
14171 | - $as_echo "/* $configure_input */" \ | ||
14172 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ | ||
14173 | - || as_fn_error $? "could not create -" "$LINENO" 5 | ||
14174 | + echo "/* $configure_input */" | ||
14175 | + cat "$ac_result" | ||
14176 | fi | ||
14177 | + rm -f "$tmp/out12" | ||
14178 | ;; | ||
14179 | |||
14180 | |||
14181 | @@ -9040,13 +12988,11 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} | ||
14182 | done # for ac_tag | ||
14183 | |||
14184 | |||
14185 | -as_fn_exit 0 | ||
14186 | +{ (exit 0); exit 0; } | ||
14187 | _ACEOF | ||
14188 | +chmod +x $CONFIG_STATUS | ||
14189 | ac_clean_files=$ac_clean_files_save | ||
14190 | |||
14191 | -test $ac_write_fail = 0 || | ||
14192 | - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 | ||
14193 | - | ||
14194 | |||
14195 | # configure is writing to config.log, and then calls config.status. | ||
14196 | # config.status does its own redirection, appending to config.log. | ||
14197 | @@ -9066,11 +13012,7 @@ if test "$no_create" != yes; then | ||
14198 | exec 5>>config.log | ||
14199 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which | ||
14200 | # would make configure fail if this is the last instruction. | ||
14201 | - $ac_cs_success || as_fn_exit 1 | ||
14202 | -fi | ||
14203 | -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | ||
14204 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | ||
14205 | -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} | ||
14206 | + $ac_cs_success || { (exit 1); exit 1; } | ||
14207 | fi | ||
14208 | |||
14209 | |||
14210 | diff --git a/configure.in b/configure.in | ||
14211 | index 8432d2a..d8554ca 100644 | ||
14212 | --- a/configure.in | ||
14213 | +++ b/configure.in | ||
14214 | @@ -1395,7 +1395,7 @@ if test "x$enable_bluetooth" != "xno" ; then | ||
14215 | fi | ||
14216 | |||
14217 | AC_ARG_ENABLE([canusb], | ||
14218 | -[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])] | ||
14219 | +[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])], | ||
14220 | ,enable_canusb=yes) | ||
14221 | |||
14222 | if test "x$enable_canusb" != "xno" ; then | ||
14223 | -- | ||
14224 | 1.7.9.5 | ||
14225 | |||
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch new file mode 100644 index 0000000000..06ca275b18 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From fffa60a0693182085a7d4351150137eda26dbf82 Mon Sep 17 00:00:00 2001 | ||
4 | From: Guy Harris <guy@alum.mit.edu> | ||
5 | Date: Wed, 13 Jun 2012 12:20:19 -0700 | ||
6 | Subject: [PATCH] The leading comma looked weird; remove it. | ||
7 | |||
8 | That might be how the --disable-canusb bug got in. Hopefully this will | ||
9 | make the code look a little clearer and possibly avoid future bugs of | ||
10 | that sort. | ||
11 | --- | ||
12 | configure.in | 9 ++++++--- | ||
13 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/configure.in b/configure.in | ||
16 | index d8554ca..ba5b64e 100644 | ||
17 | --- a/configure.in | ||
18 | +++ b/configure.in | ||
19 | @@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC) | ||
20 | |||
21 | AC_ARG_ENABLE([bluetooth], | ||
22 | [AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=yes, if support available@:>@])], | ||
23 | -,enable_bluetooth=yes) | ||
24 | + [], | ||
25 | + [enable_bluetooth=yes]) | ||
26 | |||
27 | if test "x$enable_bluetooth" != "xno" ; then | ||
28 | dnl check for Bluetooth sniffing support | ||
29 | @@ -1396,7 +1397,8 @@ fi | ||
30 | |||
31 | AC_ARG_ENABLE([canusb], | ||
32 | [AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])], | ||
33 | -,enable_canusb=yes) | ||
34 | + [], | ||
35 | + [enable_canusb=yes]) | ||
36 | |||
37 | if test "x$enable_canusb" != "xno" ; then | ||
38 | dnl check for canusb support | ||
39 | @@ -1422,7 +1424,8 @@ fi | ||
40 | |||
41 | AC_ARG_ENABLE([can], | ||
42 | [AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])], | ||
43 | -,enable_can=yes) | ||
44 | + [], | ||
45 | + [enable_can=yes]) | ||
46 | |||
47 | if test "x$enable_can" != "xno" ; then | ||
48 | dnl check for CAN sniffing support | ||
49 | -- | ||
50 | 1.7.9.5 | ||
51 | |||
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch new file mode 100644 index 0000000000..94788aa3c4 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From 2259a62edaf667d4bc9d1a28e612e3a7c0011545 Mon Sep 17 00:00:00 2001 | ||
4 | From: Gustavo Zacarias <gustavo@zacarias.com.ar> | ||
5 | Date: Sat, 30 Jun 2012 10:48:14 -0700 | ||
6 | Subject: [PATCH] canusb: needs -lpthread | ||
7 | |||
8 | canusb uses pthreads, but -lpthread is never added to LIBS hence missing | ||
9 | from pcap-config, causing build failures. Fix this. | ||
10 | --- | ||
11 | configure | 2 +- | ||
12 | configure.in | 2 +- | ||
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index 1368ac5..24587c8 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -11529,7 +11529,7 @@ cat >>confdefs.h <<\_ACEOF | ||
20 | _ACEOF | ||
21 | |||
22 | CANUSB_SRC=pcap-canusb-linux.c | ||
23 | - LIBS="-lusb-1.0 $LIBS" | ||
24 | + LIBS="-lusb-1.0 -lpthread $LIBS" | ||
25 | { echo "$as_me:$LINENO: canusb sniffing is supported" >&5 | ||
26 | echo "$as_me: canusb sniffing is supported" >&6;} | ||
27 | |||
28 | diff --git a/configure.in b/configure.in | ||
29 | index ba5b64e..47e0b70 100644 | ||
30 | --- a/configure.in | ||
31 | +++ b/configure.in | ||
32 | @@ -1408,7 +1408,7 @@ if test "x$enable_canusb" != "xno" ; then | ||
33 | [ | ||
34 | AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb]) | ||
35 | CANUSB_SRC=pcap-canusb-linux.c | ||
36 | - LIBS="-lusb-1.0 $LIBS" | ||
37 | + LIBS="-lusb-1.0 -lpthread $LIBS" | ||
38 | AC_MSG_NOTICE(canusb sniffing is supported) | ||
39 | ], | ||
40 | AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it) | ||
41 | -- | ||
42 | 1.7.9.5 | ||
43 | |||
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 882c62cc02..c87066cad3 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc | |||
@@ -12,6 +12,7 @@ DEPENDS = "flex-native bison-native libnl" | |||
12 | 12 | ||
13 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" | 13 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" |
14 | PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4" | 14 | PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4" |
15 | PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" | ||
15 | 16 | ||
16 | INC_PR = "r4" | 17 | INC_PR = "r4" |
17 | 18 | ||
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb index 717e0e8f78..efbe2bc081 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb | |||
@@ -3,7 +3,11 @@ require libpcap.inc | |||
3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.0" |
4 | 4 | ||
5 | SRC_URI += "file://aclocal.patch \ | 5 | SRC_URI += "file://aclocal.patch \ |
6 | file://ieee80215-arphrd.patch" | 6 | file://ieee80215-arphrd.patch \ |
7 | file://0001-Fix-disable-canusb.patch \ | ||
8 | file://0001-The-leading-comma-looked-weird-remove-it.patch \ | ||
9 | file://0001-canusb-needs-lpthread.patch \ | ||
10 | " | ||
7 | 11 | ||
8 | SRC_URI[md5sum] = "f78455a92622b7a3c05c58b6ad1cec7e" | 12 | SRC_URI[md5sum] = "f78455a92622b7a3c05c58b6ad1cec7e" |
9 | SRC_URI[sha256sum] = "41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9" | 13 | SRC_URI[sha256sum] = "41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9" |