Merge lp:~muzazzi/percona-xtrabackup/tar4ibd_compressed_support into lp:percona-xtrabackup/2.0
- tar4ibd_compressed_support
- Merge into 2.0
Proposed by
Vadim Tkachenko
Status: | Rejected |
---|---|
Rejected by: | Vadim Tkachenko |
Proposed branch: | lp:~muzazzi/percona-xtrabackup/tar4ibd_compressed_support |
Merge into: | lp:percona-xtrabackup/2.0 |
Diff against target: |
11668 lines (+11378/-58) (has conflicts) 1 file modified
patches/tar4ibd_libtar-1.2.11.patch (+11378/-58) Text conflict in patches/tar4ibd_libtar-1.2.11.patch |
To merge this branch: | bzr merge lp:~muzazzi/percona-xtrabackup/tar4ibd_compressed_support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov | Pending | ||
Review via email: mp+54291@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 187. By Andrew Garner
-
required zlib during libtar configuration
We use zlib's adler32 function for checksumming compressed innodb pages.
- 186. By Andrew Garner
-
regenerate patch for tar4ibd+compressed with zlib checks
- 185. By Andrew Garner
-
merge with trunk
- 184. By Andrew Garner
-
cleanup silly debugging output
- 183. By Andrew Garner
-
handle innodb compressed tables in tar4ibd
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'patches/tar4ibd_libtar-1.2.11.patch' |
2 | --- patches/tar4ibd_libtar-1.2.11.patch 2011-03-15 21:58:13 +0000 |
3 | +++ patches/tar4ibd_libtar-1.2.11.patch 2011-03-22 03:56:25 +0000 |
4 | @@ -1,6 +1,11135 @@ |
5 | +<<<<<<< TREE |
6 | --- a/lib/Makefile.in 2011-02-21 08:15:39.000000000 -0800 |
7 | +++ b/lib/Makefile.in 2011-02-23 06:43:36.000000000 -0800 |
8 | @@ -29,7 +29,7 @@ |
9 | +======= |
10 | +--- a/configure |
11 | ++++ b/configure |
12 | +@@ -1,9 +1,13 @@ |
13 | + #! /bin/sh |
14 | + # Guess values for system-dependent variables and create Makefiles. |
15 | +-# Generated by GNU Autoconf 2.57 for libtar 1.2.11. |
16 | ++# Generated by GNU Autoconf 2.65 for libtar 1.2.11. |
17 | ++# |
18 | ++# |
19 | ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
20 | ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
21 | ++# Inc. |
22 | ++# |
23 | + # |
24 | +-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 |
25 | +-# Free Software Foundation, Inc. |
26 | + # This configure script is free software; the Free Software Foundation |
27 | + # gives unlimited permission to copy, distribute and modify it. |
28 | + # |
29 | +@@ -12,76 +16,406 @@ |
30 | + # Copyright (c) 1998-2003 Mark D. Roth |
31 | + # All rights reserved. |
32 | + # |
33 | +-## --------------------- ## |
34 | +-## M4sh Initialization. ## |
35 | +-## --------------------- ## |
36 | ++## -------------------- ## |
37 | ++## M4sh Initialization. ## |
38 | ++## -------------------- ## |
39 | + |
40 | +-# Be Bourne compatible |
41 | +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
42 | ++# Be more Bourne compatible |
43 | ++DUALCASE=1; export DUALCASE # for MKS sh |
44 | ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : |
45 | + emulate sh |
46 | + NULLCMD=: |
47 | +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
48 | ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
49 | + # is contrary to our usage. Disable this feature. |
50 | + alias -g '${1+"$@"}'='"$@"' |
51 | +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then |
52 | +- set -o posix |
53 | ++ setopt NO_GLOB_SUBST |
54 | ++else |
55 | ++ case `(set -o) 2>/dev/null` in #( |
56 | ++ *posix*) : |
57 | ++ set -o posix ;; #( |
58 | ++ *) : |
59 | ++ ;; |
60 | ++esac |
61 | + fi |
62 | + |
63 | +-# Support unset when possible. |
64 | +-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then |
65 | +- as_unset=unset |
66 | +-else |
67 | +- as_unset=false |
68 | ++ |
69 | ++as_nl=' |
70 | ++' |
71 | ++export as_nl |
72 | ++# Printing a long string crashes Solaris 7 /usr/bin/printf. |
73 | ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
74 | ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo |
75 | ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo |
76 | ++# Prefer a ksh shell builtin over an external printf program on Solaris, |
77 | ++# but without wasting forks for bash or zsh. |
78 | ++if test -z "$BASH_VERSION$ZSH_VERSION" \ |
79 | ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then |
80 | ++ as_echo='print -r --' |
81 | ++ as_echo_n='print -rn --' |
82 | ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then |
83 | ++ as_echo='printf %s\n' |
84 | ++ as_echo_n='printf %s' |
85 | ++else |
86 | ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then |
87 | ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' |
88 | ++ as_echo_n='/usr/ucb/echo -n' |
89 | ++ else |
90 | ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' |
91 | ++ as_echo_n_body='eval |
92 | ++ arg=$1; |
93 | ++ case $arg in #( |
94 | ++ *"$as_nl"*) |
95 | ++ expr "X$arg" : "X\\(.*\\)$as_nl"; |
96 | ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; |
97 | ++ esac; |
98 | ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" |
99 | ++ ' |
100 | ++ export as_echo_n_body |
101 | ++ as_echo_n='sh -c $as_echo_n_body as_echo' |
102 | ++ fi |
103 | ++ export as_echo_body |
104 | ++ as_echo='sh -c $as_echo_body as_echo' |
105 | ++fi |
106 | ++ |
107 | ++# The user is always right. |
108 | ++if test "${PATH_SEPARATOR+set}" != set; then |
109 | ++ PATH_SEPARATOR=: |
110 | ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { |
111 | ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || |
112 | ++ PATH_SEPARATOR=';' |
113 | ++ } |
114 | + fi |
115 | + |
116 | + |
117 | +-# Work around bugs in pre-3.0 UWIN ksh. |
118 | +-$as_unset ENV MAIL MAILPATH |
119 | ++# IFS |
120 | ++# We need space, tab and new line, in precisely that order. Quoting is |
121 | ++# there to prevent editors from complaining about space-tab. |
122 | ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word |
123 | ++# splitting by setting IFS to empty value.) |
124 | ++IFS=" "" $as_nl" |
125 | ++ |
126 | ++# Find who we are. Look in the path if we contain no directory separator. |
127 | ++case $0 in #(( |
128 | ++ *[\\/]* ) as_myself=$0 ;; |
129 | ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
130 | ++for as_dir in $PATH |
131 | ++do |
132 | ++ IFS=$as_save_IFS |
133 | ++ test -z "$as_dir" && as_dir=. |
134 | ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
135 | ++ done |
136 | ++IFS=$as_save_IFS |
137 | ++ |
138 | ++ ;; |
139 | ++esac |
140 | ++# We did not find ourselves, most probably we were run as `sh COMMAND' |
141 | ++# in which case we are not to be found in the path. |
142 | ++if test "x$as_myself" = x; then |
143 | ++ as_myself=$0 |
144 | ++fi |
145 | ++if test ! -f "$as_myself"; then |
146 | ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
147 | ++ exit 1 |
148 | ++fi |
149 | ++ |
150 | ++# Unset variables that we do not need and which cause bugs (e.g. in |
151 | ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" |
152 | ++# suppresses any "Segmentation fault" message there. '((' could |
153 | ++# trigger a bug in pdksh 5.2.14. |
154 | ++for as_var in BASH_ENV ENV MAIL MAILPATH |
155 | ++do eval test x\${$as_var+set} = xset \ |
156 | ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : |
157 | ++done |
158 | + PS1='$ ' |
159 | + PS2='> ' |
160 | + PS4='+ ' |
161 | + |
162 | + # NLS nuisances. |
163 | +-for as_var in \ |
164 | +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |
165 | +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ |
166 | +- LC_TELEPHONE LC_TIME |
167 | ++LC_ALL=C |
168 | ++export LC_ALL |
169 | ++LANGUAGE=C |
170 | ++export LANGUAGE |
171 | ++ |
172 | ++# CDPATH. |
173 | ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
174 | ++ |
175 | ++if test "x$CONFIG_SHELL" = x; then |
176 | ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
177 | ++ emulate sh |
178 | ++ NULLCMD=: |
179 | ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which |
180 | ++ # is contrary to our usage. Disable this feature. |
181 | ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' |
182 | ++ setopt NO_GLOB_SUBST |
183 | ++else |
184 | ++ case \`(set -o) 2>/dev/null\` in #( |
185 | ++ *posix*) : |
186 | ++ set -o posix ;; #( |
187 | ++ *) : |
188 | ++ ;; |
189 | ++esac |
190 | ++fi |
191 | ++" |
192 | ++ as_required="as_fn_return () { (exit \$1); } |
193 | ++as_fn_success () { as_fn_return 0; } |
194 | ++as_fn_failure () { as_fn_return 1; } |
195 | ++as_fn_ret_success () { return 0; } |
196 | ++as_fn_ret_failure () { return 1; } |
197 | ++ |
198 | ++exitcode=0 |
199 | ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } |
200 | ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } |
201 | ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } |
202 | ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } |
203 | ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : |
204 | ++ |
205 | ++else |
206 | ++ exitcode=1; echo positional parameters were not saved. |
207 | ++fi |
208 | ++test x\$exitcode = x0 || exit 1" |
209 | ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
210 | ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
211 | ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
212 | ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 |
213 | ++test \$(( 1 + 1 )) = 2 || exit 1" |
214 | ++ if (eval "$as_required") 2>/dev/null; then : |
215 | ++ as_have_required=yes |
216 | ++else |
217 | ++ as_have_required=no |
218 | ++fi |
219 | ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : |
220 | ++ |
221 | ++else |
222 | ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
223 | ++as_found=false |
224 | ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH |
225 | + do |
226 | +- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then |
227 | +- eval $as_var=C; export $as_var |
228 | ++ IFS=$as_save_IFS |
229 | ++ test -z "$as_dir" && as_dir=. |
230 | ++ as_found=: |
231 | ++ case $as_dir in #( |
232 | ++ /*) |
233 | ++ for as_base in sh bash ksh sh5; do |
234 | ++ # Try only shells that exist, to save several forks. |
235 | ++ as_shell=$as_dir/$as_base |
236 | ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && |
237 | ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : |
238 | ++ CONFIG_SHELL=$as_shell as_have_required=yes |
239 | ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : |
240 | ++ break 2 |
241 | ++fi |
242 | ++fi |
243 | ++ done;; |
244 | ++ esac |
245 | ++ as_found=false |
246 | ++done |
247 | ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && |
248 | ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : |
249 | ++ CONFIG_SHELL=$SHELL as_have_required=yes |
250 | ++fi; } |
251 | ++IFS=$as_save_IFS |
252 | ++ |
253 | ++ |
254 | ++ if test "x$CONFIG_SHELL" != x; then : |
255 | ++ # We cannot yet assume a decent shell, so we have to provide a |
256 | ++ # neutralization value for shells without unset; and this also |
257 | ++ # works around shells that cannot unset nonexistent variables. |
258 | ++ BASH_ENV=/dev/null |
259 | ++ ENV=/dev/null |
260 | ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
261 | ++ export CONFIG_SHELL |
262 | ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
263 | ++fi |
264 | ++ |
265 | ++ if test x$as_have_required = xno; then : |
266 | ++ $as_echo "$0: This script requires a shell more modern than all" |
267 | ++ $as_echo "$0: the shells that I found on your system." |
268 | ++ if test x${ZSH_VERSION+set} = xset ; then |
269 | ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" |
270 | ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." |
271 | + else |
272 | +- $as_unset $as_var |
273 | ++ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, |
274 | ++$0: including any error possibly output before this |
275 | ++$0: message. Then install a modern shell, or manually run |
276 | ++$0: the script under such a shell if you do have one." |
277 | + fi |
278 | +-done |
279 | ++ exit 1 |
280 | ++fi |
281 | ++fi |
282 | ++fi |
283 | ++SHELL=${CONFIG_SHELL-/bin/sh} |
284 | ++export SHELL |
285 | ++# Unset more variables known to interfere with behavior of common tools. |
286 | ++CLICOLOR_FORCE= GREP_OPTIONS= |
287 | ++unset CLICOLOR_FORCE GREP_OPTIONS |
288 | ++ |
289 | ++## --------------------- ## |
290 | ++## M4sh Shell Functions. ## |
291 | ++## --------------------- ## |
292 | ++# as_fn_unset VAR |
293 | ++# --------------- |
294 | ++# Portably unset VAR. |
295 | ++as_fn_unset () |
296 | ++{ |
297 | ++ { eval $1=; unset $1;} |
298 | ++} |
299 | ++as_unset=as_fn_unset |
300 | ++ |
301 | ++# as_fn_set_status STATUS |
302 | ++# ----------------------- |
303 | ++# Set $? to STATUS, without forking. |
304 | ++as_fn_set_status () |
305 | ++{ |
306 | ++ return $1 |
307 | ++} # as_fn_set_status |
308 | ++ |
309 | ++# as_fn_exit STATUS |
310 | ++# ----------------- |
311 | ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. |
312 | ++as_fn_exit () |
313 | ++{ |
314 | ++ set +e |
315 | ++ as_fn_set_status $1 |
316 | ++ exit $1 |
317 | ++} # as_fn_exit |
318 | ++ |
319 | ++# as_fn_mkdir_p |
320 | ++# ------------- |
321 | ++# Create "$as_dir" as a directory, including parents if necessary. |
322 | ++as_fn_mkdir_p () |
323 | ++{ |
324 | ++ |
325 | ++ case $as_dir in #( |
326 | ++ -*) as_dir=./$as_dir;; |
327 | ++ esac |
328 | ++ test -d "$as_dir" || eval $as_mkdir_p || { |
329 | ++ as_dirs= |
330 | ++ while :; do |
331 | ++ case $as_dir in #( |
332 | ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( |
333 | ++ *) as_qdir=$as_dir;; |
334 | ++ esac |
335 | ++ as_dirs="'$as_qdir' $as_dirs" |
336 | ++ as_dir=`$as_dirname -- "$as_dir" || |
337 | ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
338 | ++ X"$as_dir" : 'X\(//\)[^/]' \| \ |
339 | ++ X"$as_dir" : 'X\(//\)$' \| \ |
340 | ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || |
341 | ++$as_echo X"$as_dir" | |
342 | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
343 | ++ s//\1/ |
344 | ++ q |
345 | ++ } |
346 | ++ /^X\(\/\/\)[^/].*/{ |
347 | ++ s//\1/ |
348 | ++ q |
349 | ++ } |
350 | ++ /^X\(\/\/\)$/{ |
351 | ++ s//\1/ |
352 | ++ q |
353 | ++ } |
354 | ++ /^X\(\/\).*/{ |
355 | ++ s//\1/ |
356 | ++ q |
357 | ++ } |
358 | ++ s/.*/./; q'` |
359 | ++ test -d "$as_dir" && break |
360 | ++ done |
361 | ++ test -z "$as_dirs" || eval "mkdir $as_dirs" |
362 | ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
363 | ++ |
364 | + |
365 | +-# Required to use basename. |
366 | +-if expr a : '\(a\)' >/dev/null 2>&1; then |
367 | ++} # as_fn_mkdir_p |
368 | ++# as_fn_append VAR VALUE |
369 | ++# ---------------------- |
370 | ++# Append the text in VALUE to the end of the definition contained in VAR. Take |
371 | ++# advantage of any shell optimizations that allow amortized linear growth over |
372 | ++# repeated appends, instead of the typical quadratic growth present in naive |
373 | ++# implementations. |
374 | ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : |
375 | ++ eval 'as_fn_append () |
376 | ++ { |
377 | ++ eval $1+=\$2 |
378 | ++ }' |
379 | ++else |
380 | ++ as_fn_append () |
381 | ++ { |
382 | ++ eval $1=\$$1\$2 |
383 | ++ } |
384 | ++fi # as_fn_append |
385 | ++ |
386 | ++# as_fn_arith ARG... |
387 | ++# ------------------ |
388 | ++# Perform arithmetic evaluation on the ARGs, and store the result in the |
389 | ++# global $as_val. Take advantage of shells that can avoid forks. The arguments |
390 | ++# must be portable across $(()) and expr. |
391 | ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : |
392 | ++ eval 'as_fn_arith () |
393 | ++ { |
394 | ++ as_val=$(( $* )) |
395 | ++ }' |
396 | ++else |
397 | ++ as_fn_arith () |
398 | ++ { |
399 | ++ as_val=`expr "$@" || test $? -eq 1` |
400 | ++ } |
401 | ++fi # as_fn_arith |
402 | ++ |
403 | ++ |
404 | ++# as_fn_error ERROR [LINENO LOG_FD] |
405 | ++# --------------------------------- |
406 | ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
407 | ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
408 | ++# script with status $?, using 1 if that was 0. |
409 | ++as_fn_error () |
410 | ++{ |
411 | ++ as_status=$?; test $as_status -eq 0 && as_status=1 |
412 | ++ if test "$3"; then |
413 | ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
414 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
415 | ++ fi |
416 | ++ $as_echo "$as_me: error: $1" >&2 |
417 | ++ as_fn_exit $as_status |
418 | ++} # as_fn_error |
419 | ++ |
420 | ++if expr a : '\(a\)' >/dev/null 2>&1 && |
421 | ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then |
422 | + as_expr=expr |
423 | + else |
424 | + as_expr=false |
425 | + fi |
426 | + |
427 | +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then |
428 | ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then |
429 | + as_basename=basename |
430 | + else |
431 | + as_basename=false |
432 | + fi |
433 | + |
434 | ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then |
435 | ++ as_dirname=dirname |
436 | ++else |
437 | ++ as_dirname=false |
438 | ++fi |
439 | + |
440 | +-# Name of the executable. |
441 | +-as_me=`$as_basename "$0" || |
442 | ++as_me=`$as_basename -- "$0" || |
443 | + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
444 | + X"$0" : 'X\(//\)$' \| \ |
445 | +- X"$0" : 'X\(/\)$' \| \ |
446 | +- . : '\(.\)' 2>/dev/null || |
447 | +-echo X/"$0" | |
448 | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } |
449 | +- /^X\/\(\/\/\)$/{ s//\1/; q; } |
450 | +- /^X\/\(\/\).*/{ s//\1/; q; } |
451 | +- s/.*/./; q'` |
452 | ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || |
453 | ++$as_echo X/"$0" | |
454 | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ |
455 | ++ s//\1/ |
456 | ++ q |
457 | ++ } |
458 | ++ /^X\/\(\/\/\)$/{ |
459 | ++ s//\1/ |
460 | ++ q |
461 | ++ } |
462 | ++ /^X\/\(\/\).*/{ |
463 | ++ s//\1/ |
464 | ++ q |
465 | ++ } |
466 | ++ s/.*/./; q'` |
467 | + |
468 | +- |
469 | +-# PATH needs CR, and LINENO needs CR and PATH. |
470 | + # Avoid depending upon Character Ranges. |
471 | + as_cr_letters='abcdefghijklmnopqrstuvwxyz' |
472 | + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' |
473 | +@@ -89,185 +423,134 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS |
474 | + as_cr_digits='0123456789' |
475 | + as_cr_alnum=$as_cr_Letters$as_cr_digits |
476 | + |
477 | +-# The user is always right. |
478 | +-if test "${PATH_SEPARATOR+set}" != set; then |
479 | +- echo "#! /bin/sh" >conf$$.sh |
480 | +- echo "exit 0" >>conf$$.sh |
481 | +- chmod +x conf$$.sh |
482 | +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
483 | +- PATH_SEPARATOR=';' |
484 | +- else |
485 | +- PATH_SEPARATOR=: |
486 | +- fi |
487 | +- rm -f conf$$.sh |
488 | +-fi |
489 | +- |
490 | +- |
491 | +- as_lineno_1=$LINENO |
492 | +- as_lineno_2=$LINENO |
493 | +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` |
494 | +- test "x$as_lineno_1" != "x$as_lineno_2" && |
495 | +- test "x$as_lineno_3" = "x$as_lineno_2" || { |
496 | +- # Find who we are. Look in the path if we contain no path at all |
497 | +- # relative or not. |
498 | +- case $0 in |
499 | +- *[\\/]* ) as_myself=$0 ;; |
500 | +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
501 | +-for as_dir in $PATH |
502 | +-do |
503 | +- IFS=$as_save_IFS |
504 | +- test -z "$as_dir" && as_dir=. |
505 | +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
506 | +-done |
507 | +- |
508 | +- ;; |
509 | +- esac |
510 | +- # We did not find ourselves, most probably we were run as `sh COMMAND' |
511 | +- # in which case we are not to be found in the path. |
512 | +- if test "x$as_myself" = x; then |
513 | +- as_myself=$0 |
514 | +- fi |
515 | +- if test ! -f "$as_myself"; then |
516 | +- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 |
517 | +- { (exit 1); exit 1; }; } |
518 | +- fi |
519 | +- case $CONFIG_SHELL in |
520 | +- '') |
521 | +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
522 | +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH |
523 | +-do |
524 | +- IFS=$as_save_IFS |
525 | +- test -z "$as_dir" && as_dir=. |
526 | +- for as_base in sh bash ksh sh5; do |
527 | +- case $as_dir in |
528 | +- /*) |
529 | +- if ("$as_dir/$as_base" -c ' |
530 | +- as_lineno_1=$LINENO |
531 | +- as_lineno_2=$LINENO |
532 | +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` |
533 | +- test "x$as_lineno_1" != "x$as_lineno_2" && |
534 | +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then |
535 | +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } |
536 | +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } |
537 | +- CONFIG_SHELL=$as_dir/$as_base |
538 | +- export CONFIG_SHELL |
539 | +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} |
540 | +- fi;; |
541 | +- esac |
542 | +- done |
543 | +-done |
544 | +-;; |
545 | +- esac |
546 | + |
547 | +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO |
548 | +- # uniformly replaced by the line number. The first 'sed' inserts a |
549 | +- # line-number line before each line; the second 'sed' does the real |
550 | +- # work. The second script uses 'N' to pair each line-number line |
551 | +- # with the numbered line, and appends trailing '-' during |
552 | +- # substitution so that $LINENO is not a special case at line end. |
553 | +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the |
554 | +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) |
555 | +- sed '=' <$as_myself | |
556 | ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO |
557 | ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO |
558 | ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && |
559 | ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { |
560 | ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) |
561 | ++ sed -n ' |
562 | ++ p |
563 | ++ /[$]LINENO/= |
564 | ++ ' <$as_myself | |
565 | + sed ' |
566 | ++ s/[$]LINENO.*/&-/ |
567 | ++ t lineno |
568 | ++ b |
569 | ++ :lineno |
570 | + N |
571 | +- s,$,-, |
572 | +- : loop |
573 | +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, |
574 | ++ :loop |
575 | ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ |
576 | + t loop |
577 | +- s,-$,, |
578 | +- s,^['$as_cr_digits']*\n,, |
579 | ++ s/-\n.*// |
580 | + ' >$as_me.lineno && |
581 | +- chmod +x $as_me.lineno || |
582 | +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
583 | +- { (exit 1); exit 1; }; } |
584 | ++ chmod +x "$as_me.lineno" || |
585 | ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
586 | + |
587 | + # Don't try to exec as it changes $[0], causing all sort of problems |
588 | + # (the dirname of $[0] is not the place where we might find the |
589 | +- # original and so on. Autoconf is especially sensible to this). |
590 | +- . ./$as_me.lineno |
591 | ++ # original and so on. Autoconf is especially sensitive to this). |
592 | ++ . "./$as_me.lineno" |
593 | + # Exit status is that of the last command. |
594 | + exit |
595 | + } |
596 | + |
597 | +- |
598 | +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in |
599 | +- *c*,-n*) ECHO_N= ECHO_C=' |
600 | +-' ECHO_T=' ' ;; |
601 | +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; |
602 | +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; |
603 | ++ECHO_C= ECHO_N= ECHO_T= |
604 | ++case `echo -n x` in #((((( |
605 | ++-n*) |
606 | ++ case `echo 'xy\c'` in |
607 | ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. |
608 | ++ xy) ECHO_C='\c';; |
609 | ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null |
610 | ++ ECHO_T=' ';; |
611 | ++ esac;; |
612 | ++*) |
613 | ++ ECHO_N='-n';; |
614 | + esac |
615 | + |
616 | +-if expr a : '\(a\)' >/dev/null 2>&1; then |
617 | +- as_expr=expr |
618 | ++rm -f conf$$ conf$$.exe conf$$.file |
619 | ++if test -d conf$$.dir; then |
620 | ++ rm -f conf$$.dir/conf$$.file |
621 | + else |
622 | +- as_expr=false |
623 | ++ rm -f conf$$.dir |
624 | ++ mkdir conf$$.dir 2>/dev/null |
625 | + fi |
626 | +- |
627 | +-rm -f conf$$ conf$$.exe conf$$.file |
628 | +-echo >conf$$.file |
629 | +-if ln -s conf$$.file conf$$ 2>/dev/null; then |
630 | +- # We could just check for DJGPP; but this test a) works b) is more generic |
631 | +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). |
632 | +- if test -f conf$$.exe; then |
633 | +- # Don't use ln at all; we don't have any links |
634 | +- as_ln_s='cp -p' |
635 | +- else |
636 | ++if (echo >conf$$.file) 2>/dev/null; then |
637 | ++ if ln -s conf$$.file conf$$ 2>/dev/null; then |
638 | + as_ln_s='ln -s' |
639 | ++ # ... but there are two gotchas: |
640 | ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
641 | ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
642 | ++ # In both cases, we have to default to `cp -p'. |
643 | ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
644 | ++ as_ln_s='cp -p' |
645 | ++ elif ln conf$$.file conf$$ 2>/dev/null; then |
646 | ++ as_ln_s=ln |
647 | ++ else |
648 | ++ as_ln_s='cp -p' |
649 | + fi |
650 | +-elif ln conf$$.file conf$$ 2>/dev/null; then |
651 | +- as_ln_s=ln |
652 | + else |
653 | + as_ln_s='cp -p' |
654 | + fi |
655 | +-rm -f conf$$ conf$$.exe conf$$.file |
656 | ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
657 | ++rmdir conf$$.dir 2>/dev/null |
658 | + |
659 | + if mkdir -p . 2>/dev/null; then |
660 | +- as_mkdir_p=: |
661 | ++ as_mkdir_p='mkdir -p "$as_dir"' |
662 | + else |
663 | ++ test -d ./-p && rmdir ./-p |
664 | + as_mkdir_p=false |
665 | + fi |
666 | + |
667 | +-as_executable_p="test -f" |
668 | ++if test -x / >/dev/null 2>&1; then |
669 | ++ as_test_x='test -x' |
670 | ++else |
671 | ++ if ls -dL / >/dev/null 2>&1; then |
672 | ++ as_ls_L_option=L |
673 | ++ else |
674 | ++ as_ls_L_option= |
675 | ++ fi |
676 | ++ as_test_x=' |
677 | ++ eval sh -c '\'' |
678 | ++ if test -d "$1"; then |
679 | ++ test -d "$1/."; |
680 | ++ else |
681 | ++ case $1 in #( |
682 | ++ -*)set "./$1";; |
683 | ++ esac; |
684 | ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
685 | ++ ???[sx]*):;;*)false;;esac;fi |
686 | ++ '\'' sh |
687 | ++ ' |
688 | ++fi |
689 | ++as_executable_p=$as_test_x |
690 | + |
691 | + # Sed expression to map a string onto a valid CPP name. |
692 | +-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" |
693 | ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
694 | + |
695 | + # Sed expression to map a string onto a valid variable name. |
696 | +-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" |
697 | +- |
698 | +- |
699 | +-# IFS |
700 | +-# We need space, tab and new line, in precisely that order. |
701 | +-as_nl=' |
702 | +-' |
703 | +-IFS=" $as_nl" |
704 | ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
705 | + |
706 | +-# CDPATH. |
707 | +-$as_unset CDPATH |
708 | + |
709 | ++test -n "$DJDIR" || exec 7<&0 </dev/null |
710 | ++exec 6>&1 |
711 | + |
712 | + # Name of the host. |
713 | + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
714 | + # so uname gets run too. |
715 | + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
716 | + |
717 | +-exec 6>&1 |
718 | +- |
719 | + # |
720 | + # Initializations. |
721 | + # |
722 | + ac_default_prefix=/usr/local |
723 | ++ac_clean_files= |
724 | + ac_config_libobj_dir=. |
725 | ++LIBOBJS= |
726 | + cross_compiling=no |
727 | + subdirs= |
728 | + MFLAGS= |
729 | + MAKEFLAGS= |
730 | +-SHELL=${CONFIG_SHELL-/bin/sh} |
731 | +- |
732 | +-# Maximum number of lines to put in a shell here document. |
733 | +-# This variable seems obsolete. It should probably be removed, and |
734 | +-# only ac_max_sed_lines should be used. |
735 | +-: ${ac_max_here_lines=38} |
736 | + |
737 | + # Identity of this package. |
738 | + PACKAGE_NAME='libtar' |
739 | +@@ -275,51 +558,131 @@ PACKAGE_TARNAME='libtar' |
740 | + PACKAGE_VERSION='1.2.11' |
741 | + PACKAGE_STRING='libtar 1.2.11' |
742 | + PACKAGE_BUGREPORT='' |
743 | ++PACKAGE_URL='' |
744 | + |
745 | + ac_unique_file="lib/libtar.h" |
746 | + # Factoring default headers for most tests. |
747 | + ac_includes_default="\ |
748 | + #include <stdio.h> |
749 | +-#if HAVE_SYS_TYPES_H |
750 | ++#ifdef HAVE_SYS_TYPES_H |
751 | + # include <sys/types.h> |
752 | + #endif |
753 | +-#if HAVE_SYS_STAT_H |
754 | ++#ifdef HAVE_SYS_STAT_H |
755 | + # include <sys/stat.h> |
756 | + #endif |
757 | +-#if STDC_HEADERS |
758 | ++#ifdef STDC_HEADERS |
759 | + # include <stdlib.h> |
760 | + # include <stddef.h> |
761 | + #else |
762 | +-# if HAVE_STDLIB_H |
763 | ++# ifdef HAVE_STDLIB_H |
764 | + # include <stdlib.h> |
765 | + # endif |
766 | + #endif |
767 | +-#if HAVE_STRING_H |
768 | +-# if !STDC_HEADERS && HAVE_MEMORY_H |
769 | ++#ifdef HAVE_STRING_H |
770 | ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H |
771 | + # include <memory.h> |
772 | + # endif |
773 | + # include <string.h> |
774 | + #endif |
775 | +-#if HAVE_STRINGS_H |
776 | ++#ifdef HAVE_STRINGS_H |
777 | + # include <strings.h> |
778 | + #endif |
779 | +-#if HAVE_INTTYPES_H |
780 | ++#ifdef HAVE_INTTYPES_H |
781 | + # include <inttypes.h> |
782 | +-#else |
783 | +-# if HAVE_STDINT_H |
784 | +-# include <stdint.h> |
785 | +-# endif |
786 | + #endif |
787 | +-#if HAVE_UNISTD_H |
788 | ++#ifdef HAVE_STDINT_H |
789 | ++# include <stdint.h> |
790 | ++#endif |
791 | ++#ifdef HAVE_UNISTD_H |
792 | + # include <unistd.h> |
793 | + #endif" |
794 | + |
795 | +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EPKG MKENCAP ENCAP_DEFS ENCAP_INSTALL_RULES ENCAP_INSTALL_TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LIBOBJS LISTHASH_PREFIX LISTHASH_DIR MKDIR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE CPP EGREP LTLIBOBJS' |
796 | ++ac_subst_vars='LTLIBOBJS |
797 | ++EGREP |
798 | ++GREP |
799 | ++CPP |
800 | ++SET_MAKE |
801 | ++LN_S |
802 | ++INSTALL_DATA |
803 | ++INSTALL_SCRIPT |
804 | ++INSTALL_PROGRAM |
805 | ++RANLIB |
806 | ++MKDIR |
807 | ++LISTHASH_DIR |
808 | ++LISTHASH_PREFIX |
809 | ++LIBOBJS |
810 | ++OBJEXT |
811 | ++EXEEXT |
812 | ++ac_ct_CC |
813 | ++CPPFLAGS |
814 | ++LDFLAGS |
815 | ++CFLAGS |
816 | ++CC |
817 | ++ENCAP_INSTALL_TARGET |
818 | ++ENCAP_INSTALL_RULES |
819 | ++ENCAP_DEFS |
820 | ++MKENCAP |
821 | ++EPKG |
822 | ++target_alias |
823 | ++host_alias |
824 | ++build_alias |
825 | ++LIBS |
826 | ++ECHO_T |
827 | ++ECHO_N |
828 | ++ECHO_C |
829 | ++DEFS |
830 | ++mandir |
831 | ++localedir |
832 | ++libdir |
833 | ++psdir |
834 | ++pdfdir |
835 | ++dvidir |
836 | ++htmldir |
837 | ++infodir |
838 | ++docdir |
839 | ++oldincludedir |
840 | ++includedir |
841 | ++localstatedir |
842 | ++sharedstatedir |
843 | ++sysconfdir |
844 | ++datadir |
845 | ++datarootdir |
846 | ++libexecdir |
847 | ++sbindir |
848 | ++bindir |
849 | ++program_transform_name |
850 | ++prefix |
851 | ++exec_prefix |
852 | ++PACKAGE_URL |
853 | ++PACKAGE_BUGREPORT |
854 | ++PACKAGE_STRING |
855 | ++PACKAGE_VERSION |
856 | ++PACKAGE_TARNAME |
857 | ++PACKAGE_NAME |
858 | ++PATH_SEPARATOR |
859 | ++SHELL' |
860 | + ac_subst_files='' |
861 | ++ac_user_opts=' |
862 | ++enable_option_checking |
863 | ++enable_encap |
864 | ++enable_epkg_install |
865 | ++' |
866 | ++ ac_precious_vars='build_alias |
867 | ++host_alias |
868 | ++target_alias |
869 | ++CC |
870 | ++CFLAGS |
871 | ++LDFLAGS |
872 | ++LIBS |
873 | ++CPPFLAGS |
874 | ++CPP' |
875 | ++ |
876 | + |
877 | + # Initialize some variables set by options. |
878 | + ac_init_help= |
879 | + ac_init_version=false |
880 | ++ac_unrecognized_opts= |
881 | ++ac_unrecognized_sep= |
882 | + # The variables have the same names as the options, with |
883 | + # dashes changed to underlines. |
884 | + cache_file=/dev/null |
885 | +@@ -342,34 +705,48 @@ x_libraries=NONE |
886 | + # and all the variables that are supposed to be based on exec_prefix |
887 | + # by default will actually change. |
888 | + # Use braces instead of parens because sh, perl, etc. also accept them. |
889 | ++# (The list follows the same order as the GNU Coding Standards.) |
890 | + bindir='${exec_prefix}/bin' |
891 | + sbindir='${exec_prefix}/sbin' |
892 | + libexecdir='${exec_prefix}/libexec' |
893 | +-datadir='${prefix}/share' |
894 | ++datarootdir='${prefix}/share' |
895 | ++datadir='${datarootdir}' |
896 | + sysconfdir='${prefix}/etc' |
897 | + sharedstatedir='${prefix}/com' |
898 | + localstatedir='${prefix}/var' |
899 | +-libdir='${exec_prefix}/lib' |
900 | + includedir='${prefix}/include' |
901 | + oldincludedir='/usr/include' |
902 | +-infodir='${prefix}/info' |
903 | +-mandir='${prefix}/man' |
904 | ++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' |
905 | ++infodir='${datarootdir}/info' |
906 | ++htmldir='${docdir}' |
907 | ++dvidir='${docdir}' |
908 | ++pdfdir='${docdir}' |
909 | ++psdir='${docdir}' |
910 | ++libdir='${exec_prefix}/lib' |
911 | ++localedir='${datarootdir}/locale' |
912 | ++mandir='${datarootdir}/man' |
913 | + |
914 | + ac_prev= |
915 | ++ac_dashdash= |
916 | + for ac_option |
917 | + do |
918 | + # If the previous option needs an argument, assign it. |
919 | + if test -n "$ac_prev"; then |
920 | +- eval "$ac_prev=\$ac_option" |
921 | ++ eval $ac_prev=\$ac_option |
922 | + ac_prev= |
923 | + continue |
924 | + fi |
925 | + |
926 | +- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` |
927 | ++ case $ac_option in |
928 | ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
929 | ++ *) ac_optarg=yes ;; |
930 | ++ esac |
931 | + |
932 | + # Accept the important Cygnus configure options, so we can diagnose typos. |
933 | + |
934 | +- case $ac_option in |
935 | ++ case $ac_dashdash$ac_option in |
936 | ++ --) |
937 | ++ ac_dashdash=yes ;; |
938 | + |
939 | + -bindir | --bindir | --bindi | --bind | --bin | --bi) |
940 | + ac_prev=bindir ;; |
941 | +@@ -391,33 +768,59 @@ do |
942 | + --config-cache | -C) |
943 | + cache_file=config.cache ;; |
944 | + |
945 | +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) |
946 | ++ -datadir | --datadir | --datadi | --datad) |
947 | + ac_prev=datadir ;; |
948 | +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ |
949 | +- | --da=*) |
950 | ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) |
951 | + datadir=$ac_optarg ;; |
952 | + |
953 | ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ |
954 | ++ | --dataroo | --dataro | --datar) |
955 | ++ ac_prev=datarootdir ;; |
956 | ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ |
957 | ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) |
958 | ++ datarootdir=$ac_optarg ;; |
959 | ++ |
960 | + -disable-* | --disable-*) |
961 | +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
962 | ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
963 | + # Reject names that are not valid shell variable names. |
964 | +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && |
965 | +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 |
966 | +- { (exit 1); exit 1; }; } |
967 | +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` |
968 | +- eval "enable_$ac_feature=no" ;; |
969 | ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
970 | ++ as_fn_error "invalid feature name: $ac_useropt" |
971 | ++ ac_useropt_orig=$ac_useropt |
972 | ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
973 | ++ case $ac_user_opts in |
974 | ++ *" |
975 | ++"enable_$ac_useropt" |
976 | ++"*) ;; |
977 | ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" |
978 | ++ ac_unrecognized_sep=', ';; |
979 | ++ esac |
980 | ++ eval enable_$ac_useropt=no ;; |
981 | ++ |
982 | ++ -docdir | --docdir | --docdi | --doc | --do) |
983 | ++ ac_prev=docdir ;; |
984 | ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) |
985 | ++ docdir=$ac_optarg ;; |
986 | ++ |
987 | ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) |
988 | ++ ac_prev=dvidir ;; |
989 | ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) |
990 | ++ dvidir=$ac_optarg ;; |
991 | + |
992 | + -enable-* | --enable-*) |
993 | +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
994 | ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
995 | + # Reject names that are not valid shell variable names. |
996 | +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && |
997 | +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 |
998 | +- { (exit 1); exit 1; }; } |
999 | +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` |
1000 | +- case $ac_option in |
1001 | +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; |
1002 | +- *) ac_optarg=yes ;; |
1003 | ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1004 | ++ as_fn_error "invalid feature name: $ac_useropt" |
1005 | ++ ac_useropt_orig=$ac_useropt |
1006 | ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1007 | ++ case $ac_user_opts in |
1008 | ++ *" |
1009 | ++"enable_$ac_useropt" |
1010 | ++"*) ;; |
1011 | ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" |
1012 | ++ ac_unrecognized_sep=', ';; |
1013 | + esac |
1014 | +- eval "enable_$ac_feature='$ac_optarg'" ;; |
1015 | ++ eval enable_$ac_useropt=\$ac_optarg ;; |
1016 | + |
1017 | + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ |
1018 | + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ |
1019 | +@@ -444,6 +847,12 @@ do |
1020 | + -host=* | --host=* | --hos=* | --ho=*) |
1021 | + host_alias=$ac_optarg ;; |
1022 | + |
1023 | ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) |
1024 | ++ ac_prev=htmldir ;; |
1025 | ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ |
1026 | ++ | --ht=*) |
1027 | ++ htmldir=$ac_optarg ;; |
1028 | ++ |
1029 | + -includedir | --includedir | --includedi | --included | --include \ |
1030 | + | --includ | --inclu | --incl | --inc) |
1031 | + ac_prev=includedir ;; |
1032 | +@@ -468,13 +877,16 @@ do |
1033 | + | --libexe=* | --libex=* | --libe=*) |
1034 | + libexecdir=$ac_optarg ;; |
1035 | + |
1036 | ++ -localedir | --localedir | --localedi | --localed | --locale) |
1037 | ++ ac_prev=localedir ;; |
1038 | ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) |
1039 | ++ localedir=$ac_optarg ;; |
1040 | ++ |
1041 | + -localstatedir | --localstatedir | --localstatedi | --localstated \ |
1042 | +- | --localstate | --localstat | --localsta | --localst \ |
1043 | +- | --locals | --local | --loca | --loc | --lo) |
1044 | ++ | --localstate | --localstat | --localsta | --localst | --locals) |
1045 | + ac_prev=localstatedir ;; |
1046 | + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ |
1047 | +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ |
1048 | +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) |
1049 | ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) |
1050 | + localstatedir=$ac_optarg ;; |
1051 | + |
1052 | + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) |
1053 | +@@ -539,6 +951,16 @@ do |
1054 | + | --progr-tra=* | --program-tr=* | --program-t=*) |
1055 | + program_transform_name=$ac_optarg ;; |
1056 | + |
1057 | ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) |
1058 | ++ ac_prev=pdfdir ;; |
1059 | ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) |
1060 | ++ pdfdir=$ac_optarg ;; |
1061 | ++ |
1062 | ++ -psdir | --psdir | --psdi | --psd | --ps) |
1063 | ++ ac_prev=psdir ;; |
1064 | ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) |
1065 | ++ psdir=$ac_optarg ;; |
1066 | ++ |
1067 | + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
1068 | + | -silent | --silent | --silen | --sile | --sil) |
1069 | + silent=yes ;; |
1070 | +@@ -589,26 +1011,36 @@ do |
1071 | + ac_init_version=: ;; |
1072 | + |
1073 | + -with-* | --with-*) |
1074 | +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
1075 | ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
1076 | + # Reject names that are not valid shell variable names. |
1077 | +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && |
1078 | +- { echo "$as_me: error: invalid package name: $ac_package" >&2 |
1079 | +- { (exit 1); exit 1; }; } |
1080 | +- ac_package=`echo $ac_package| sed 's/-/_/g'` |
1081 | +- case $ac_option in |
1082 | +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; |
1083 | +- *) ac_optarg=yes ;; |
1084 | ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1085 | ++ as_fn_error "invalid package name: $ac_useropt" |
1086 | ++ ac_useropt_orig=$ac_useropt |
1087 | ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1088 | ++ case $ac_user_opts in |
1089 | ++ *" |
1090 | ++"with_$ac_useropt" |
1091 | ++"*) ;; |
1092 | ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" |
1093 | ++ ac_unrecognized_sep=', ';; |
1094 | + esac |
1095 | +- eval "with_$ac_package='$ac_optarg'" ;; |
1096 | ++ eval with_$ac_useropt=\$ac_optarg ;; |
1097 | + |
1098 | + -without-* | --without-*) |
1099 | +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
1100 | ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
1101 | + # Reject names that are not valid shell variable names. |
1102 | +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && |
1103 | +- { echo "$as_me: error: invalid package name: $ac_package" >&2 |
1104 | +- { (exit 1); exit 1; }; } |
1105 | +- ac_package=`echo $ac_package | sed 's/-/_/g'` |
1106 | +- eval "with_$ac_package=no" ;; |
1107 | ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1108 | ++ as_fn_error "invalid package name: $ac_useropt" |
1109 | ++ ac_useropt_orig=$ac_useropt |
1110 | ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1111 | ++ case $ac_user_opts in |
1112 | ++ *" |
1113 | ++"with_$ac_useropt" |
1114 | ++"*) ;; |
1115 | ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" |
1116 | ++ ac_unrecognized_sep=', ';; |
1117 | ++ esac |
1118 | ++ eval with_$ac_useropt=no ;; |
1119 | + |
1120 | + --x) |
1121 | + # Obsolete; use --with-x. |
1122 | +@@ -628,26 +1060,25 @@ do |
1123 | + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
1124 | + x_libraries=$ac_optarg ;; |
1125 | + |
1126 | +- -*) { echo "$as_me: error: unrecognized option: $ac_option |
1127 | +-Try \`$0 --help' for more information." >&2 |
1128 | +- { (exit 1); exit 1; }; } |
1129 | ++ -*) as_fn_error "unrecognized option: \`$ac_option' |
1130 | ++Try \`$0 --help' for more information." |
1131 | + ;; |
1132 | + |
1133 | + *=*) |
1134 | + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` |
1135 | + # Reject names that are not valid shell variable names. |
1136 | +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && |
1137 | +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 |
1138 | +- { (exit 1); exit 1; }; } |
1139 | +- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` |
1140 | +- eval "$ac_envvar='$ac_optarg'" |
1141 | ++ case $ac_envvar in #( |
1142 | ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) |
1143 | ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
1144 | ++ esac |
1145 | ++ eval $ac_envvar=\$ac_optarg |
1146 | + export $ac_envvar ;; |
1147 | + |
1148 | + *) |
1149 | + # FIXME: should be removed in autoconf 3.0. |
1150 | +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
1151 | ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
1152 | + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
1153 | +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
1154 | ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
1155 | + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
1156 | + ;; |
1157 | + |
1158 | +@@ -656,31 +1087,36 @@ done |
1159 | + |
1160 | + if test -n "$ac_prev"; then |
1161 | + ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
1162 | +- { echo "$as_me: error: missing argument to $ac_option" >&2 |
1163 | +- { (exit 1); exit 1; }; } |
1164 | ++ as_fn_error "missing argument to $ac_option" |
1165 | + fi |
1166 | + |
1167 | +-# Be sure to have absolute paths. |
1168 | +-for ac_var in exec_prefix prefix |
1169 | +-do |
1170 | +- eval ac_val=$`echo $ac_var` |
1171 | +- case $ac_val in |
1172 | +- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; |
1173 | +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
1174 | +- { (exit 1); exit 1; }; };; |
1175 | ++if test -n "$ac_unrecognized_opts"; then |
1176 | ++ case $enable_option_checking in |
1177 | ++ no) ;; |
1178 | ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
1179 | ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
1180 | + esac |
1181 | +-done |
1182 | ++fi |
1183 | + |
1184 | +-# Be sure to have absolute paths. |
1185 | +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ |
1186 | +- localstatedir libdir includedir oldincludedir infodir mandir |
1187 | ++# Check all directory arguments for consistency. |
1188 | ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ |
1189 | ++ datadir sysconfdir sharedstatedir localstatedir includedir \ |
1190 | ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ |
1191 | ++ libdir localedir mandir |
1192 | + do |
1193 | +- eval ac_val=$`echo $ac_var` |
1194 | ++ eval ac_val=\$$ac_var |
1195 | ++ # Remove trailing slashes. |
1196 | ++ case $ac_val in |
1197 | ++ */ ) |
1198 | ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` |
1199 | ++ eval $ac_var=\$ac_val;; |
1200 | ++ esac |
1201 | ++ # Be sure to have absolute directory names. |
1202 | + case $ac_val in |
1203 | +- [\\/$]* | ?:[\\/]* ) ;; |
1204 | +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
1205 | +- { (exit 1); exit 1; }; };; |
1206 | ++ [\\/$]* | ?:[\\/]* ) continue;; |
1207 | ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
1208 | + esac |
1209 | ++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
1210 | + done |
1211 | + |
1212 | + # There might be people who depend on the old broken behavior: `$host' |
1213 | +@@ -694,7 +1130,7 @@ target=$target_alias |
1214 | + if test "x$host_alias" != x; then |
1215 | + if test "x$build_alias" = x; then |
1216 | + cross_compiling=maybe |
1217 | +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
1218 | ++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
1219 | + If a cross compiler is detected then cross compile mode will be used." >&2 |
1220 | + elif test "x$build_alias" != "x$host_alias"; then |
1221 | + cross_compiling=yes |
1222 | +@@ -707,74 +1143,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- |
1223 | + test "$silent" = yes && exec 6>/dev/null |
1224 | + |
1225 | + |
1226 | ++ac_pwd=`pwd` && test -n "$ac_pwd" && |
1227 | ++ac_ls_di=`ls -di .` && |
1228 | ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
1229 | ++ as_fn_error "working directory cannot be determined" |
1230 | ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
1231 | ++ as_fn_error "pwd does not report name of working directory" |
1232 | ++ |
1233 | ++ |
1234 | + # Find the source files, if location was not specified. |
1235 | + if test -z "$srcdir"; then |
1236 | + ac_srcdir_defaulted=yes |
1237 | +- # Try the directory containing this script, then its parent. |
1238 | +- ac_confdir=`(dirname "$0") 2>/dev/null || |
1239 | +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
1240 | +- X"$0" : 'X\(//\)[^/]' \| \ |
1241 | +- X"$0" : 'X\(//\)$' \| \ |
1242 | +- X"$0" : 'X\(/\)' \| \ |
1243 | +- . : '\(.\)' 2>/dev/null || |
1244 | +-echo X"$0" | |
1245 | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
1246 | +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
1247 | +- /^X\(\/\/\)$/{ s//\1/; q; } |
1248 | +- /^X\(\/\).*/{ s//\1/; q; } |
1249 | +- s/.*/./; q'` |
1250 | ++ # Try the directory containing this script, then the parent directory. |
1251 | ++ ac_confdir=`$as_dirname -- "$as_myself" || |
1252 | ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
1253 | ++ X"$as_myself" : 'X\(//\)[^/]' \| \ |
1254 | ++ X"$as_myself" : 'X\(//\)$' \| \ |
1255 | ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || |
1256 | ++$as_echo X"$as_myself" | |
1257 | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
1258 | ++ s//\1/ |
1259 | ++ q |
1260 | ++ } |
1261 | ++ /^X\(\/\/\)[^/].*/{ |
1262 | ++ s//\1/ |
1263 | ++ q |
1264 | ++ } |
1265 | ++ /^X\(\/\/\)$/{ |
1266 | ++ s//\1/ |
1267 | ++ q |
1268 | ++ } |
1269 | ++ /^X\(\/\).*/{ |
1270 | ++ s//\1/ |
1271 | ++ q |
1272 | ++ } |
1273 | ++ s/.*/./; q'` |
1274 | + srcdir=$ac_confdir |
1275 | +- if test ! -r $srcdir/$ac_unique_file; then |
1276 | ++ if test ! -r "$srcdir/$ac_unique_file"; then |
1277 | + srcdir=.. |
1278 | + fi |
1279 | + else |
1280 | + ac_srcdir_defaulted=no |
1281 | + fi |
1282 | +-if test ! -r $srcdir/$ac_unique_file; then |
1283 | +- if test "$ac_srcdir_defaulted" = yes; then |
1284 | +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 |
1285 | +- { (exit 1); exit 1; }; } |
1286 | +- else |
1287 | +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 |
1288 | +- { (exit 1); exit 1; }; } |
1289 | +- fi |
1290 | +-fi |
1291 | +-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || |
1292 | +- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 |
1293 | +- { (exit 1); exit 1; }; } |
1294 | +-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` |
1295 | +-ac_env_build_alias_set=${build_alias+set} |
1296 | +-ac_env_build_alias_value=$build_alias |
1297 | +-ac_cv_env_build_alias_set=${build_alias+set} |
1298 | +-ac_cv_env_build_alias_value=$build_alias |
1299 | +-ac_env_host_alias_set=${host_alias+set} |
1300 | +-ac_env_host_alias_value=$host_alias |
1301 | +-ac_cv_env_host_alias_set=${host_alias+set} |
1302 | +-ac_cv_env_host_alias_value=$host_alias |
1303 | +-ac_env_target_alias_set=${target_alias+set} |
1304 | +-ac_env_target_alias_value=$target_alias |
1305 | +-ac_cv_env_target_alias_set=${target_alias+set} |
1306 | +-ac_cv_env_target_alias_value=$target_alias |
1307 | +-ac_env_CC_set=${CC+set} |
1308 | +-ac_env_CC_value=$CC |
1309 | +-ac_cv_env_CC_set=${CC+set} |
1310 | +-ac_cv_env_CC_value=$CC |
1311 | +-ac_env_CFLAGS_set=${CFLAGS+set} |
1312 | +-ac_env_CFLAGS_value=$CFLAGS |
1313 | +-ac_cv_env_CFLAGS_set=${CFLAGS+set} |
1314 | +-ac_cv_env_CFLAGS_value=$CFLAGS |
1315 | +-ac_env_LDFLAGS_set=${LDFLAGS+set} |
1316 | +-ac_env_LDFLAGS_value=$LDFLAGS |
1317 | +-ac_cv_env_LDFLAGS_set=${LDFLAGS+set} |
1318 | +-ac_cv_env_LDFLAGS_value=$LDFLAGS |
1319 | +-ac_env_CPPFLAGS_set=${CPPFLAGS+set} |
1320 | +-ac_env_CPPFLAGS_value=$CPPFLAGS |
1321 | +-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} |
1322 | +-ac_cv_env_CPPFLAGS_value=$CPPFLAGS |
1323 | +-ac_env_CPP_set=${CPP+set} |
1324 | +-ac_env_CPP_value=$CPP |
1325 | +-ac_cv_env_CPP_set=${CPP+set} |
1326 | +-ac_cv_env_CPP_value=$CPP |
1327 | ++if test ! -r "$srcdir/$ac_unique_file"; then |
1328 | ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
1329 | ++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
1330 | ++fi |
1331 | ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
1332 | ++ac_abs_confdir=`( |
1333 | ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
1334 | ++ pwd)` |
1335 | ++# When building in place, set srcdir=. |
1336 | ++if test "$ac_abs_confdir" = "$ac_pwd"; then |
1337 | ++ srcdir=. |
1338 | ++fi |
1339 | ++# Remove unnecessary trailing slashes from srcdir. |
1340 | ++# Double slashes in file names in object file debugging info |
1341 | ++# mess up M-x gdb in Emacs. |
1342 | ++case $srcdir in |
1343 | ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; |
1344 | ++esac |
1345 | ++for ac_var in $ac_precious_vars; do |
1346 | ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} |
1347 | ++ eval ac_env_${ac_var}_value=\$${ac_var} |
1348 | ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} |
1349 | ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} |
1350 | ++done |
1351 | + |
1352 | + # |
1353 | + # Report the --help message. |
1354 | +@@ -803,9 +1237,6 @@ Configuration: |
1355 | + -n, --no-create do not create output files |
1356 | + --srcdir=DIR find the sources in DIR [configure dir or \`..'] |
1357 | + |
1358 | +-_ACEOF |
1359 | +- |
1360 | +- cat <<_ACEOF |
1361 | + Installation directories: |
1362 | + --prefix=PREFIX install architecture-independent files in PREFIX |
1363 | + [$ac_default_prefix] |
1364 | +@@ -820,18 +1251,25 @@ for instance \`--prefix=\$HOME'. |
1365 | + For better control, use the options below. |
1366 | + |
1367 | + Fine tuning of the installation directories: |
1368 | +- --bindir=DIR user executables [EPREFIX/bin] |
1369 | +- --sbindir=DIR system admin executables [EPREFIX/sbin] |
1370 | +- --libexecdir=DIR program executables [EPREFIX/libexec] |
1371 | +- --datadir=DIR read-only architecture-independent data [PREFIX/share] |
1372 | +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
1373 | +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
1374 | +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
1375 | +- --libdir=DIR object code libraries [EPREFIX/lib] |
1376 | +- --includedir=DIR C header files [PREFIX/include] |
1377 | +- --oldincludedir=DIR C header files for non-gcc [/usr/include] |
1378 | +- --infodir=DIR info documentation [PREFIX/info] |
1379 | +- --mandir=DIR man documentation [PREFIX/man] |
1380 | ++ --bindir=DIR user executables [EPREFIX/bin] |
1381 | ++ --sbindir=DIR system admin executables [EPREFIX/sbin] |
1382 | ++ --libexecdir=DIR program executables [EPREFIX/libexec] |
1383 | ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
1384 | ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
1385 | ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
1386 | ++ --libdir=DIR object code libraries [EPREFIX/lib] |
1387 | ++ --includedir=DIR C header files [PREFIX/include] |
1388 | ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] |
1389 | ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] |
1390 | ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] |
1391 | ++ --infodir=DIR info documentation [DATAROOTDIR/info] |
1392 | ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] |
1393 | ++ --mandir=DIR man documentation [DATAROOTDIR/man] |
1394 | ++ --docdir=DIR documentation root [DATAROOTDIR/doc/libtar] |
1395 | ++ --htmldir=DIR html documentation [DOCDIR] |
1396 | ++ --dvidir=DIR dvi documentation [DOCDIR] |
1397 | ++ --pdfdir=DIR pdf documentation [DOCDIR] |
1398 | ++ --psdir=DIR ps documentation [DOCDIR] |
1399 | + _ACEOF |
1400 | + |
1401 | + cat <<\_ACEOF |
1402 | +@@ -845,95 +1283,92 @@ if test -n "$ac_init_help"; then |
1403 | + cat <<\_ACEOF |
1404 | + |
1405 | + Optional Features: |
1406 | ++ --disable-option-checking ignore unrecognized --enable/--with options |
1407 | + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1408 | + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1409 | + --disable-encap Do not configure as an Encap package |
1410 | + --disable-epkg-install Do not run epkg during make install |
1411 | + |
1412 | +-Optional Packages: |
1413 | +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
1414 | +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
1415 | +- --without-zlib Use external gzip binary instead of zlib |
1416 | +- |
1417 | + Some influential environment variables: |
1418 | + CC C compiler command |
1419 | + CFLAGS C compiler flags |
1420 | + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
1421 | + nonstandard directory <lib dir> |
1422 | +- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have |
1423 | +- headers in a nonstandard directory <include dir> |
1424 | ++ LIBS libraries to pass to the linker, e.g. -l<library> |
1425 | ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
1426 | ++ you have headers in a nonstandard directory <include dir> |
1427 | + CPP C preprocessor |
1428 | + |
1429 | + Use these variables to override the choices made by `configure' or to help |
1430 | + it to find libraries and programs with nonstandard names/locations. |
1431 | + |
1432 | ++Report bugs to the package provider. |
1433 | + _ACEOF |
1434 | ++ac_status=$? |
1435 | + fi |
1436 | + |
1437 | + if test "$ac_init_help" = "recursive"; then |
1438 | + # If there are subdirs, report their specific --help. |
1439 | +- ac_popdir=`pwd` |
1440 | + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue |
1441 | +- test -d $ac_dir || continue |
1442 | ++ test -d "$ac_dir" || |
1443 | ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || |
1444 | ++ continue |
1445 | + ac_builddir=. |
1446 | + |
1447 | +-if test "$ac_dir" != .; then |
1448 | +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` |
1449 | +- # A "../" for each directory in $ac_dir_suffix. |
1450 | +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` |
1451 | +-else |
1452 | +- ac_dir_suffix= ac_top_builddir= |
1453 | +-fi |
1454 | ++case "$ac_dir" in |
1455 | ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; |
1456 | ++*) |
1457 | ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` |
1458 | ++ # A ".." for each directory in $ac_dir_suffix. |
1459 | ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` |
1460 | ++ case $ac_top_builddir_sub in |
1461 | ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; |
1462 | ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; |
1463 | ++ esac ;; |
1464 | ++esac |
1465 | ++ac_abs_top_builddir=$ac_pwd |
1466 | ++ac_abs_builddir=$ac_pwd$ac_dir_suffix |
1467 | ++# for backward compatibility: |
1468 | ++ac_top_builddir=$ac_top_build_prefix |
1469 | + |
1470 | + case $srcdir in |
1471 | +- .) # No --srcdir option. We are building in place. |
1472 | ++ .) # We are building in place. |
1473 | + ac_srcdir=. |
1474 | +- if test -z "$ac_top_builddir"; then |
1475 | +- ac_top_srcdir=. |
1476 | +- else |
1477 | +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` |
1478 | +- fi ;; |
1479 | +- [\\/]* | ?:[\\/]* ) # Absolute path. |
1480 | ++ ac_top_srcdir=$ac_top_builddir_sub |
1481 | ++ ac_abs_top_srcdir=$ac_pwd ;; |
1482 | ++ [\\/]* | ?:[\\/]* ) # Absolute name. |
1483 | + ac_srcdir=$srcdir$ac_dir_suffix; |
1484 | +- ac_top_srcdir=$srcdir ;; |
1485 | +- *) # Relative path. |
1486 | +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix |
1487 | +- ac_top_srcdir=$ac_top_builddir$srcdir ;; |
1488 | ++ ac_top_srcdir=$srcdir |
1489 | ++ ac_abs_top_srcdir=$srcdir ;; |
1490 | ++ *) # Relative name. |
1491 | ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix |
1492 | ++ ac_top_srcdir=$ac_top_build_prefix$srcdir |
1493 | ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; |
1494 | + esac |
1495 | +-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be |
1496 | +-# absolute. |
1497 | +-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` |
1498 | +-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` |
1499 | +-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` |
1500 | +-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` |
1501 | +- |
1502 | +- cd $ac_dir |
1503 | +- # Check for guested configure; otherwise get Cygnus style configure. |
1504 | +- if test -f $ac_srcdir/configure.gnu; then |
1505 | +- echo |
1506 | +- $SHELL $ac_srcdir/configure.gnu --help=recursive |
1507 | +- elif test -f $ac_srcdir/configure; then |
1508 | +- echo |
1509 | +- $SHELL $ac_srcdir/configure --help=recursive |
1510 | +- elif test -f $ac_srcdir/configure.ac || |
1511 | +- test -f $ac_srcdir/configure.in; then |
1512 | +- echo |
1513 | +- $ac_configure --help |
1514 | ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix |
1515 | ++ |
1516 | ++ cd "$ac_dir" || { ac_status=$?; continue; } |
1517 | ++ # Check for guested configure. |
1518 | ++ if test -f "$ac_srcdir/configure.gnu"; then |
1519 | ++ echo && |
1520 | ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive |
1521 | ++ elif test -f "$ac_srcdir/configure"; then |
1522 | ++ echo && |
1523 | ++ $SHELL "$ac_srcdir/configure" --help=recursive |
1524 | + else |
1525 | +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
1526 | +- fi |
1527 | +- cd $ac_popdir |
1528 | ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
1529 | ++ fi || ac_status=$? |
1530 | ++ cd "$ac_pwd" || { ac_status=$?; break; } |
1531 | + done |
1532 | + fi |
1533 | + |
1534 | +-test -n "$ac_init_help" && exit 0 |
1535 | ++test -n "$ac_init_help" && exit $ac_status |
1536 | + if $ac_init_version; then |
1537 | + cat <<\_ACEOF |
1538 | + libtar configure 1.2.11 |
1539 | +-generated by GNU Autoconf 2.57 |
1540 | ++generated by GNU Autoconf 2.65 |
1541 | + |
1542 | +-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 |
1543 | +-Free Software Foundation, Inc. |
1544 | ++Copyright (C) 2009 Free Software Foundation, Inc. |
1545 | + This configure script is free software; the Free Software Foundation |
1546 | + gives unlimited permission to copy, distribute and modify it. |
1547 | + |
1548 | +@@ -943,19 +1378,425 @@ Copyright (c) 1998-2003 Mark D. Roth |
1549 | + All rights reserved. |
1550 | + |
1551 | + _ACEOF |
1552 | +- exit 0 |
1553 | ++ exit |
1554 | + fi |
1555 | +-exec 5>config.log |
1556 | +-cat >&5 <<_ACEOF |
1557 | ++ |
1558 | ++## ------------------------ ## |
1559 | ++## Autoconf initialization. ## |
1560 | ++## ------------------------ ## |
1561 | ++ |
1562 | ++# ac_fn_c_try_compile LINENO |
1563 | ++# -------------------------- |
1564 | ++# Try to compile conftest.$ac_ext, and return whether this succeeded. |
1565 | ++ac_fn_c_try_compile () |
1566 | ++{ |
1567 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1568 | ++ rm -f conftest.$ac_objext |
1569 | ++ if { { ac_try="$ac_compile" |
1570 | ++case "(($ac_try" in |
1571 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1572 | ++ *) ac_try_echo=$ac_try;; |
1573 | ++esac |
1574 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1575 | ++$as_echo "$ac_try_echo"; } >&5 |
1576 | ++ (eval "$ac_compile") 2>conftest.err |
1577 | ++ ac_status=$? |
1578 | ++ if test -s conftest.err; then |
1579 | ++ grep -v '^ *+' conftest.err >conftest.er1 |
1580 | ++ cat conftest.er1 >&5 |
1581 | ++ mv -f conftest.er1 conftest.err |
1582 | ++ fi |
1583 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1584 | ++ test $ac_status = 0; } && { |
1585 | ++ test -z "$ac_c_werror_flag" || |
1586 | ++ test ! -s conftest.err |
1587 | ++ } && test -s conftest.$ac_objext; then : |
1588 | ++ ac_retval=0 |
1589 | ++else |
1590 | ++ $as_echo "$as_me: failed program was:" >&5 |
1591 | ++sed 's/^/| /' conftest.$ac_ext >&5 |
1592 | ++ |
1593 | ++ ac_retval=1 |
1594 | ++fi |
1595 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1596 | ++ as_fn_set_status $ac_retval |
1597 | ++ |
1598 | ++} # ac_fn_c_try_compile |
1599 | ++ |
1600 | ++# ac_fn_c_try_link LINENO |
1601 | ++# ----------------------- |
1602 | ++# Try to link conftest.$ac_ext, and return whether this succeeded. |
1603 | ++ac_fn_c_try_link () |
1604 | ++{ |
1605 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1606 | ++ rm -f conftest.$ac_objext conftest$ac_exeext |
1607 | ++ if { { ac_try="$ac_link" |
1608 | ++case "(($ac_try" in |
1609 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1610 | ++ *) ac_try_echo=$ac_try;; |
1611 | ++esac |
1612 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1613 | ++$as_echo "$ac_try_echo"; } >&5 |
1614 | ++ (eval "$ac_link") 2>conftest.err |
1615 | ++ ac_status=$? |
1616 | ++ if test -s conftest.err; then |
1617 | ++ grep -v '^ *+' conftest.err >conftest.er1 |
1618 | ++ cat conftest.er1 >&5 |
1619 | ++ mv -f conftest.er1 conftest.err |
1620 | ++ fi |
1621 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1622 | ++ test $ac_status = 0; } && { |
1623 | ++ test -z "$ac_c_werror_flag" || |
1624 | ++ test ! -s conftest.err |
1625 | ++ } && test -s conftest$ac_exeext && { |
1626 | ++ test "$cross_compiling" = yes || |
1627 | ++ $as_test_x conftest$ac_exeext |
1628 | ++ }; then : |
1629 | ++ ac_retval=0 |
1630 | ++else |
1631 | ++ $as_echo "$as_me: failed program was:" >&5 |
1632 | ++sed 's/^/| /' conftest.$ac_ext >&5 |
1633 | ++ |
1634 | ++ ac_retval=1 |
1635 | ++fi |
1636 | ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information |
1637 | ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would |
1638 | ++ # interfere with the next link command; also delete a directory that is |
1639 | ++ # left behind by Apple's compiler. We do this before executing the actions. |
1640 | ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1641 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1642 | ++ as_fn_set_status $ac_retval |
1643 | ++ |
1644 | ++} # ac_fn_c_try_link |
1645 | ++ |
1646 | ++# ac_fn_c_check_func LINENO FUNC VAR |
1647 | ++# ---------------------------------- |
1648 | ++# Tests whether FUNC exists, setting the cache variable VAR accordingly |
1649 | ++ac_fn_c_check_func () |
1650 | ++{ |
1651 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1652 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1653 | ++$as_echo_n "checking for $2... " >&6; } |
1654 | ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
1655 | ++ $as_echo_n "(cached) " >&6 |
1656 | ++else |
1657 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1658 | ++/* end confdefs.h. */ |
1659 | ++/* Define $2 to an innocuous variant, in case <limits.h> declares $2. |
1660 | ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
1661 | ++#define $2 innocuous_$2 |
1662 | ++ |
1663 | ++/* System header to define __stub macros and hopefully few prototypes, |
1664 | ++ which can conflict with char $2 (); below. |
1665 | ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
1666 | ++ <limits.h> exists even on freestanding compilers. */ |
1667 | ++ |
1668 | ++#ifdef __STDC__ |
1669 | ++# include <limits.h> |
1670 | ++#else |
1671 | ++# include <assert.h> |
1672 | ++#endif |
1673 | ++ |
1674 | ++#undef $2 |
1675 | ++ |
1676 | ++/* Override any GCC internal prototype to avoid an error. |
1677 | ++ Use char because int might match the return type of a GCC |
1678 | ++ builtin and then its argument prototype would still apply. */ |
1679 | ++#ifdef __cplusplus |
1680 | ++extern "C" |
1681 | ++#endif |
1682 | ++char $2 (); |
1683 | ++/* The GNU C library defines this for functions which it implements |
1684 | ++ to always fail with ENOSYS. Some functions are actually named |
1685 | ++ something starting with __ and the normal name is an alias. */ |
1686 | ++#if defined __stub_$2 || defined __stub___$2 |
1687 | ++choke me |
1688 | ++#endif |
1689 | ++ |
1690 | ++int |
1691 | ++main () |
1692 | ++{ |
1693 | ++return $2 (); |
1694 | ++ ; |
1695 | ++ return 0; |
1696 | ++} |
1697 | ++_ACEOF |
1698 | ++if ac_fn_c_try_link "$LINENO"; then : |
1699 | ++ eval "$3=yes" |
1700 | ++else |
1701 | ++ eval "$3=no" |
1702 | ++fi |
1703 | ++rm -f core conftest.err conftest.$ac_objext \ |
1704 | ++ conftest$ac_exeext conftest.$ac_ext |
1705 | ++fi |
1706 | ++eval ac_res=\$$3 |
1707 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1708 | ++$as_echo "$ac_res" >&6; } |
1709 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1710 | ++ |
1711 | ++} # ac_fn_c_check_func |
1712 | ++ |
1713 | ++# ac_fn_c_try_cpp LINENO |
1714 | ++# ---------------------- |
1715 | ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. |
1716 | ++ac_fn_c_try_cpp () |
1717 | ++{ |
1718 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1719 | ++ if { { ac_try="$ac_cpp conftest.$ac_ext" |
1720 | ++case "(($ac_try" in |
1721 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1722 | ++ *) ac_try_echo=$ac_try;; |
1723 | ++esac |
1724 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1725 | ++$as_echo "$ac_try_echo"; } >&5 |
1726 | ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err |
1727 | ++ ac_status=$? |
1728 | ++ if test -s conftest.err; then |
1729 | ++ grep -v '^ *+' conftest.err >conftest.er1 |
1730 | ++ cat conftest.er1 >&5 |
1731 | ++ mv -f conftest.er1 conftest.err |
1732 | ++ fi |
1733 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1734 | ++ test $ac_status = 0; } >/dev/null && { |
1735 | ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
1736 | ++ test ! -s conftest.err |
1737 | ++ }; then : |
1738 | ++ ac_retval=0 |
1739 | ++else |
1740 | ++ $as_echo "$as_me: failed program was:" >&5 |
1741 | ++sed 's/^/| /' conftest.$ac_ext >&5 |
1742 | ++ |
1743 | ++ ac_retval=1 |
1744 | ++fi |
1745 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1746 | ++ as_fn_set_status $ac_retval |
1747 | ++ |
1748 | ++} # ac_fn_c_try_cpp |
1749 | ++ |
1750 | ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES |
1751 | ++# ------------------------------------------------------- |
1752 | ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using |
1753 | ++# the include files in INCLUDES and setting the cache variable VAR |
1754 | ++# accordingly. |
1755 | ++ac_fn_c_check_header_mongrel () |
1756 | ++{ |
1757 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1758 | ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
1759 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1760 | ++$as_echo_n "checking for $2... " >&6; } |
1761 | ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
1762 | ++ $as_echo_n "(cached) " >&6 |
1763 | ++fi |
1764 | ++eval ac_res=\$$3 |
1765 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1766 | ++$as_echo "$ac_res" >&6; } |
1767 | ++else |
1768 | ++ # Is the header compilable? |
1769 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 |
1770 | ++$as_echo_n "checking $2 usability... " >&6; } |
1771 | ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1772 | ++/* end confdefs.h. */ |
1773 | ++$4 |
1774 | ++#include <$2> |
1775 | ++_ACEOF |
1776 | ++if ac_fn_c_try_compile "$LINENO"; then : |
1777 | ++ ac_header_compiler=yes |
1778 | ++else |
1779 | ++ ac_header_compiler=no |
1780 | ++fi |
1781 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1782 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 |
1783 | ++$as_echo "$ac_header_compiler" >&6; } |
1784 | ++ |
1785 | ++# Is the header present? |
1786 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 |
1787 | ++$as_echo_n "checking $2 presence... " >&6; } |
1788 | ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1789 | ++/* end confdefs.h. */ |
1790 | ++#include <$2> |
1791 | ++_ACEOF |
1792 | ++if ac_fn_c_try_cpp "$LINENO"; then : |
1793 | ++ ac_header_preproc=yes |
1794 | ++else |
1795 | ++ ac_header_preproc=no |
1796 | ++fi |
1797 | ++rm -f conftest.err conftest.$ac_ext |
1798 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 |
1799 | ++$as_echo "$ac_header_preproc" >&6; } |
1800 | ++ |
1801 | ++# So? What about this header? |
1802 | ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( |
1803 | ++ yes:no: ) |
1804 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 |
1805 | ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} |
1806 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
1807 | ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
1808 | ++ ;; |
1809 | ++ no:yes:* ) |
1810 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 |
1811 | ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} |
1812 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 |
1813 | ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} |
1814 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 |
1815 | ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} |
1816 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 |
1817 | ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
1818 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
1819 | ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
1820 | ++ ;; |
1821 | ++esac |
1822 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1823 | ++$as_echo_n "checking for $2... " >&6; } |
1824 | ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
1825 | ++ $as_echo_n "(cached) " >&6 |
1826 | ++else |
1827 | ++ eval "$3=\$ac_header_compiler" |
1828 | ++fi |
1829 | ++eval ac_res=\$$3 |
1830 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1831 | ++$as_echo "$ac_res" >&6; } |
1832 | ++fi |
1833 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1834 | ++ |
1835 | ++} # ac_fn_c_check_header_mongrel |
1836 | ++ |
1837 | ++# ac_fn_c_try_run LINENO |
1838 | ++# ---------------------- |
1839 | ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes |
1840 | ++# that executables *can* be run. |
1841 | ++ac_fn_c_try_run () |
1842 | ++{ |
1843 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1844 | ++ if { { ac_try="$ac_link" |
1845 | ++case "(($ac_try" in |
1846 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1847 | ++ *) ac_try_echo=$ac_try;; |
1848 | ++esac |
1849 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1850 | ++$as_echo "$ac_try_echo"; } >&5 |
1851 | ++ (eval "$ac_link") 2>&5 |
1852 | ++ ac_status=$? |
1853 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1854 | ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' |
1855 | ++ { { case "(($ac_try" in |
1856 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1857 | ++ *) ac_try_echo=$ac_try;; |
1858 | ++esac |
1859 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1860 | ++$as_echo "$ac_try_echo"; } >&5 |
1861 | ++ (eval "$ac_try") 2>&5 |
1862 | ++ ac_status=$? |
1863 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1864 | ++ test $ac_status = 0; }; }; then : |
1865 | ++ ac_retval=0 |
1866 | ++else |
1867 | ++ $as_echo "$as_me: program exited with status $ac_status" >&5 |
1868 | ++ $as_echo "$as_me: failed program was:" >&5 |
1869 | ++sed 's/^/| /' conftest.$ac_ext >&5 |
1870 | ++ |
1871 | ++ ac_retval=$ac_status |
1872 | ++fi |
1873 | ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1874 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1875 | ++ as_fn_set_status $ac_retval |
1876 | ++ |
1877 | ++} # ac_fn_c_try_run |
1878 | ++ |
1879 | ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES |
1880 | ++# ------------------------------------------------------- |
1881 | ++# Tests whether HEADER exists and can be compiled using the include files in |
1882 | ++# INCLUDES, setting the cache variable VAR accordingly. |
1883 | ++ac_fn_c_check_header_compile () |
1884 | ++{ |
1885 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1886 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1887 | ++$as_echo_n "checking for $2... " >&6; } |
1888 | ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
1889 | ++ $as_echo_n "(cached) " >&6 |
1890 | ++else |
1891 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1892 | ++/* end confdefs.h. */ |
1893 | ++$4 |
1894 | ++#include <$2> |
1895 | ++_ACEOF |
1896 | ++if ac_fn_c_try_compile "$LINENO"; then : |
1897 | ++ eval "$3=yes" |
1898 | ++else |
1899 | ++ eval "$3=no" |
1900 | ++fi |
1901 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1902 | ++fi |
1903 | ++eval ac_res=\$$3 |
1904 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1905 | ++$as_echo "$ac_res" >&6; } |
1906 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1907 | ++ |
1908 | ++} # ac_fn_c_check_header_compile |
1909 | ++ |
1910 | ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES |
1911 | ++# ------------------------------------------- |
1912 | ++# Tests whether TYPE exists after having included INCLUDES, setting cache |
1913 | ++# variable VAR accordingly. |
1914 | ++ac_fn_c_check_type () |
1915 | ++{ |
1916 | ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1917 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1918 | ++$as_echo_n "checking for $2... " >&6; } |
1919 | ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
1920 | ++ $as_echo_n "(cached) " >&6 |
1921 | ++else |
1922 | ++ eval "$3=no" |
1923 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1924 | ++/* end confdefs.h. */ |
1925 | ++$4 |
1926 | ++int |
1927 | ++main () |
1928 | ++{ |
1929 | ++if (sizeof ($2)) |
1930 | ++ return 0; |
1931 | ++ ; |
1932 | ++ return 0; |
1933 | ++} |
1934 | ++_ACEOF |
1935 | ++if ac_fn_c_try_compile "$LINENO"; then : |
1936 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1937 | ++/* end confdefs.h. */ |
1938 | ++$4 |
1939 | ++int |
1940 | ++main () |
1941 | ++{ |
1942 | ++if (sizeof (($2))) |
1943 | ++ return 0; |
1944 | ++ ; |
1945 | ++ return 0; |
1946 | ++} |
1947 | ++_ACEOF |
1948 | ++if ac_fn_c_try_compile "$LINENO"; then : |
1949 | ++ |
1950 | ++else |
1951 | ++ eval "$3=yes" |
1952 | ++fi |
1953 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1954 | ++fi |
1955 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1956 | ++fi |
1957 | ++eval ac_res=\$$3 |
1958 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1959 | ++$as_echo "$ac_res" >&6; } |
1960 | ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1961 | ++ |
1962 | ++} # ac_fn_c_check_type |
1963 | ++cat >config.log <<_ACEOF |
1964 | + This file contains any messages produced by compilers while |
1965 | + running configure, to aid debugging if configure makes a mistake. |
1966 | + |
1967 | + It was created by libtar $as_me 1.2.11, which was |
1968 | +-generated by GNU Autoconf 2.57. Invocation command line was |
1969 | ++generated by GNU Autoconf 2.65. Invocation command line was |
1970 | + |
1971 | + $ $0 $@ |
1972 | + |
1973 | + _ACEOF |
1974 | ++exec 5>>config.log |
1975 | + { |
1976 | + cat <<_ASUNAME |
1977 | + ## --------- ## |
1978 | +@@ -974,7 +1815,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` |
1979 | + /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` |
1980 | + /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` |
1981 | + /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` |
1982 | +-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` |
1983 | ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` |
1984 | + /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` |
1985 | + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` |
1986 | + /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` |
1987 | +@@ -986,8 +1827,9 @@ for as_dir in $PATH |
1988 | + do |
1989 | + IFS=$as_save_IFS |
1990 | + test -z "$as_dir" && as_dir=. |
1991 | +- echo "PATH: $as_dir" |
1992 | +-done |
1993 | ++ $as_echo "PATH: $as_dir" |
1994 | ++ done |
1995 | ++IFS=$as_save_IFS |
1996 | + |
1997 | + } >&5 |
1998 | + |
1999 | +@@ -1009,7 +1851,6 @@ _ACEOF |
2000 | + ac_configure_args= |
2001 | + ac_configure_args0= |
2002 | + ac_configure_args1= |
2003 | +-ac_sep= |
2004 | + ac_must_keep_next=false |
2005 | + for ac_pass in 1 2 |
2006 | + do |
2007 | +@@ -1020,43 +1861,41 @@ do |
2008 | + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
2009 | + | -silent | --silent | --silen | --sile | --sil) |
2010 | + continue ;; |
2011 | +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) |
2012 | +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
2013 | ++ *\'*) |
2014 | ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
2015 | + esac |
2016 | + case $ac_pass in |
2017 | +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; |
2018 | ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; |
2019 | + 2) |
2020 | +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" |
2021 | ++ as_fn_append ac_configure_args1 " '$ac_arg'" |
2022 | + if test $ac_must_keep_next = true; then |
2023 | +- ac_must_keep_next=false # Got value, back to normal. |
2024 | ++ ac_must_keep_next=false # Got value, back to normal. |
2025 | + else |
2026 | +- case $ac_arg in |
2027 | +- *=* | --config-cache | -C | -disable-* | --disable-* \ |
2028 | +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ |
2029 | +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ |
2030 | +- | -with-* | --with-* | -without-* | --without-* | --x) |
2031 | +- case "$ac_configure_args0 " in |
2032 | +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; |
2033 | +- esac |
2034 | +- ;; |
2035 | +- -* ) ac_must_keep_next=true ;; |
2036 | +- esac |
2037 | ++ case $ac_arg in |
2038 | ++ *=* | --config-cache | -C | -disable-* | --disable-* \ |
2039 | ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ |
2040 | ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ |
2041 | ++ | -with-* | --with-* | -without-* | --without-* | --x) |
2042 | ++ case "$ac_configure_args0 " in |
2043 | ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; |
2044 | ++ esac |
2045 | ++ ;; |
2046 | ++ -* ) ac_must_keep_next=true ;; |
2047 | ++ esac |
2048 | + fi |
2049 | +- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" |
2050 | +- # Get rid of the leading space. |
2051 | +- ac_sep=" " |
2052 | ++ as_fn_append ac_configure_args " '$ac_arg'" |
2053 | + ;; |
2054 | + esac |
2055 | + done |
2056 | + done |
2057 | +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } |
2058 | +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } |
2059 | ++{ ac_configure_args0=; unset ac_configure_args0;} |
2060 | ++{ ac_configure_args1=; unset ac_configure_args1;} |
2061 | + |
2062 | + # When interrupted or exit'd, cleanup temporary files, and complete |
2063 | + # config.log. We remove comments because anyway the quotes in there |
2064 | + # would cause problems or look ugly. |
2065 | +-# WARNING: Be sure not to use single quotes in there, as some shells, |
2066 | +-# such as our DU 5.0 friend, will then `close' the trap. |
2067 | ++# WARNING: Use '\'' to represent an apostrophe within the trap. |
2068 | ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. |
2069 | + trap 'exit_status=$? |
2070 | + # Save into config.log some information that might help in debugging. |
2071 | + { |
2072 | +@@ -1069,20 +1908,35 @@ trap 'exit_status=$? |
2073 | + _ASBOX |
2074 | + echo |
2075 | + # The following way of writing the cache mishandles newlines in values, |
2076 | +-{ |
2077 | ++( |
2078 | ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do |
2079 | ++ eval ac_val=\$$ac_var |
2080 | ++ case $ac_val in #( |
2081 | ++ *${as_nl}*) |
2082 | ++ case $ac_var in #( |
2083 | ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 |
2084 | ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; |
2085 | ++ esac |
2086 | ++ case $ac_var in #( |
2087 | ++ _ | IFS | as_nl) ;; #( |
2088 | ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( |
2089 | ++ *) { eval $ac_var=; unset $ac_var;} ;; |
2090 | ++ esac ;; |
2091 | ++ esac |
2092 | ++ done |
2093 | + (set) 2>&1 | |
2094 | +- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in |
2095 | +- *ac_space=\ *) |
2096 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( |
2097 | ++ *${as_nl}ac_space=\ *) |
2098 | + sed -n \ |
2099 | +- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; |
2100 | +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" |
2101 | +- ;; |
2102 | ++ "s/'\''/'\''\\\\'\'''\''/g; |
2103 | ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" |
2104 | ++ ;; #( |
2105 | + *) |
2106 | +- sed -n \ |
2107 | +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" |
2108 | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" |
2109 | + ;; |
2110 | +- esac; |
2111 | +-} |
2112 | ++ esac | |
2113 | ++ sort |
2114 | ++) |
2115 | + echo |
2116 | + |
2117 | + cat <<\_ASBOX |
2118 | +@@ -1093,22 +1947,28 @@ _ASBOX |
2119 | + echo |
2120 | + for ac_var in $ac_subst_vars |
2121 | + do |
2122 | +- eval ac_val=$`echo $ac_var` |
2123 | +- echo "$ac_var='"'"'$ac_val'"'"'" |
2124 | ++ eval ac_val=\$$ac_var |
2125 | ++ case $ac_val in |
2126 | ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
2127 | ++ esac |
2128 | ++ $as_echo "$ac_var='\''$ac_val'\''" |
2129 | + done | sort |
2130 | + echo |
2131 | + |
2132 | + if test -n "$ac_subst_files"; then |
2133 | + cat <<\_ASBOX |
2134 | +-## ------------- ## |
2135 | +-## Output files. ## |
2136 | +-## ------------- ## |
2137 | ++## ------------------- ## |
2138 | ++## File substitutions. ## |
2139 | ++## ------------------- ## |
2140 | + _ASBOX |
2141 | + echo |
2142 | + for ac_var in $ac_subst_files |
2143 | + do |
2144 | +- eval ac_val=$`echo $ac_var` |
2145 | +- echo "$ac_var='"'"'$ac_val'"'"'" |
2146 | ++ eval ac_val=\$$ac_var |
2147 | ++ case $ac_val in |
2148 | ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
2149 | ++ esac |
2150 | ++ $as_echo "$ac_var='\''$ac_val'\''" |
2151 | + done | sort |
2152 | + echo |
2153 | + fi |
2154 | +@@ -1120,26 +1980,26 @@ _ASBOX |
2155 | + ## ----------- ## |
2156 | + _ASBOX |
2157 | + echo |
2158 | +- sed "/^$/d" confdefs.h | sort |
2159 | ++ cat confdefs.h |
2160 | + echo |
2161 | + fi |
2162 | + test "$ac_signal" != 0 && |
2163 | +- echo "$as_me: caught signal $ac_signal" |
2164 | +- echo "$as_me: exit $exit_status" |
2165 | ++ $as_echo "$as_me: caught signal $ac_signal" |
2166 | ++ $as_echo "$as_me: exit $exit_status" |
2167 | + } >&5 |
2168 | +- rm -f core core.* *.core && |
2169 | +- rm -rf conftest* confdefs* conf$$* $ac_clean_files && |
2170 | ++ rm -f core *.core core.conftest.* && |
2171 | ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && |
2172 | + exit $exit_status |
2173 | +- ' 0 |
2174 | ++' 0 |
2175 | + for ac_signal in 1 2 13 15; do |
2176 | +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal |
2177 | ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal |
2178 | + done |
2179 | + ac_signal=0 |
2180 | + |
2181 | + # confdefs.h avoids OS command line length limits that DEFS can exceed. |
2182 | +-rm -rf conftest* confdefs.h |
2183 | +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. |
2184 | +-echo >confdefs.h |
2185 | ++rm -f -r conftest* confdefs.h |
2186 | ++ |
2187 | ++$as_echo "/* confdefs.h */" > confdefs.h |
2188 | + |
2189 | + # Predefined preprocessor variables. |
2190 | + |
2191 | +@@ -1147,112 +2007,128 @@ cat >>confdefs.h <<_ACEOF |
2192 | + #define PACKAGE_NAME "$PACKAGE_NAME" |
2193 | + _ACEOF |
2194 | + |
2195 | +- |
2196 | + cat >>confdefs.h <<_ACEOF |
2197 | + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" |
2198 | + _ACEOF |
2199 | + |
2200 | +- |
2201 | + cat >>confdefs.h <<_ACEOF |
2202 | + #define PACKAGE_VERSION "$PACKAGE_VERSION" |
2203 | + _ACEOF |
2204 | + |
2205 | +- |
2206 | + cat >>confdefs.h <<_ACEOF |
2207 | + #define PACKAGE_STRING "$PACKAGE_STRING" |
2208 | + _ACEOF |
2209 | + |
2210 | +- |
2211 | + cat >>confdefs.h <<_ACEOF |
2212 | + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" |
2213 | + _ACEOF |
2214 | + |
2215 | ++cat >>confdefs.h <<_ACEOF |
2216 | ++#define PACKAGE_URL "$PACKAGE_URL" |
2217 | ++_ACEOF |
2218 | ++ |
2219 | + |
2220 | + # Let the site file select an alternate cache file if it wants to. |
2221 | +-# Prefer explicitly selected file to automatically selected ones. |
2222 | +-if test -z "$CONFIG_SITE"; then |
2223 | +- if test "x$prefix" != xNONE; then |
2224 | +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" |
2225 | +- else |
2226 | +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" |
2227 | +- fi |
2228 | +-fi |
2229 | +-for ac_site_file in $CONFIG_SITE; do |
2230 | +- if test -r "$ac_site_file"; then |
2231 | +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 |
2232 | +-echo "$as_me: loading site script $ac_site_file" >&6;} |
2233 | ++# Prefer an explicitly selected file to automatically selected ones. |
2234 | ++ac_site_file1=NONE |
2235 | ++ac_site_file2=NONE |
2236 | ++if test -n "$CONFIG_SITE"; then |
2237 | ++ ac_site_file1=$CONFIG_SITE |
2238 | ++elif test "x$prefix" != xNONE; then |
2239 | ++ ac_site_file1=$prefix/share/config.site |
2240 | ++ ac_site_file2=$prefix/etc/config.site |
2241 | ++else |
2242 | ++ ac_site_file1=$ac_default_prefix/share/config.site |
2243 | ++ ac_site_file2=$ac_default_prefix/etc/config.site |
2244 | ++fi |
2245 | ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
2246 | ++do |
2247 | ++ test "x$ac_site_file" = xNONE && continue |
2248 | ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |
2249 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
2250 | ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} |
2251 | + sed 's/^/| /' "$ac_site_file" >&5 |
2252 | + . "$ac_site_file" |
2253 | + fi |
2254 | + done |
2255 | + |
2256 | + if test -r "$cache_file"; then |
2257 | +- # Some versions of bash will fail to source /dev/null (special |
2258 | +- # files actually), so we avoid doing that. |
2259 | +- if test -f "$cache_file"; then |
2260 | +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 |
2261 | +-echo "$as_me: loading cache $cache_file" >&6;} |
2262 | ++ # Some versions of bash will fail to source /dev/null (special files |
2263 | ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. |
2264 | ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then |
2265 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 |
2266 | ++$as_echo "$as_me: loading cache $cache_file" >&6;} |
2267 | + case $cache_file in |
2268 | +- [\\/]* | ?:[\\/]* ) . $cache_file;; |
2269 | +- *) . ./$cache_file;; |
2270 | ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; |
2271 | ++ *) . "./$cache_file";; |
2272 | + esac |
2273 | + fi |
2274 | + else |
2275 | +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 |
2276 | +-echo "$as_me: creating cache $cache_file" >&6;} |
2277 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 |
2278 | ++$as_echo "$as_me: creating cache $cache_file" >&6;} |
2279 | + >$cache_file |
2280 | + fi |
2281 | + |
2282 | + # Check that the precious variables saved in the cache have kept the same |
2283 | + # value. |
2284 | + ac_cache_corrupted=false |
2285 | +-for ac_var in `(set) 2>&1 | |
2286 | +- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do |
2287 | ++for ac_var in $ac_precious_vars; do |
2288 | + eval ac_old_set=\$ac_cv_env_${ac_var}_set |
2289 | + eval ac_new_set=\$ac_env_${ac_var}_set |
2290 | +- eval ac_old_val="\$ac_cv_env_${ac_var}_value" |
2291 | +- eval ac_new_val="\$ac_env_${ac_var}_value" |
2292 | ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value |
2293 | ++ eval ac_new_val=\$ac_env_${ac_var}_value |
2294 | + case $ac_old_set,$ac_new_set in |
2295 | + set,) |
2296 | +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
2297 | +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} |
2298 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
2299 | ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} |
2300 | + ac_cache_corrupted=: ;; |
2301 | + ,set) |
2302 | +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 |
2303 | +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} |
2304 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 |
2305 | ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} |
2306 | + ac_cache_corrupted=: ;; |
2307 | + ,);; |
2308 | + *) |
2309 | + if test "x$ac_old_val" != "x$ac_new_val"; then |
2310 | +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 |
2311 | +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} |
2312 | +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 |
2313 | +-echo "$as_me: former value: $ac_old_val" >&2;} |
2314 | +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 |
2315 | +-echo "$as_me: current value: $ac_new_val" >&2;} |
2316 | +- ac_cache_corrupted=: |
2317 | ++ # differences in whitespace do not lead to failure. |
2318 | ++ ac_old_val_w=`echo x $ac_old_val` |
2319 | ++ ac_new_val_w=`echo x $ac_new_val` |
2320 | ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then |
2321 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 |
2322 | ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} |
2323 | ++ ac_cache_corrupted=: |
2324 | ++ else |
2325 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 |
2326 | ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} |
2327 | ++ eval $ac_var=\$ac_old_val |
2328 | ++ fi |
2329 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 |
2330 | ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} |
2331 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 |
2332 | ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} |
2333 | + fi;; |
2334 | + esac |
2335 | + # Pass precious variables to config.status. |
2336 | + if test "$ac_new_set" = set; then |
2337 | + case $ac_new_val in |
2338 | +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) |
2339 | +- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; |
2340 | ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; |
2341 | + *) ac_arg=$ac_var=$ac_new_val ;; |
2342 | + esac |
2343 | + case " $ac_configure_args " in |
2344 | + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. |
2345 | +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; |
2346 | ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; |
2347 | + esac |
2348 | + fi |
2349 | + done |
2350 | + if $ac_cache_corrupted; then |
2351 | +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 |
2352 | +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
2353 | +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 |
2354 | +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} |
2355 | +- { (exit 1); exit 1; }; } |
2356 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2357 | ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2358 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
2359 | ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
2360 | ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
2361 | + fi |
2362 | ++## -------------------- ## |
2363 | ++## Main body of script. ## |
2364 | ++## -------------------- ## |
2365 | + |
2366 | + ac_ext=c |
2367 | + ac_cpp='$CPP $CPPFLAGS' |
2368 | +@@ -1262,57 +2138,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
2369 | + |
2370 | + |
2371 | + |
2372 | +- |
2373 | +- |
2374 | +- |
2375 | +- |
2376 | +- |
2377 | +- |
2378 | +- |
2379 | +- |
2380 | +- |
2381 | +- |
2382 | +- |
2383 | +- |
2384 | +- |
2385 | +- |
2386 | +- |
2387 | +- |
2388 | +- |
2389 | +- |
2390 | +- |
2391 | +- |
2392 | +- |
2393 | +- |
2394 | +- |
2395 | +- |
2396 | +- |
2397 | + ac_aux_dir= |
2398 | +-for ac_dir in autoconf $srcdir/autoconf; do |
2399 | +- if test -f $ac_dir/install-sh; then |
2400 | +- ac_aux_dir=$ac_dir |
2401 | +- ac_install_sh="$ac_aux_dir/install-sh -c" |
2402 | +- break |
2403 | +- elif test -f $ac_dir/install.sh; then |
2404 | +- ac_aux_dir=$ac_dir |
2405 | +- ac_install_sh="$ac_aux_dir/install.sh -c" |
2406 | +- break |
2407 | +- elif test -f $ac_dir/shtool; then |
2408 | +- ac_aux_dir=$ac_dir |
2409 | +- ac_install_sh="$ac_aux_dir/shtool install -c" |
2410 | +- break |
2411 | +- fi |
2412 | ++for ac_dir in autoconf "$srcdir"/autoconf; do |
2413 | ++ for ac_t in install-sh install.sh shtool; do |
2414 | ++ if test -f "$ac_dir/$ac_t"; then |
2415 | ++ ac_aux_dir=$ac_dir |
2416 | ++ ac_install_sh="$ac_aux_dir/$ac_t -c" |
2417 | ++ break 2 |
2418 | ++ fi |
2419 | ++ done |
2420 | + done |
2421 | + if test -z "$ac_aux_dir"; then |
2422 | +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&5 |
2423 | +-echo "$as_me: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&2;} |
2424 | +- { (exit 1); exit 1; }; } |
2425 | ++ as_fn_error "cannot find install-sh, install.sh, or shtool in autoconf \"$srcdir\"/autoconf" "$LINENO" 5 |
2426 | + fi |
2427 | +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" |
2428 | +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" |
2429 | +-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. |
2430 | + |
2431 | +- ac_config_headers="$ac_config_headers config.h" |
2432 | ++# These three variables are undocumented and unsupported, |
2433 | ++# and are intended to be withdrawn in a future Autoconf release. |
2434 | ++# They can cause serious problems if a builder's source tree is in a directory |
2435 | ++# whose full name contains unusual characters. |
2436 | ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. |
2437 | ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. |
2438 | ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. |
2439 | ++ |
2440 | ++ |
2441 | ++ac_config_headers="$ac_config_headers config.h" |
2442 | + |
2443 | + |
2444 | + |
2445 | +@@ -1320,22 +2169,22 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. |
2446 | + MKENCAP_OPTS=; |
2447 | + |
2448 | + # allow user to disable Encap support |
2449 | +- # Check whether --enable-encap or --disable-encap was given. |
2450 | +-if test "${enable_encap+set}" = set; then |
2451 | +- enableval="$enable_encap" |
2452 | +- |
2453 | ++ # Check whether --enable-encap was given. |
2454 | ++if test "${enable_encap+set}" = set; then : |
2455 | ++ enableval=$enable_encap; |
2456 | + else |
2457 | + enable_encap=default |
2458 | +-fi; |
2459 | ++fi |
2460 | ++ |
2461 | + |
2462 | + if test "$enable_encap" != "no"; then |
2463 | + # look for epkg and mkencap |
2464 | + # Extract the first word of "epkg", so it can be a program name with args. |
2465 | + set dummy epkg; ac_word=$2 |
2466 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2467 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2468 | +-if test "${ac_cv_path_EPKG+set}" = set; then |
2469 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2470 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2471 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2472 | ++if test "${ac_cv_path_EPKG+set}" = set; then : |
2473 | ++ $as_echo_n "(cached) " >&6 |
2474 | + else |
2475 | + case $EPKG in |
2476 | + [\\/]* | ?:[\\/]*) |
2477 | +@@ -1347,34 +2196,35 @@ for as_dir in $PATH |
2478 | + do |
2479 | + IFS=$as_save_IFS |
2480 | + test -z "$as_dir" && as_dir=. |
2481 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2482 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2483 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2484 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2485 | + ac_cv_path_EPKG="$as_dir/$ac_word$ac_exec_ext" |
2486 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2487 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2488 | + break 2 |
2489 | + fi |
2490 | + done |
2491 | +-done |
2492 | ++ done |
2493 | ++IFS=$as_save_IFS |
2494 | + |
2495 | + ;; |
2496 | + esac |
2497 | + fi |
2498 | + EPKG=$ac_cv_path_EPKG |
2499 | +- |
2500 | + if test -n "$EPKG"; then |
2501 | +- echo "$as_me:$LINENO: result: $EPKG" >&5 |
2502 | +-echo "${ECHO_T}$EPKG" >&6 |
2503 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPKG" >&5 |
2504 | ++$as_echo "$EPKG" >&6; } |
2505 | + else |
2506 | +- echo "$as_me:$LINENO: result: no" >&5 |
2507 | +-echo "${ECHO_T}no" >&6 |
2508 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2509 | ++$as_echo "no" >&6; } |
2510 | + fi |
2511 | + |
2512 | ++ |
2513 | + # Extract the first word of "mkencap", so it can be a program name with args. |
2514 | + set dummy mkencap; ac_word=$2 |
2515 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2516 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2517 | +-if test "${ac_cv_path_MKENCAP+set}" = set; then |
2518 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2519 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2520 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2521 | ++if test "${ac_cv_path_MKENCAP+set}" = set; then : |
2522 | ++ $as_echo_n "(cached) " >&6 |
2523 | + else |
2524 | + case $MKENCAP in |
2525 | + [\\/]* | ?:[\\/]*) |
2526 | +@@ -1386,29 +2236,30 @@ for as_dir in $PATH |
2527 | + do |
2528 | + IFS=$as_save_IFS |
2529 | + test -z "$as_dir" && as_dir=. |
2530 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2531 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2532 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2533 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2534 | + ac_cv_path_MKENCAP="$as_dir/$ac_word$ac_exec_ext" |
2535 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2536 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2537 | + break 2 |
2538 | + fi |
2539 | + done |
2540 | +-done |
2541 | ++ done |
2542 | ++IFS=$as_save_IFS |
2543 | + |
2544 | + ;; |
2545 | + esac |
2546 | + fi |
2547 | + MKENCAP=$ac_cv_path_MKENCAP |
2548 | +- |
2549 | + if test -n "$MKENCAP"; then |
2550 | +- echo "$as_me:$LINENO: result: $MKENCAP" >&5 |
2551 | +-echo "${ECHO_T}$MKENCAP" >&6 |
2552 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKENCAP" >&5 |
2553 | ++$as_echo "$MKENCAP" >&6; } |
2554 | + else |
2555 | +- echo "$as_me:$LINENO: result: no" >&5 |
2556 | +-echo "${ECHO_T}no" >&6 |
2557 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2558 | ++$as_echo "no" >&6; } |
2559 | + fi |
2560 | + |
2561 | + |
2562 | ++ |
2563 | + # enable by default if epkg or mkencap are found |
2564 | + if test "${EPKG:+set}" = "set" || test "${MKENCAP:+set}" = "set" && test "$enable_encap" = "default"; then |
2565 | + enable_encap=yes; |
2566 | +@@ -1449,23 +2300,23 @@ fi |
2567 | + fi |
2568 | + |
2569 | + # display results |
2570 | +- echo "$as_me:$LINENO: checking for Encap source directory" >&5 |
2571 | +-echo $ECHO_N "checking for Encap source directory... $ECHO_C" >&6 |
2572 | +- echo "$as_me:$LINENO: result: ${ENCAP_SOURCE}" >&5 |
2573 | +-echo "${ECHO_T}${ENCAP_SOURCE}" >&6 |
2574 | +- echo "$as_me:$LINENO: checking for Encap target directory" >&5 |
2575 | +-echo $ECHO_N "checking for Encap target directory... $ECHO_C" >&6 |
2576 | +- echo "$as_me:$LINENO: result: ${ENCAP_TARGET}" >&5 |
2577 | +-echo "${ECHO_T}${ENCAP_TARGET}" >&6 |
2578 | +- echo "$as_me:$LINENO: checking for Encap package directory" >&5 |
2579 | +-echo $ECHO_N "checking for Encap package directory... $ECHO_C" >&6 |
2580 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Encap source directory" >&5 |
2581 | ++$as_echo_n "checking for Encap source directory... " >&6; } |
2582 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ENCAP_SOURCE}" >&5 |
2583 | ++$as_echo "${ENCAP_SOURCE}" >&6; } |
2584 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Encap target directory" >&5 |
2585 | ++$as_echo_n "checking for Encap target directory... " >&6; } |
2586 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ENCAP_TARGET}" >&5 |
2587 | ++$as_echo "${ENCAP_TARGET}" >&6; } |
2588 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Encap package directory" >&5 |
2589 | ++$as_echo_n "checking for Encap package directory... " >&6; } |
2590 | + if test "${ENCAP_PKGSPEC:-unset}" = "unset"; then |
2591 | + ENCAP_PKGSPEC='${PACKAGE_NAME}-${PACKAGE_VERSION}'; |
2592 | +- echo "$as_me:$LINENO: result: ${ENCAP_SOURCE}/${PACKAGE_NAME}-${PACKAGE_VERSION}" >&5 |
2593 | +-echo "${ECHO_T}${ENCAP_SOURCE}/${PACKAGE_NAME}-${PACKAGE_VERSION}" >&6 |
2594 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ENCAP_SOURCE}/${PACKAGE_NAME}-${PACKAGE_VERSION}" >&5 |
2595 | ++$as_echo "${ENCAP_SOURCE}/${PACKAGE_NAME}-${PACKAGE_VERSION}" >&6; } |
2596 | + else |
2597 | +- echo "$as_me:$LINENO: result: ${ENCAP_SOURCE}/${ENCAP_PKGSPEC}" >&5 |
2598 | +-echo "${ECHO_T}${ENCAP_SOURCE}/${ENCAP_PKGSPEC}" >&6 |
2599 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ENCAP_SOURCE}/${ENCAP_PKGSPEC}" >&5 |
2600 | ++$as_echo "${ENCAP_SOURCE}/${ENCAP_PKGSPEC}" >&6; } |
2601 | + fi |
2602 | + prefix='${ENCAP_SOURCE}/${ENCAP_PKGSPEC}'; |
2603 | + |
2604 | +@@ -1478,13 +2329,13 @@ echo "${ECHO_T}${ENCAP_SOURCE}/${ENCAP_PKGSPEC}" >&6 |
2605 | + fi |
2606 | + |
2607 | + # check for --disable-epkg-install |
2608 | +- # Check whether --enable-epkg-install or --disable-epkg-install was given. |
2609 | +-if test "${enable_epkg_install+set}" = set; then |
2610 | +- enableval="$enable_epkg_install" |
2611 | +- |
2612 | ++ # Check whether --enable-epkg-install was given. |
2613 | ++if test "${enable_epkg_install+set}" = set; then : |
2614 | ++ enableval=$enable_epkg_install; |
2615 | + else |
2616 | + enable_epkg_install=yes |
2617 | +-fi; |
2618 | ++fi |
2619 | ++ |
2620 | + if test "$enable_epkg_install" = "no"; then |
2621 | + EPKG=":"; |
2622 | + fi |
2623 | +@@ -1656,10 +2507,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
2624 | + if test -n "$ac_tool_prefix"; then |
2625 | + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
2626 | + set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
2627 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2628 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2629 | +-if test "${ac_cv_prog_CC+set}" = set; then |
2630 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2631 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2632 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2633 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
2634 | ++ $as_echo_n "(cached) " >&6 |
2635 | + else |
2636 | + if test -n "$CC"; then |
2637 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
2638 | +@@ -1669,35 +2520,37 @@ for as_dir in $PATH |
2639 | + do |
2640 | + IFS=$as_save_IFS |
2641 | + test -z "$as_dir" && as_dir=. |
2642 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2643 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2644 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2645 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2646 | + ac_cv_prog_CC="${ac_tool_prefix}gcc" |
2647 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2648 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2649 | + break 2 |
2650 | + fi |
2651 | + done |
2652 | +-done |
2653 | ++ done |
2654 | ++IFS=$as_save_IFS |
2655 | + |
2656 | + fi |
2657 | + fi |
2658 | + CC=$ac_cv_prog_CC |
2659 | + if test -n "$CC"; then |
2660 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
2661 | +-echo "${ECHO_T}$CC" >&6 |
2662 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
2663 | ++$as_echo "$CC" >&6; } |
2664 | + else |
2665 | +- echo "$as_me:$LINENO: result: no" >&5 |
2666 | +-echo "${ECHO_T}no" >&6 |
2667 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2668 | ++$as_echo "no" >&6; } |
2669 | + fi |
2670 | + |
2671 | ++ |
2672 | + fi |
2673 | + if test -z "$ac_cv_prog_CC"; then |
2674 | + ac_ct_CC=$CC |
2675 | + # Extract the first word of "gcc", so it can be a program name with args. |
2676 | + set dummy gcc; ac_word=$2 |
2677 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2678 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2679 | +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
2680 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2681 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2682 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2683 | ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2684 | ++ $as_echo_n "(cached) " >&6 |
2685 | + else |
2686 | + if test -n "$ac_ct_CC"; then |
2687 | + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
2688 | +@@ -1707,39 +2560,50 @@ for as_dir in $PATH |
2689 | + do |
2690 | + IFS=$as_save_IFS |
2691 | + test -z "$as_dir" && as_dir=. |
2692 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2693 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2694 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2695 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2696 | + ac_cv_prog_ac_ct_CC="gcc" |
2697 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2698 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2699 | + break 2 |
2700 | + fi |
2701 | + done |
2702 | +-done |
2703 | ++ done |
2704 | ++IFS=$as_save_IFS |
2705 | + |
2706 | + fi |
2707 | + fi |
2708 | + ac_ct_CC=$ac_cv_prog_ac_ct_CC |
2709 | + if test -n "$ac_ct_CC"; then |
2710 | +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
2711 | +-echo "${ECHO_T}$ac_ct_CC" >&6 |
2712 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
2713 | ++$as_echo "$ac_ct_CC" >&6; } |
2714 | + else |
2715 | +- echo "$as_me:$LINENO: result: no" >&5 |
2716 | +-echo "${ECHO_T}no" >&6 |
2717 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2718 | ++$as_echo "no" >&6; } |
2719 | + fi |
2720 | + |
2721 | +- CC=$ac_ct_CC |
2722 | ++ if test "x$ac_ct_CC" = x; then |
2723 | ++ CC="" |
2724 | ++ else |
2725 | ++ case $cross_compiling:$ac_tool_warned in |
2726 | ++yes:) |
2727 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2728 | ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2729 | ++ac_tool_warned=yes ;; |
2730 | ++esac |
2731 | ++ CC=$ac_ct_CC |
2732 | ++ fi |
2733 | + else |
2734 | + CC="$ac_cv_prog_CC" |
2735 | + fi |
2736 | + |
2737 | + if test -z "$CC"; then |
2738 | +- if test -n "$ac_tool_prefix"; then |
2739 | +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
2740 | ++ if test -n "$ac_tool_prefix"; then |
2741 | ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
2742 | + set dummy ${ac_tool_prefix}cc; ac_word=$2 |
2743 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2744 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2745 | +-if test "${ac_cv_prog_CC+set}" = set; then |
2746 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2747 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2748 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2749 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
2750 | ++ $as_echo_n "(cached) " >&6 |
2751 | + else |
2752 | + if test -n "$CC"; then |
2753 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
2754 | +@@ -1749,77 +2613,37 @@ for as_dir in $PATH |
2755 | + do |
2756 | + IFS=$as_save_IFS |
2757 | + test -z "$as_dir" && as_dir=. |
2758 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2759 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2760 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2761 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2762 | + ac_cv_prog_CC="${ac_tool_prefix}cc" |
2763 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2764 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2765 | + break 2 |
2766 | + fi |
2767 | + done |
2768 | +-done |
2769 | ++ done |
2770 | ++IFS=$as_save_IFS |
2771 | + |
2772 | + fi |
2773 | + fi |
2774 | + CC=$ac_cv_prog_CC |
2775 | + if test -n "$CC"; then |
2776 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
2777 | +-echo "${ECHO_T}$CC" >&6 |
2778 | +-else |
2779 | +- echo "$as_me:$LINENO: result: no" >&5 |
2780 | +-echo "${ECHO_T}no" >&6 |
2781 | +-fi |
2782 | +- |
2783 | +-fi |
2784 | +-if test -z "$ac_cv_prog_CC"; then |
2785 | +- ac_ct_CC=$CC |
2786 | +- # Extract the first word of "cc", so it can be a program name with args. |
2787 | +-set dummy cc; ac_word=$2 |
2788 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2789 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2790 | +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
2791 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2792 | +-else |
2793 | +- if test -n "$ac_ct_CC"; then |
2794 | +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
2795 | +-else |
2796 | +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2797 | +-for as_dir in $PATH |
2798 | +-do |
2799 | +- IFS=$as_save_IFS |
2800 | +- test -z "$as_dir" && as_dir=. |
2801 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2802 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2803 | +- ac_cv_prog_ac_ct_CC="cc" |
2804 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2805 | +- break 2 |
2806 | +- fi |
2807 | +-done |
2808 | +-done |
2809 | +- |
2810 | +-fi |
2811 | +-fi |
2812 | +-ac_ct_CC=$ac_cv_prog_ac_ct_CC |
2813 | +-if test -n "$ac_ct_CC"; then |
2814 | +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
2815 | +-echo "${ECHO_T}$ac_ct_CC" >&6 |
2816 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
2817 | ++$as_echo "$CC" >&6; } |
2818 | + else |
2819 | +- echo "$as_me:$LINENO: result: no" >&5 |
2820 | +-echo "${ECHO_T}no" >&6 |
2821 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2822 | ++$as_echo "no" >&6; } |
2823 | + fi |
2824 | + |
2825 | +- CC=$ac_ct_CC |
2826 | +-else |
2827 | +- CC="$ac_cv_prog_CC" |
2828 | +-fi |
2829 | + |
2830 | ++ fi |
2831 | + fi |
2832 | + if test -z "$CC"; then |
2833 | + # Extract the first word of "cc", so it can be a program name with args. |
2834 | + set dummy cc; ac_word=$2 |
2835 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2836 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2837 | +-if test "${ac_cv_prog_CC+set}" = set; then |
2838 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2839 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2840 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2841 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
2842 | ++ $as_echo_n "(cached) " >&6 |
2843 | + else |
2844 | + if test -n "$CC"; then |
2845 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
2846 | +@@ -1830,18 +2654,19 @@ for as_dir in $PATH |
2847 | + do |
2848 | + IFS=$as_save_IFS |
2849 | + test -z "$as_dir" && as_dir=. |
2850 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2851 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2852 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2853 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2854 | + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
2855 | + ac_prog_rejected=yes |
2856 | + continue |
2857 | + fi |
2858 | + ac_cv_prog_CC="cc" |
2859 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2860 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2861 | + break 2 |
2862 | + fi |
2863 | + done |
2864 | +-done |
2865 | ++ done |
2866 | ++IFS=$as_save_IFS |
2867 | + |
2868 | + if test $ac_prog_rejected = yes; then |
2869 | + # We found a bogon in the path, so make sure we never use it. |
2870 | +@@ -1859,24 +2684,25 @@ fi |
2871 | + fi |
2872 | + CC=$ac_cv_prog_CC |
2873 | + if test -n "$CC"; then |
2874 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
2875 | +-echo "${ECHO_T}$CC" >&6 |
2876 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
2877 | ++$as_echo "$CC" >&6; } |
2878 | + else |
2879 | +- echo "$as_me:$LINENO: result: no" >&5 |
2880 | +-echo "${ECHO_T}no" >&6 |
2881 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2882 | ++$as_echo "no" >&6; } |
2883 | + fi |
2884 | + |
2885 | ++ |
2886 | + fi |
2887 | + if test -z "$CC"; then |
2888 | + if test -n "$ac_tool_prefix"; then |
2889 | +- for ac_prog in cl |
2890 | ++ for ac_prog in cl.exe |
2891 | + do |
2892 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
2893 | + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2894 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2895 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2896 | +-if test "${ac_cv_prog_CC+set}" = set; then |
2897 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2898 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2899 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2900 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
2901 | ++ $as_echo_n "(cached) " >&6 |
2902 | + else |
2903 | + if test -n "$CC"; then |
2904 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
2905 | +@@ -1886,39 +2712,41 @@ for as_dir in $PATH |
2906 | + do |
2907 | + IFS=$as_save_IFS |
2908 | + test -z "$as_dir" && as_dir=. |
2909 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2910 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2911 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2912 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2913 | + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
2914 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2915 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2916 | + break 2 |
2917 | + fi |
2918 | + done |
2919 | +-done |
2920 | ++ done |
2921 | ++IFS=$as_save_IFS |
2922 | + |
2923 | + fi |
2924 | + fi |
2925 | + CC=$ac_cv_prog_CC |
2926 | + if test -n "$CC"; then |
2927 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
2928 | +-echo "${ECHO_T}$CC" >&6 |
2929 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
2930 | ++$as_echo "$CC" >&6; } |
2931 | + else |
2932 | +- echo "$as_me:$LINENO: result: no" >&5 |
2933 | +-echo "${ECHO_T}no" >&6 |
2934 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2935 | ++$as_echo "no" >&6; } |
2936 | + fi |
2937 | + |
2938 | ++ |
2939 | + test -n "$CC" && break |
2940 | + done |
2941 | + fi |
2942 | + if test -z "$CC"; then |
2943 | + ac_ct_CC=$CC |
2944 | +- for ac_prog in cl |
2945 | ++ for ac_prog in cl.exe |
2946 | + do |
2947 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
2948 | + set dummy $ac_prog; ac_word=$2 |
2949 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2950 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2951 | +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
2952 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
2953 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2954 | ++$as_echo_n "checking for $ac_word... " >&6; } |
2955 | ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2956 | ++ $as_echo_n "(cached) " >&6 |
2957 | + else |
2958 | + if test -n "$ac_ct_CC"; then |
2959 | + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
2960 | +@@ -1928,67 +2756,78 @@ for as_dir in $PATH |
2961 | + do |
2962 | + IFS=$as_save_IFS |
2963 | + test -z "$as_dir" && as_dir=. |
2964 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
2965 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2966 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
2967 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2968 | + ac_cv_prog_ac_ct_CC="$ac_prog" |
2969 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2970 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2971 | + break 2 |
2972 | + fi |
2973 | + done |
2974 | +-done |
2975 | ++ done |
2976 | ++IFS=$as_save_IFS |
2977 | + |
2978 | + fi |
2979 | + fi |
2980 | + ac_ct_CC=$ac_cv_prog_ac_ct_CC |
2981 | + if test -n "$ac_ct_CC"; then |
2982 | +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
2983 | +-echo "${ECHO_T}$ac_ct_CC" >&6 |
2984 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
2985 | ++$as_echo "$ac_ct_CC" >&6; } |
2986 | + else |
2987 | +- echo "$as_me:$LINENO: result: no" >&5 |
2988 | +-echo "${ECHO_T}no" >&6 |
2989 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2990 | ++$as_echo "no" >&6; } |
2991 | + fi |
2992 | + |
2993 | ++ |
2994 | + test -n "$ac_ct_CC" && break |
2995 | + done |
2996 | + |
2997 | +- CC=$ac_ct_CC |
2998 | ++ if test "x$ac_ct_CC" = x; then |
2999 | ++ CC="" |
3000 | ++ else |
3001 | ++ case $cross_compiling:$ac_tool_warned in |
3002 | ++yes:) |
3003 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3004 | ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3005 | ++ac_tool_warned=yes ;; |
3006 | ++esac |
3007 | ++ CC=$ac_ct_CC |
3008 | ++ fi |
3009 | + fi |
3010 | + |
3011 | + fi |
3012 | + |
3013 | + |
3014 | +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH |
3015 | +-See \`config.log' for more details." >&5 |
3016 | +-echo "$as_me: error: no acceptable C compiler found in \$PATH |
3017 | +-See \`config.log' for more details." >&2;} |
3018 | +- { (exit 1); exit 1; }; } |
3019 | ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3020 | ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3021 | ++as_fn_error "no acceptable C compiler found in \$PATH |
3022 | ++See \`config.log' for more details." "$LINENO" 5; } |
3023 | + |
3024 | + # Provide some information about the compiler. |
3025 | +-echo "$as_me:$LINENO:" \ |
3026 | +- "checking for C compiler version" >&5 |
3027 | +-ac_compiler=`set X $ac_compile; echo $2` |
3028 | +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
3029 | +- (eval $ac_compiler --version </dev/null >&5) 2>&5 |
3030 | +- ac_status=$? |
3031 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3032 | +- (exit $ac_status); } |
3033 | +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 |
3034 | +- (eval $ac_compiler -v </dev/null >&5) 2>&5 |
3035 | +- ac_status=$? |
3036 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3037 | +- (exit $ac_status); } |
3038 | +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 |
3039 | +- (eval $ac_compiler -V </dev/null >&5) 2>&5 |
3040 | ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
3041 | ++set X $ac_compile |
3042 | ++ac_compiler=$2 |
3043 | ++for ac_option in --version -v -V -qversion; do |
3044 | ++ { { ac_try="$ac_compiler $ac_option >&5" |
3045 | ++case "(($ac_try" in |
3046 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3047 | ++ *) ac_try_echo=$ac_try;; |
3048 | ++esac |
3049 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3050 | ++$as_echo "$ac_try_echo"; } >&5 |
3051 | ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err |
3052 | + ac_status=$? |
3053 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3054 | +- (exit $ac_status); } |
3055 | ++ if test -s conftest.err; then |
3056 | ++ sed '10a\ |
3057 | ++... rest of stderr output deleted ... |
3058 | ++ 10q' conftest.err >conftest.er1 |
3059 | ++ cat conftest.er1 >&5 |
3060 | ++ fi |
3061 | ++ rm -f conftest.er1 conftest.err |
3062 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3063 | ++ test $ac_status = 0; } |
3064 | ++done |
3065 | + |
3066 | +-cat >conftest.$ac_ext <<_ACEOF |
3067 | +-#line $LINENO "configure" |
3068 | +-/* confdefs.h. */ |
3069 | +-_ACEOF |
3070 | +-cat confdefs.h >>conftest.$ac_ext |
3071 | +-cat >>conftest.$ac_ext <<_ACEOF |
3072 | ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3073 | + /* end confdefs.h. */ |
3074 | + |
3075 | + int |
3076 | +@@ -2000,112 +2839,109 @@ main () |
3077 | + } |
3078 | + _ACEOF |
3079 | + ac_clean_files_save=$ac_clean_files |
3080 | +-ac_clean_files="$ac_clean_files a.out a.exe b.out" |
3081 | ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" |
3082 | + # Try to create an executable without -o first, disregard a.out. |
3083 | + # It will help us diagnose broken compilers, and finding out an intuition |
3084 | + # of exeext. |
3085 | +-echo "$as_me:$LINENO: checking for C compiler default output" >&5 |
3086 | +-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 |
3087 | +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
3088 | +-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 |
3089 | +- (eval $ac_link_default) 2>&5 |
3090 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
3091 | ++$as_echo_n "checking whether the C compiler works... " >&6; } |
3092 | ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
3093 | ++ |
3094 | ++# The possible output files: |
3095 | ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" |
3096 | ++ |
3097 | ++ac_rmfiles= |
3098 | ++for ac_file in $ac_files |
3099 | ++do |
3100 | ++ case $ac_file in |
3101 | ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
3102 | ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; |
3103 | ++ esac |
3104 | ++done |
3105 | ++rm -f $ac_rmfiles |
3106 | ++ |
3107 | ++if { { ac_try="$ac_link_default" |
3108 | ++case "(($ac_try" in |
3109 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3110 | ++ *) ac_try_echo=$ac_try;; |
3111 | ++esac |
3112 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3113 | ++$as_echo "$ac_try_echo"; } >&5 |
3114 | ++ (eval "$ac_link_default") 2>&5 |
3115 | + ac_status=$? |
3116 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3117 | +- (exit $ac_status); }; then |
3118 | +- # Find the output, starting from the most likely. This scheme is |
3119 | +-# not robust to junk in `.', hence go to wildcards (a.*) only as a last |
3120 | +-# resort. |
3121 | +- |
3122 | +-# Be careful to initialize this variable, since it used to be cached. |
3123 | +-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. |
3124 | +-ac_cv_exeext= |
3125 | +-# b.out is created by i960 compilers. |
3126 | +-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out |
3127 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3128 | ++ test $ac_status = 0; }; then : |
3129 | ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. |
3130 | ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' |
3131 | ++# in a Makefile. We should not override ac_cv_exeext if it was cached, |
3132 | ++# so that the user can short-circuit this test for compilers unknown to |
3133 | ++# Autoconf. |
3134 | ++for ac_file in $ac_files '' |
3135 | + do |
3136 | + test -f "$ac_file" || continue |
3137 | + case $ac_file in |
3138 | +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) |
3139 | +- ;; |
3140 | +- conftest.$ac_ext ) |
3141 | +- # This is the source file. |
3142 | +- ;; |
3143 | ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) |
3144 | ++ ;; |
3145 | + [ab].out ) |
3146 | +- # We found the default executable, but exeext='' is most |
3147 | +- # certainly right. |
3148 | +- break;; |
3149 | ++ # We found the default executable, but exeext='' is most |
3150 | ++ # certainly right. |
3151 | ++ break;; |
3152 | + *.* ) |
3153 | +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
3154 | +- # FIXME: I believe we export ac_cv_exeext for Libtool, |
3155 | +- # but it would be cool to find out if it's true. Does anybody |
3156 | +- # maintain Libtool? --akim. |
3157 | +- export ac_cv_exeext |
3158 | +- break;; |
3159 | ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; |
3160 | ++ then :; else |
3161 | ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
3162 | ++ fi |
3163 | ++ # We set ac_cv_exeext here because the later test for it is not |
3164 | ++ # safe: cross compilers may not add the suffix if given an `-o' |
3165 | ++ # argument, so we may need to know it at that point already. |
3166 | ++ # Even if this section looks crufty: it has the advantage of |
3167 | ++ # actually working. |
3168 | ++ break;; |
3169 | + * ) |
3170 | +- break;; |
3171 | ++ break;; |
3172 | + esac |
3173 | + done |
3174 | ++test "$ac_cv_exeext" = no && ac_cv_exeext= |
3175 | ++ |
3176 | + else |
3177 | +- echo "$as_me: failed program was:" >&5 |
3178 | ++ ac_file='' |
3179 | ++fi |
3180 | ++if test -z "$ac_file"; then : |
3181 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3182 | ++$as_echo "no" >&6; } |
3183 | ++$as_echo "$as_me: failed program was:" >&5 |
3184 | + sed 's/^/| /' conftest.$ac_ext >&5 |
3185 | + |
3186 | +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables |
3187 | +-See \`config.log' for more details." >&5 |
3188 | +-echo "$as_me: error: C compiler cannot create executables |
3189 | +-See \`config.log' for more details." >&2;} |
3190 | +- { (exit 77); exit 77; }; } |
3191 | ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3192 | ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3193 | ++{ as_fn_set_status 77 |
3194 | ++as_fn_error "C compiler cannot create executables |
3195 | ++See \`config.log' for more details." "$LINENO" 5; }; } |
3196 | ++else |
3197 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3198 | ++$as_echo "yes" >&6; } |
3199 | + fi |
3200 | +- |
3201 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
3202 | ++$as_echo_n "checking for C compiler default output file name... " >&6; } |
3203 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
3204 | ++$as_echo "$ac_file" >&6; } |
3205 | + ac_exeext=$ac_cv_exeext |
3206 | +-echo "$as_me:$LINENO: result: $ac_file" >&5 |
3207 | +-echo "${ECHO_T}$ac_file" >&6 |
3208 | +- |
3209 | +-# Check the compiler produces executables we can run. If not, either |
3210 | +-# the compiler is broken, or we cross compile. |
3211 | +-echo "$as_me:$LINENO: checking whether the C compiler works" >&5 |
3212 | +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 |
3213 | +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 |
3214 | +-# If not cross compiling, check that we can run a simple program. |
3215 | +-if test "$cross_compiling" != yes; then |
3216 | +- if { ac_try='./$ac_file' |
3217 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3218 | +- (eval $ac_try) 2>&5 |
3219 | +- ac_status=$? |
3220 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3221 | +- (exit $ac_status); }; }; then |
3222 | +- cross_compiling=no |
3223 | +- else |
3224 | +- if test "$cross_compiling" = maybe; then |
3225 | +- cross_compiling=yes |
3226 | +- else |
3227 | +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. |
3228 | +-If you meant to cross compile, use \`--host'. |
3229 | +-See \`config.log' for more details." >&5 |
3230 | +-echo "$as_me: error: cannot run C compiled programs. |
3231 | +-If you meant to cross compile, use \`--host'. |
3232 | +-See \`config.log' for more details." >&2;} |
3233 | +- { (exit 1); exit 1; }; } |
3234 | +- fi |
3235 | +- fi |
3236 | +-fi |
3237 | +-echo "$as_me:$LINENO: result: yes" >&5 |
3238 | +-echo "${ECHO_T}yes" >&6 |
3239 | + |
3240 | +-rm -f a.out a.exe conftest$ac_cv_exeext b.out |
3241 | ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
3242 | + ac_clean_files=$ac_clean_files_save |
3243 | +-# Check the compiler produces executables we can run. If not, either |
3244 | +-# the compiler is broken, or we cross compile. |
3245 | +-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 |
3246 | +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 |
3247 | +-echo "$as_me:$LINENO: result: $cross_compiling" >&5 |
3248 | +-echo "${ECHO_T}$cross_compiling" >&6 |
3249 | +- |
3250 | +-echo "$as_me:$LINENO: checking for suffix of executables" >&5 |
3251 | +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 |
3252 | +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3253 | +- (eval $ac_link) 2>&5 |
3254 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 |
3255 | ++$as_echo_n "checking for suffix of executables... " >&6; } |
3256 | ++if { { ac_try="$ac_link" |
3257 | ++case "(($ac_try" in |
3258 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3259 | ++ *) ac_try_echo=$ac_try;; |
3260 | ++esac |
3261 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3262 | ++$as_echo "$ac_try_echo"; } >&5 |
3263 | ++ (eval "$ac_link") 2>&5 |
3264 | + ac_status=$? |
3265 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3266 | +- (exit $ac_status); }; then |
3267 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3268 | ++ test $ac_status = 0; }; then : |
3269 | + # If both `conftest.exe' and `conftest' are `present' (well, observable) |
3270 | + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will |
3271 | + # work properly (i.e., refer to `conftest.exe'), while it won't with |
3272 | +@@ -2113,39 +2949,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3273 | + for ac_file in conftest.exe conftest conftest.*; do |
3274 | + test -f "$ac_file" || continue |
3275 | + case $ac_file in |
3276 | +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; |
3277 | ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
3278 | + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
3279 | +- export ac_cv_exeext |
3280 | +- break;; |
3281 | ++ break;; |
3282 | + * ) break;; |
3283 | + esac |
3284 | + done |
3285 | + else |
3286 | +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link |
3287 | +-See \`config.log' for more details." >&5 |
3288 | +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link |
3289 | +-See \`config.log' for more details." >&2;} |
3290 | +- { (exit 1); exit 1; }; } |
3291 | ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3292 | ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3293 | ++as_fn_error "cannot compute suffix of executables: cannot compile and link |
3294 | ++See \`config.log' for more details." "$LINENO" 5; } |
3295 | + fi |
3296 | +- |
3297 | +-rm -f conftest$ac_cv_exeext |
3298 | +-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 |
3299 | +-echo "${ECHO_T}$ac_cv_exeext" >&6 |
3300 | ++rm -f conftest conftest$ac_cv_exeext |
3301 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
3302 | ++$as_echo "$ac_cv_exeext" >&6; } |
3303 | + |
3304 | + rm -f conftest.$ac_ext |
3305 | + EXEEXT=$ac_cv_exeext |
3306 | + ac_exeext=$EXEEXT |
3307 | +-echo "$as_me:$LINENO: checking for suffix of object files" >&5 |
3308 | +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 |
3309 | +-if test "${ac_cv_objext+set}" = set; then |
3310 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
3311 | +-else |
3312 | +- cat >conftest.$ac_ext <<_ACEOF |
3313 | +-#line $LINENO "configure" |
3314 | +-/* confdefs.h. */ |
3315 | ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3316 | ++/* end confdefs.h. */ |
3317 | ++#include <stdio.h> |
3318 | ++int |
3319 | ++main () |
3320 | ++{ |
3321 | ++FILE *f = fopen ("conftest.out", "w"); |
3322 | ++ return ferror (f) || fclose (f) != 0; |
3323 | ++ |
3324 | ++ ; |
3325 | ++ return 0; |
3326 | ++} |
3327 | + _ACEOF |
3328 | +-cat confdefs.h >>conftest.$ac_ext |
3329 | +-cat >>conftest.$ac_ext <<_ACEOF |
3330 | ++ac_clean_files="$ac_clean_files conftest.out" |
3331 | ++# Check that the compiler produces executables we can run. If not, either |
3332 | ++# the compiler is broken, or we cross compile. |
3333 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
3334 | ++$as_echo_n "checking whether we are cross compiling... " >&6; } |
3335 | ++if test "$cross_compiling" != yes; then |
3336 | ++ { { ac_try="$ac_link" |
3337 | ++case "(($ac_try" in |
3338 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3339 | ++ *) ac_try_echo=$ac_try;; |
3340 | ++esac |
3341 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3342 | ++$as_echo "$ac_try_echo"; } >&5 |
3343 | ++ (eval "$ac_link") 2>&5 |
3344 | ++ ac_status=$? |
3345 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3346 | ++ test $ac_status = 0; } |
3347 | ++ if { ac_try='./conftest$ac_cv_exeext' |
3348 | ++ { { case "(($ac_try" in |
3349 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3350 | ++ *) ac_try_echo=$ac_try;; |
3351 | ++esac |
3352 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3353 | ++$as_echo "$ac_try_echo"; } >&5 |
3354 | ++ (eval "$ac_try") 2>&5 |
3355 | ++ ac_status=$? |
3356 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3357 | ++ test $ac_status = 0; }; }; then |
3358 | ++ cross_compiling=no |
3359 | ++ else |
3360 | ++ if test "$cross_compiling" = maybe; then |
3361 | ++ cross_compiling=yes |
3362 | ++ else |
3363 | ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3364 | ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3365 | ++as_fn_error "cannot run C compiled programs. |
3366 | ++If you meant to cross compile, use \`--host'. |
3367 | ++See \`config.log' for more details." "$LINENO" 5; } |
3368 | ++ fi |
3369 | ++ fi |
3370 | ++fi |
3371 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
3372 | ++$as_echo "$cross_compiling" >&6; } |
3373 | ++ |
3374 | ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out |
3375 | ++ac_clean_files=$ac_clean_files_save |
3376 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
3377 | ++$as_echo_n "checking for suffix of object files... " >&6; } |
3378 | ++if test "${ac_cv_objext+set}" = set; then : |
3379 | ++ $as_echo_n "(cached) " >&6 |
3380 | ++else |
3381 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3382 | + /* end confdefs.h. */ |
3383 | + |
3384 | + int |
3385 | +@@ -2157,46 +3044,46 @@ main () |
3386 | + } |
3387 | + _ACEOF |
3388 | + rm -f conftest.o conftest.obj |
3389 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3390 | +- (eval $ac_compile) 2>&5 |
3391 | ++if { { ac_try="$ac_compile" |
3392 | ++case "(($ac_try" in |
3393 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3394 | ++ *) ac_try_echo=$ac_try;; |
3395 | ++esac |
3396 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3397 | ++$as_echo "$ac_try_echo"; } >&5 |
3398 | ++ (eval "$ac_compile") 2>&5 |
3399 | + ac_status=$? |
3400 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3401 | +- (exit $ac_status); }; then |
3402 | +- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do |
3403 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3404 | ++ test $ac_status = 0; }; then : |
3405 | ++ for ac_file in conftest.o conftest.obj conftest.*; do |
3406 | ++ test -f "$ac_file" || continue; |
3407 | + case $ac_file in |
3408 | +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; |
3409 | ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; |
3410 | + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` |
3411 | + break;; |
3412 | + esac |
3413 | + done |
3414 | + else |
3415 | +- echo "$as_me: failed program was:" >&5 |
3416 | ++ $as_echo "$as_me: failed program was:" >&5 |
3417 | + sed 's/^/| /' conftest.$ac_ext >&5 |
3418 | + |
3419 | +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile |
3420 | +-See \`config.log' for more details." >&5 |
3421 | +-echo "$as_me: error: cannot compute suffix of object files: cannot compile |
3422 | +-See \`config.log' for more details." >&2;} |
3423 | +- { (exit 1); exit 1; }; } |
3424 | ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3425 | ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3426 | ++as_fn_error "cannot compute suffix of object files: cannot compile |
3427 | ++See \`config.log' for more details." "$LINENO" 5; } |
3428 | + fi |
3429 | +- |
3430 | + rm -f conftest.$ac_cv_objext conftest.$ac_ext |
3431 | + fi |
3432 | +-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 |
3433 | +-echo "${ECHO_T}$ac_cv_objext" >&6 |
3434 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 |
3435 | ++$as_echo "$ac_cv_objext" >&6; } |
3436 | + OBJEXT=$ac_cv_objext |
3437 | + ac_objext=$OBJEXT |
3438 | +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 |
3439 | +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 |
3440 | +-if test "${ac_cv_c_compiler_gnu+set}" = set; then |
3441 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
3442 | +-else |
3443 | +- cat >conftest.$ac_ext <<_ACEOF |
3444 | +-#line $LINENO "configure" |
3445 | +-/* confdefs.h. */ |
3446 | +-_ACEOF |
3447 | +-cat confdefs.h >>conftest.$ac_ext |
3448 | +-cat >>conftest.$ac_ext <<_ACEOF |
3449 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
3450 | ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
3451 | ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
3452 | ++ $as_echo_n "(cached) " >&6 |
3453 | ++else |
3454 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3455 | + /* end confdefs.h. */ |
3456 | + |
3457 | + int |
3458 | +@@ -2210,46 +3097,34 @@ main () |
3459 | + return 0; |
3460 | + } |
3461 | + _ACEOF |
3462 | +-rm -f conftest.$ac_objext |
3463 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3464 | +- (eval $ac_compile) 2>&5 |
3465 | +- ac_status=$? |
3466 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3467 | +- (exit $ac_status); } && |
3468 | +- { ac_try='test -s conftest.$ac_objext' |
3469 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3470 | +- (eval $ac_try) 2>&5 |
3471 | +- ac_status=$? |
3472 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3473 | +- (exit $ac_status); }; }; then |
3474 | ++if ac_fn_c_try_compile "$LINENO"; then : |
3475 | + ac_compiler_gnu=yes |
3476 | + else |
3477 | +- echo "$as_me: failed program was:" >&5 |
3478 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
3479 | +- |
3480 | +-ac_compiler_gnu=no |
3481 | ++ ac_compiler_gnu=no |
3482 | + fi |
3483 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
3484 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3485 | + ac_cv_c_compiler_gnu=$ac_compiler_gnu |
3486 | + |
3487 | + fi |
3488 | +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 |
3489 | +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 |
3490 | +-GCC=`test $ac_compiler_gnu = yes && echo yes` |
3491 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 |
3492 | ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } |
3493 | ++if test $ac_compiler_gnu = yes; then |
3494 | ++ GCC=yes |
3495 | ++else |
3496 | ++ GCC= |
3497 | ++fi |
3498 | + ac_test_CFLAGS=${CFLAGS+set} |
3499 | + ac_save_CFLAGS=$CFLAGS |
3500 | +-CFLAGS="-g" |
3501 | +-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
3502 | +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 |
3503 | +-if test "${ac_cv_prog_cc_g+set}" = set; then |
3504 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
3505 | +-else |
3506 | +- cat >conftest.$ac_ext <<_ACEOF |
3507 | +-#line $LINENO "configure" |
3508 | +-/* confdefs.h. */ |
3509 | +-_ACEOF |
3510 | +-cat confdefs.h >>conftest.$ac_ext |
3511 | +-cat >>conftest.$ac_ext <<_ACEOF |
3512 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
3513 | ++$as_echo_n "checking whether $CC accepts -g... " >&6; } |
3514 | ++if test "${ac_cv_prog_cc_g+set}" = set; then : |
3515 | ++ $as_echo_n "(cached) " >&6 |
3516 | ++else |
3517 | ++ ac_save_c_werror_flag=$ac_c_werror_flag |
3518 | ++ ac_c_werror_flag=yes |
3519 | ++ ac_cv_prog_cc_g=no |
3520 | ++ CFLAGS="-g" |
3521 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3522 | + /* end confdefs.h. */ |
3523 | + |
3524 | + int |
3525 | +@@ -2260,29 +3135,49 @@ main () |
3526 | + return 0; |
3527 | + } |
3528 | + _ACEOF |
3529 | +-rm -f conftest.$ac_objext |
3530 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3531 | +- (eval $ac_compile) 2>&5 |
3532 | +- ac_status=$? |
3533 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3534 | +- (exit $ac_status); } && |
3535 | +- { ac_try='test -s conftest.$ac_objext' |
3536 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3537 | +- (eval $ac_try) 2>&5 |
3538 | +- ac_status=$? |
3539 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3540 | +- (exit $ac_status); }; }; then |
3541 | ++if ac_fn_c_try_compile "$LINENO"; then : |
3542 | + ac_cv_prog_cc_g=yes |
3543 | + else |
3544 | +- echo "$as_me: failed program was:" >&5 |
3545 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
3546 | ++ CFLAGS="" |
3547 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3548 | ++/* end confdefs.h. */ |
3549 | ++ |
3550 | ++int |
3551 | ++main () |
3552 | ++{ |
3553 | ++ |
3554 | ++ ; |
3555 | ++ return 0; |
3556 | ++} |
3557 | ++_ACEOF |
3558 | ++if ac_fn_c_try_compile "$LINENO"; then : |
3559 | ++ |
3560 | ++else |
3561 | ++ ac_c_werror_flag=$ac_save_c_werror_flag |
3562 | ++ CFLAGS="-g" |
3563 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3564 | ++/* end confdefs.h. */ |
3565 | ++ |
3566 | ++int |
3567 | ++main () |
3568 | ++{ |
3569 | + |
3570 | +-ac_cv_prog_cc_g=no |
3571 | ++ ; |
3572 | ++ return 0; |
3573 | ++} |
3574 | ++_ACEOF |
3575 | ++if ac_fn_c_try_compile "$LINENO"; then : |
3576 | ++ ac_cv_prog_cc_g=yes |
3577 | ++fi |
3578 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3579 | + fi |
3580 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
3581 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3582 | + fi |
3583 | +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 |
3584 | +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 |
3585 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3586 | ++ ac_c_werror_flag=$ac_save_c_werror_flag |
3587 | ++fi |
3588 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 |
3589 | ++$as_echo "$ac_cv_prog_cc_g" >&6; } |
3590 | + if test "$ac_test_CFLAGS" = set; then |
3591 | + CFLAGS=$ac_save_CFLAGS |
3592 | + elif test $ac_cv_prog_cc_g = yes; then |
3593 | +@@ -2298,19 +3193,14 @@ else |
3594 | + CFLAGS= |
3595 | + fi |
3596 | + fi |
3597 | +-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 |
3598 | +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 |
3599 | +-if test "${ac_cv_prog_cc_stdc+set}" = set; then |
3600 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
3601 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
3602 | ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
3603 | ++if test "${ac_cv_prog_cc_c89+set}" = set; then : |
3604 | ++ $as_echo_n "(cached) " >&6 |
3605 | + else |
3606 | +- ac_cv_prog_cc_stdc=no |
3607 | ++ ac_cv_prog_cc_c89=no |
3608 | + ac_save_CC=$CC |
3609 | +-cat >conftest.$ac_ext <<_ACEOF |
3610 | +-#line $LINENO "configure" |
3611 | +-/* confdefs.h. */ |
3612 | +-_ACEOF |
3613 | +-cat confdefs.h >>conftest.$ac_ext |
3614 | +-cat >>conftest.$ac_ext <<_ACEOF |
3615 | ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3616 | + /* end confdefs.h. */ |
3617 | + #include <stdarg.h> |
3618 | + #include <stdio.h> |
3619 | +@@ -2334,6 +3224,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) |
3620 | + va_end (v); |
3621 | + return s; |
3622 | + } |
3623 | ++ |
3624 | ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has |
3625 | ++ function prototypes and stuff, but not '\xHH' hex character constants. |
3626 | ++ These don't provoke an error unfortunately, instead are silently treated |
3627 | ++ as 'x'. The following induces an error, until -std is added to get |
3628 | ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an |
3629 | ++ array size at least. It's necessary to write '\x00'==0 to get something |
3630 | ++ that's true only with -std. */ |
3631 | ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; |
3632 | ++ |
3633 | ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters |
3634 | ++ inside strings and character constants. */ |
3635 | ++#define FOO(x) 'x' |
3636 | ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; |
3637 | ++ |
3638 | + int test (int i, double x); |
3639 | + struct s1 {int (*f) (int a);}; |
3640 | + struct s2 {int (*f) (double a);}; |
3641 | +@@ -2348,168 +3253,37 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; |
3642 | + return 0; |
3643 | + } |
3644 | + _ACEOF |
3645 | +-# Don't try gcc -ansi; that turns off useful extensions and |
3646 | +-# breaks some systems' header files. |
3647 | +-# AIX -qlanglvl=ansi |
3648 | +-# Ultrix and OSF/1 -std1 |
3649 | +-# HP-UX 10.20 and later -Ae |
3650 | +-# HP-UX older versions -Aa -D_HPUX_SOURCE |
3651 | +-# SVR4 -Xc -D__EXTENSIONS__ |
3652 | +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
3653 | ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ |
3654 | ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
3655 | + do |
3656 | + CC="$ac_save_CC $ac_arg" |
3657 | +- rm -f conftest.$ac_objext |
3658 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3659 | +- (eval $ac_compile) 2>&5 |
3660 | +- ac_status=$? |
3661 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3662 | +- (exit $ac_status); } && |
3663 | +- { ac_try='test -s conftest.$ac_objext' |
3664 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3665 | +- (eval $ac_try) 2>&5 |
3666 | +- ac_status=$? |
3667 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3668 | +- (exit $ac_status); }; }; then |
3669 | +- ac_cv_prog_cc_stdc=$ac_arg |
3670 | +-break |
3671 | +-else |
3672 | +- echo "$as_me: failed program was:" >&5 |
3673 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
3674 | +- |
3675 | ++ if ac_fn_c_try_compile "$LINENO"; then : |
3676 | ++ ac_cv_prog_cc_c89=$ac_arg |
3677 | + fi |
3678 | +-rm -f conftest.$ac_objext |
3679 | ++rm -f core conftest.err conftest.$ac_objext |
3680 | ++ test "x$ac_cv_prog_cc_c89" != "xno" && break |
3681 | + done |
3682 | +-rm -f conftest.$ac_ext conftest.$ac_objext |
3683 | ++rm -f conftest.$ac_ext |
3684 | + CC=$ac_save_CC |
3685 | + |
3686 | + fi |
3687 | +- |
3688 | +-case "x$ac_cv_prog_cc_stdc" in |
3689 | +- x|xno) |
3690 | +- echo "$as_me:$LINENO: result: none needed" >&5 |
3691 | +-echo "${ECHO_T}none needed" >&6 ;; |
3692 | ++# AC_CACHE_VAL |
3693 | ++case "x$ac_cv_prog_cc_c89" in |
3694 | ++ x) |
3695 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 |
3696 | ++$as_echo "none needed" >&6; } ;; |
3697 | ++ xno) |
3698 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 |
3699 | ++$as_echo "unsupported" >&6; } ;; |
3700 | + *) |
3701 | +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 |
3702 | +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 |
3703 | +- CC="$CC $ac_cv_prog_cc_stdc" ;; |
3704 | ++ CC="$CC $ac_cv_prog_cc_c89" |
3705 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 |
3706 | ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; |
3707 | + esac |
3708 | ++if test "x$ac_cv_prog_cc_c89" != xno; then : |
3709 | + |
3710 | +-# Some people use a C++ compiler to compile C. Since we use `exit', |
3711 | +-# in C++ we need to declare it. In case someone uses the same compiler |
3712 | +-# for both compiling C and C++ we need to have the C++ compiler decide |
3713 | +-# the declaration of exit, since it's the most demanding environment. |
3714 | +-cat >conftest.$ac_ext <<_ACEOF |
3715 | +-#ifndef __cplusplus |
3716 | +- choke me |
3717 | +-#endif |
3718 | +-_ACEOF |
3719 | +-rm -f conftest.$ac_objext |
3720 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3721 | +- (eval $ac_compile) 2>&5 |
3722 | +- ac_status=$? |
3723 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3724 | +- (exit $ac_status); } && |
3725 | +- { ac_try='test -s conftest.$ac_objext' |
3726 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3727 | +- (eval $ac_try) 2>&5 |
3728 | +- ac_status=$? |
3729 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3730 | +- (exit $ac_status); }; }; then |
3731 | +- for ac_declaration in \ |
3732 | +- ''\ |
3733 | +- '#include <stdlib.h>' \ |
3734 | +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ |
3735 | +- 'extern "C" void std::exit (int); using std::exit;' \ |
3736 | +- 'extern "C" void exit (int) throw ();' \ |
3737 | +- 'extern "C" void exit (int);' \ |
3738 | +- 'void exit (int);' |
3739 | +-do |
3740 | +- cat >conftest.$ac_ext <<_ACEOF |
3741 | +-#line $LINENO "configure" |
3742 | +-/* confdefs.h. */ |
3743 | +-_ACEOF |
3744 | +-cat confdefs.h >>conftest.$ac_ext |
3745 | +-cat >>conftest.$ac_ext <<_ACEOF |
3746 | +-/* end confdefs.h. */ |
3747 | +-#include <stdlib.h> |
3748 | +-$ac_declaration |
3749 | +-int |
3750 | +-main () |
3751 | +-{ |
3752 | +-exit (42); |
3753 | +- ; |
3754 | +- return 0; |
3755 | +-} |
3756 | +-_ACEOF |
3757 | +-rm -f conftest.$ac_objext |
3758 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3759 | +- (eval $ac_compile) 2>&5 |
3760 | +- ac_status=$? |
3761 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3762 | +- (exit $ac_status); } && |
3763 | +- { ac_try='test -s conftest.$ac_objext' |
3764 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3765 | +- (eval $ac_try) 2>&5 |
3766 | +- ac_status=$? |
3767 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3768 | +- (exit $ac_status); }; }; then |
3769 | +- : |
3770 | +-else |
3771 | +- echo "$as_me: failed program was:" >&5 |
3772 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
3773 | +- |
3774 | +-continue |
3775 | +-fi |
3776 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
3777 | +- cat >conftest.$ac_ext <<_ACEOF |
3778 | +-#line $LINENO "configure" |
3779 | +-/* confdefs.h. */ |
3780 | +-_ACEOF |
3781 | +-cat confdefs.h >>conftest.$ac_ext |
3782 | +-cat >>conftest.$ac_ext <<_ACEOF |
3783 | +-/* end confdefs.h. */ |
3784 | +-$ac_declaration |
3785 | +-int |
3786 | +-main () |
3787 | +-{ |
3788 | +-exit (42); |
3789 | +- ; |
3790 | +- return 0; |
3791 | +-} |
3792 | +-_ACEOF |
3793 | +-rm -f conftest.$ac_objext |
3794 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3795 | +- (eval $ac_compile) 2>&5 |
3796 | +- ac_status=$? |
3797 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3798 | +- (exit $ac_status); } && |
3799 | +- { ac_try='test -s conftest.$ac_objext' |
3800 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3801 | +- (eval $ac_try) 2>&5 |
3802 | +- ac_status=$? |
3803 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3804 | +- (exit $ac_status); }; }; then |
3805 | +- break |
3806 | +-else |
3807 | +- echo "$as_me: failed program was:" >&5 |
3808 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
3809 | +- |
3810 | +-fi |
3811 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
3812 | +-done |
3813 | +-rm -f conftest* |
3814 | +-if test -n "$ac_declaration"; then |
3815 | +- echo '#ifdef __cplusplus' >>confdefs.h |
3816 | +- echo $ac_declaration >>confdefs.h |
3817 | +- echo '#endif' >>confdefs.h |
3818 | + fi |
3819 | + |
3820 | +-else |
3821 | +- echo "$as_me: failed program was:" >&5 |
3822 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
3823 | +- |
3824 | +-fi |
3825 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
3826 | + ac_ext=c |
3827 | + ac_cpp='$CPP $CPPFLAGS' |
3828 | + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
3829 | +@@ -2520,182 +3294,42 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
3830 | + |
3831 | + |
3832 | + |
3833 | +-cat >>confdefs.h <<\_ACEOF |
3834 | +-#define NEED_STRLCPY 1 |
3835 | +-_ACEOF |
3836 | +- |
3837 | +- echo "$as_me:$LINENO: checking for strlcpy" >&5 |
3838 | +-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6 |
3839 | +-if test "${ac_cv_func_strlcpy+set}" = set; then |
3840 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
3841 | +-else |
3842 | +- cat >conftest.$ac_ext <<_ACEOF |
3843 | +-#line $LINENO "configure" |
3844 | +-/* confdefs.h. */ |
3845 | +-_ACEOF |
3846 | +-cat confdefs.h >>conftest.$ac_ext |
3847 | +-cat >>conftest.$ac_ext <<_ACEOF |
3848 | +-/* end confdefs.h. */ |
3849 | +-/* System header to define __stub macros and hopefully few prototypes, |
3850 | +- which can conflict with char strlcpy (); below. |
3851 | +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
3852 | +- <limits.h> exists even on freestanding compilers. */ |
3853 | +-#ifdef __STDC__ |
3854 | +-# include <limits.h> |
3855 | +-#else |
3856 | +-# include <assert.h> |
3857 | +-#endif |
3858 | +-/* Override any gcc2 internal prototype to avoid an error. */ |
3859 | +-#ifdef __cplusplus |
3860 | +-extern "C" |
3861 | +-{ |
3862 | +-#endif |
3863 | +-/* We use char because int might match the return type of a gcc2 |
3864 | +- builtin and then its argument prototype would still apply. */ |
3865 | +-char strlcpy (); |
3866 | +-/* The GNU C library defines this for functions which it implements |
3867 | +- to always fail with ENOSYS. Some functions are actually named |
3868 | +- something starting with __ and the normal name is an alias. */ |
3869 | +-#if defined (__stub_strlcpy) || defined (__stub___strlcpy) |
3870 | +-choke me |
3871 | +-#else |
3872 | +-char (*f) () = strlcpy; |
3873 | +-#endif |
3874 | +-#ifdef __cplusplus |
3875 | +-} |
3876 | +-#endif |
3877 | +- |
3878 | +-int |
3879 | +-main () |
3880 | +-{ |
3881 | +-return f != strlcpy; |
3882 | +- ; |
3883 | +- return 0; |
3884 | +-} |
3885 | +-_ACEOF |
3886 | +-rm -f conftest.$ac_objext conftest$ac_exeext |
3887 | +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3888 | +- (eval $ac_link) 2>&5 |
3889 | +- ac_status=$? |
3890 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3891 | +- (exit $ac_status); } && |
3892 | +- { ac_try='test -s conftest$ac_exeext' |
3893 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3894 | +- (eval $ac_try) 2>&5 |
3895 | +- ac_status=$? |
3896 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3897 | +- (exit $ac_status); }; }; then |
3898 | +- ac_cv_func_strlcpy=yes |
3899 | +-else |
3900 | +- echo "$as_me: failed program was:" >&5 |
3901 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
3902 | ++$as_echo "#define NEED_STRLCPY 1" >>confdefs.h |
3903 | + |
3904 | +-ac_cv_func_strlcpy=no |
3905 | +-fi |
3906 | +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
3907 | +-fi |
3908 | +-echo "$as_me:$LINENO: result: $ac_cv_func_strlcpy" >&5 |
3909 | +-echo "${ECHO_T}$ac_cv_func_strlcpy" >&6 |
3910 | +-if test $ac_cv_func_strlcpy = yes; then |
3911 | ++ ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" |
3912 | ++if test "x$ac_cv_func_strlcpy" = x""yes; then : |
3913 | + |
3914 | +-cat >>confdefs.h <<\_ACEOF |
3915 | +-#define HAVE_STRLCPY 1 |
3916 | +-_ACEOF |
3917 | ++$as_echo "#define HAVE_STRLCPY 1" >>confdefs.h |
3918 | + |
3919 | + else |
3920 | +- LIBOBJS="$LIBOBJS strlcpy.$ac_objext" |
3921 | ++ case " $LIBOBJS " in |
3922 | ++ *" strlcpy.$ac_objext "* ) ;; |
3923 | ++ *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext" |
3924 | ++ ;; |
3925 | ++esac |
3926 | + |
3927 | +-fi |
3928 | + |
3929 | ++fi |
3930 | + |
3931 | + |
3932 | + |
3933 | + |
3934 | + |
3935 | +-cat >>confdefs.h <<\_ACEOF |
3936 | +-#define NEED_STRSEP 1 |
3937 | +-_ACEOF |
3938 | +- |
3939 | +- echo "$as_me:$LINENO: checking for strsep" >&5 |
3940 | +-echo $ECHO_N "checking for strsep... $ECHO_C" >&6 |
3941 | +-if test "${ac_cv_func_strsep+set}" = set; then |
3942 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
3943 | +-else |
3944 | +- cat >conftest.$ac_ext <<_ACEOF |
3945 | +-#line $LINENO "configure" |
3946 | +-/* confdefs.h. */ |
3947 | +-_ACEOF |
3948 | +-cat confdefs.h >>conftest.$ac_ext |
3949 | +-cat >>conftest.$ac_ext <<_ACEOF |
3950 | +-/* end confdefs.h. */ |
3951 | +-/* System header to define __stub macros and hopefully few prototypes, |
3952 | +- which can conflict with char strsep (); below. |
3953 | +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
3954 | +- <limits.h> exists even on freestanding compilers. */ |
3955 | +-#ifdef __STDC__ |
3956 | +-# include <limits.h> |
3957 | +-#else |
3958 | +-# include <assert.h> |
3959 | +-#endif |
3960 | +-/* Override any gcc2 internal prototype to avoid an error. */ |
3961 | +-#ifdef __cplusplus |
3962 | +-extern "C" |
3963 | +-{ |
3964 | +-#endif |
3965 | +-/* We use char because int might match the return type of a gcc2 |
3966 | +- builtin and then its argument prototype would still apply. */ |
3967 | +-char strsep (); |
3968 | +-/* The GNU C library defines this for functions which it implements |
3969 | +- to always fail with ENOSYS. Some functions are actually named |
3970 | +- something starting with __ and the normal name is an alias. */ |
3971 | +-#if defined (__stub_strsep) || defined (__stub___strsep) |
3972 | +-choke me |
3973 | +-#else |
3974 | +-char (*f) () = strsep; |
3975 | +-#endif |
3976 | +-#ifdef __cplusplus |
3977 | +-} |
3978 | +-#endif |
3979 | + |
3980 | +-int |
3981 | +-main () |
3982 | +-{ |
3983 | +-return f != strsep; |
3984 | +- ; |
3985 | +- return 0; |
3986 | +-} |
3987 | +-_ACEOF |
3988 | +-rm -f conftest.$ac_objext conftest$ac_exeext |
3989 | +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3990 | +- (eval $ac_link) 2>&5 |
3991 | +- ac_status=$? |
3992 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3993 | +- (exit $ac_status); } && |
3994 | +- { ac_try='test -s conftest$ac_exeext' |
3995 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3996 | +- (eval $ac_try) 2>&5 |
3997 | +- ac_status=$? |
3998 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3999 | +- (exit $ac_status); }; }; then |
4000 | +- ac_cv_func_strsep=yes |
4001 | +-else |
4002 | +- echo "$as_me: failed program was:" >&5 |
4003 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
4004 | ++$as_echo "#define NEED_STRSEP 1" >>confdefs.h |
4005 | + |
4006 | +-ac_cv_func_strsep=no |
4007 | +-fi |
4008 | +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
4009 | +-fi |
4010 | +-echo "$as_me:$LINENO: result: $ac_cv_func_strsep" >&5 |
4011 | +-echo "${ECHO_T}$ac_cv_func_strsep" >&6 |
4012 | +-if test $ac_cv_func_strsep = yes; then |
4013 | ++ ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" |
4014 | ++if test "x$ac_cv_func_strsep" = x""yes; then : |
4015 | + |
4016 | +-cat >>confdefs.h <<\_ACEOF |
4017 | +-#define HAVE_STRSEP 1 |
4018 | +-_ACEOF |
4019 | ++$as_echo "#define HAVE_STRSEP 1" >>confdefs.h |
4020 | + |
4021 | + else |
4022 | +- LIBOBJS="$LIBOBJS strsep.$ac_objext" |
4023 | ++ case " $LIBOBJS " in |
4024 | ++ *" strsep.$ac_objext "* ) ;; |
4025 | ++ *) LIBOBJS="$LIBOBJS strsep.$ac_objext" |
4026 | ++ ;; |
4027 | ++esac |
4028 | ++ |
4029 | + |
4030 | + fi |
4031 | + |
4032 | +@@ -2718,15 +3352,15 @@ fi |
4033 | + LISTHASH_DIR="listhash"; |
4034 | + |
4035 | + |
4036 | +- ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_listhash.h:listhash/listhash.h.in" |
4037 | ++ ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_listhash.h:listhash/listhash.h.in" |
4038 | + |
4039 | +- ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_list.c:listhash/list.c.in" |
4040 | ++ ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_list.c:listhash/list.c.in" |
4041 | + |
4042 | +- ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_hash.c:listhash/hash.c.in" |
4043 | ++ ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_hash.c:listhash/hash.c.in" |
4044 | + |
4045 | +- ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_list_new.3:listhash/list_new.3.in" |
4046 | ++ ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_list_new.3:listhash/list_new.3.in" |
4047 | + |
4048 | +- ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_hash_new.3:listhash/hash_new.3.in" |
4049 | ++ ac_config_files="$ac_config_files listhash/${LISTHASH_PREFIX}_hash_new.3:listhash/hash_new.3.in" |
4050 | + |
4051 | + |
4052 | + |
4053 | +@@ -2746,10 +3380,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4054 | + if test -n "$ac_tool_prefix"; then |
4055 | + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
4056 | + set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
4057 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4058 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4059 | +-if test "${ac_cv_prog_CC+set}" = set; then |
4060 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4061 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4062 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4063 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
4064 | ++ $as_echo_n "(cached) " >&6 |
4065 | + else |
4066 | + if test -n "$CC"; then |
4067 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
4068 | +@@ -2759,35 +3393,37 @@ for as_dir in $PATH |
4069 | + do |
4070 | + IFS=$as_save_IFS |
4071 | + test -z "$as_dir" && as_dir=. |
4072 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4073 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4074 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4075 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4076 | + ac_cv_prog_CC="${ac_tool_prefix}gcc" |
4077 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4078 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4079 | + break 2 |
4080 | + fi |
4081 | + done |
4082 | +-done |
4083 | ++ done |
4084 | ++IFS=$as_save_IFS |
4085 | + |
4086 | + fi |
4087 | + fi |
4088 | + CC=$ac_cv_prog_CC |
4089 | + if test -n "$CC"; then |
4090 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
4091 | +-echo "${ECHO_T}$CC" >&6 |
4092 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
4093 | ++$as_echo "$CC" >&6; } |
4094 | + else |
4095 | +- echo "$as_me:$LINENO: result: no" >&5 |
4096 | +-echo "${ECHO_T}no" >&6 |
4097 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4098 | ++$as_echo "no" >&6; } |
4099 | + fi |
4100 | + |
4101 | ++ |
4102 | + fi |
4103 | + if test -z "$ac_cv_prog_CC"; then |
4104 | + ac_ct_CC=$CC |
4105 | + # Extract the first word of "gcc", so it can be a program name with args. |
4106 | + set dummy gcc; ac_word=$2 |
4107 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4108 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4109 | +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
4110 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4111 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4112 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4113 | ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
4114 | ++ $as_echo_n "(cached) " >&6 |
4115 | + else |
4116 | + if test -n "$ac_ct_CC"; then |
4117 | + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
4118 | +@@ -2797,39 +3433,50 @@ for as_dir in $PATH |
4119 | + do |
4120 | + IFS=$as_save_IFS |
4121 | + test -z "$as_dir" && as_dir=. |
4122 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4123 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4124 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4125 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4126 | + ac_cv_prog_ac_ct_CC="gcc" |
4127 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4128 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4129 | + break 2 |
4130 | + fi |
4131 | + done |
4132 | +-done |
4133 | ++ done |
4134 | ++IFS=$as_save_IFS |
4135 | + |
4136 | + fi |
4137 | + fi |
4138 | + ac_ct_CC=$ac_cv_prog_ac_ct_CC |
4139 | + if test -n "$ac_ct_CC"; then |
4140 | +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
4141 | +-echo "${ECHO_T}$ac_ct_CC" >&6 |
4142 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
4143 | ++$as_echo "$ac_ct_CC" >&6; } |
4144 | + else |
4145 | +- echo "$as_me:$LINENO: result: no" >&5 |
4146 | +-echo "${ECHO_T}no" >&6 |
4147 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4148 | ++$as_echo "no" >&6; } |
4149 | + fi |
4150 | + |
4151 | +- CC=$ac_ct_CC |
4152 | ++ if test "x$ac_ct_CC" = x; then |
4153 | ++ CC="" |
4154 | ++ else |
4155 | ++ case $cross_compiling:$ac_tool_warned in |
4156 | ++yes:) |
4157 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
4158 | ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
4159 | ++ac_tool_warned=yes ;; |
4160 | ++esac |
4161 | ++ CC=$ac_ct_CC |
4162 | ++ fi |
4163 | + else |
4164 | + CC="$ac_cv_prog_CC" |
4165 | + fi |
4166 | + |
4167 | + if test -z "$CC"; then |
4168 | +- if test -n "$ac_tool_prefix"; then |
4169 | +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
4170 | ++ if test -n "$ac_tool_prefix"; then |
4171 | ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
4172 | + set dummy ${ac_tool_prefix}cc; ac_word=$2 |
4173 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4174 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4175 | +-if test "${ac_cv_prog_CC+set}" = set; then |
4176 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4177 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4178 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4179 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
4180 | ++ $as_echo_n "(cached) " >&6 |
4181 | + else |
4182 | + if test -n "$CC"; then |
4183 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
4184 | +@@ -2839,77 +3486,37 @@ for as_dir in $PATH |
4185 | + do |
4186 | + IFS=$as_save_IFS |
4187 | + test -z "$as_dir" && as_dir=. |
4188 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4189 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4190 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4191 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4192 | + ac_cv_prog_CC="${ac_tool_prefix}cc" |
4193 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4194 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4195 | + break 2 |
4196 | + fi |
4197 | + done |
4198 | +-done |
4199 | ++ done |
4200 | ++IFS=$as_save_IFS |
4201 | + |
4202 | + fi |
4203 | + fi |
4204 | + CC=$ac_cv_prog_CC |
4205 | + if test -n "$CC"; then |
4206 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
4207 | +-echo "${ECHO_T}$CC" >&6 |
4208 | +-else |
4209 | +- echo "$as_me:$LINENO: result: no" >&5 |
4210 | +-echo "${ECHO_T}no" >&6 |
4211 | +-fi |
4212 | +- |
4213 | +-fi |
4214 | +-if test -z "$ac_cv_prog_CC"; then |
4215 | +- ac_ct_CC=$CC |
4216 | +- # Extract the first word of "cc", so it can be a program name with args. |
4217 | +-set dummy cc; ac_word=$2 |
4218 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4219 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4220 | +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
4221 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4222 | +-else |
4223 | +- if test -n "$ac_ct_CC"; then |
4224 | +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
4225 | +-else |
4226 | +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4227 | +-for as_dir in $PATH |
4228 | +-do |
4229 | +- IFS=$as_save_IFS |
4230 | +- test -z "$as_dir" && as_dir=. |
4231 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4232 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4233 | +- ac_cv_prog_ac_ct_CC="cc" |
4234 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4235 | +- break 2 |
4236 | +- fi |
4237 | +-done |
4238 | +-done |
4239 | +- |
4240 | +-fi |
4241 | +-fi |
4242 | +-ac_ct_CC=$ac_cv_prog_ac_ct_CC |
4243 | +-if test -n "$ac_ct_CC"; then |
4244 | +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
4245 | +-echo "${ECHO_T}$ac_ct_CC" >&6 |
4246 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
4247 | ++$as_echo "$CC" >&6; } |
4248 | + else |
4249 | +- echo "$as_me:$LINENO: result: no" >&5 |
4250 | +-echo "${ECHO_T}no" >&6 |
4251 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4252 | ++$as_echo "no" >&6; } |
4253 | + fi |
4254 | + |
4255 | +- CC=$ac_ct_CC |
4256 | +-else |
4257 | +- CC="$ac_cv_prog_CC" |
4258 | +-fi |
4259 | + |
4260 | ++ fi |
4261 | + fi |
4262 | + if test -z "$CC"; then |
4263 | + # Extract the first word of "cc", so it can be a program name with args. |
4264 | + set dummy cc; ac_word=$2 |
4265 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4266 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4267 | +-if test "${ac_cv_prog_CC+set}" = set; then |
4268 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4269 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4270 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4271 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
4272 | ++ $as_echo_n "(cached) " >&6 |
4273 | + else |
4274 | + if test -n "$CC"; then |
4275 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
4276 | +@@ -2920,18 +3527,19 @@ for as_dir in $PATH |
4277 | + do |
4278 | + IFS=$as_save_IFS |
4279 | + test -z "$as_dir" && as_dir=. |
4280 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4281 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4282 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4283 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4284 | + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
4285 | + ac_prog_rejected=yes |
4286 | + continue |
4287 | + fi |
4288 | + ac_cv_prog_CC="cc" |
4289 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4290 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4291 | + break 2 |
4292 | + fi |
4293 | + done |
4294 | +-done |
4295 | ++ done |
4296 | ++IFS=$as_save_IFS |
4297 | + |
4298 | + if test $ac_prog_rejected = yes; then |
4299 | + # We found a bogon in the path, so make sure we never use it. |
4300 | +@@ -2949,24 +3557,25 @@ fi |
4301 | + fi |
4302 | + CC=$ac_cv_prog_CC |
4303 | + if test -n "$CC"; then |
4304 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
4305 | +-echo "${ECHO_T}$CC" >&6 |
4306 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
4307 | ++$as_echo "$CC" >&6; } |
4308 | + else |
4309 | +- echo "$as_me:$LINENO: result: no" >&5 |
4310 | +-echo "${ECHO_T}no" >&6 |
4311 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4312 | ++$as_echo "no" >&6; } |
4313 | + fi |
4314 | + |
4315 | ++ |
4316 | + fi |
4317 | + if test -z "$CC"; then |
4318 | + if test -n "$ac_tool_prefix"; then |
4319 | +- for ac_prog in cl |
4320 | ++ for ac_prog in cl.exe |
4321 | + do |
4322 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
4323 | + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
4324 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4325 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4326 | +-if test "${ac_cv_prog_CC+set}" = set; then |
4327 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4328 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4329 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4330 | ++if test "${ac_cv_prog_CC+set}" = set; then : |
4331 | ++ $as_echo_n "(cached) " >&6 |
4332 | + else |
4333 | + if test -n "$CC"; then |
4334 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
4335 | +@@ -2976,39 +3585,41 @@ for as_dir in $PATH |
4336 | + do |
4337 | + IFS=$as_save_IFS |
4338 | + test -z "$as_dir" && as_dir=. |
4339 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4340 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4341 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4342 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4343 | + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
4344 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4345 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4346 | + break 2 |
4347 | + fi |
4348 | + done |
4349 | +-done |
4350 | ++ done |
4351 | ++IFS=$as_save_IFS |
4352 | + |
4353 | + fi |
4354 | + fi |
4355 | + CC=$ac_cv_prog_CC |
4356 | + if test -n "$CC"; then |
4357 | +- echo "$as_me:$LINENO: result: $CC" >&5 |
4358 | +-echo "${ECHO_T}$CC" >&6 |
4359 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
4360 | ++$as_echo "$CC" >&6; } |
4361 | + else |
4362 | +- echo "$as_me:$LINENO: result: no" >&5 |
4363 | +-echo "${ECHO_T}no" >&6 |
4364 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4365 | ++$as_echo "no" >&6; } |
4366 | + fi |
4367 | + |
4368 | ++ |
4369 | + test -n "$CC" && break |
4370 | + done |
4371 | + fi |
4372 | + if test -z "$CC"; then |
4373 | + ac_ct_CC=$CC |
4374 | +- for ac_prog in cl |
4375 | ++ for ac_prog in cl.exe |
4376 | + do |
4377 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
4378 | + set dummy $ac_prog; ac_word=$2 |
4379 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4380 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4381 | +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
4382 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4383 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4384 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4385 | ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
4386 | ++ $as_echo_n "(cached) " >&6 |
4387 | + else |
4388 | + if test -n "$ac_ct_CC"; then |
4389 | + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
4390 | +@@ -3018,72 +3629,83 @@ for as_dir in $PATH |
4391 | + do |
4392 | + IFS=$as_save_IFS |
4393 | + test -z "$as_dir" && as_dir=. |
4394 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4395 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4396 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4397 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4398 | + ac_cv_prog_ac_ct_CC="$ac_prog" |
4399 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4400 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4401 | + break 2 |
4402 | + fi |
4403 | + done |
4404 | +-done |
4405 | ++ done |
4406 | ++IFS=$as_save_IFS |
4407 | + |
4408 | + fi |
4409 | + fi |
4410 | + ac_ct_CC=$ac_cv_prog_ac_ct_CC |
4411 | + if test -n "$ac_ct_CC"; then |
4412 | +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
4413 | +-echo "${ECHO_T}$ac_ct_CC" >&6 |
4414 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
4415 | ++$as_echo "$ac_ct_CC" >&6; } |
4416 | + else |
4417 | +- echo "$as_me:$LINENO: result: no" >&5 |
4418 | +-echo "${ECHO_T}no" >&6 |
4419 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4420 | ++$as_echo "no" >&6; } |
4421 | + fi |
4422 | + |
4423 | ++ |
4424 | + test -n "$ac_ct_CC" && break |
4425 | + done |
4426 | + |
4427 | +- CC=$ac_ct_CC |
4428 | ++ if test "x$ac_ct_CC" = x; then |
4429 | ++ CC="" |
4430 | ++ else |
4431 | ++ case $cross_compiling:$ac_tool_warned in |
4432 | ++yes:) |
4433 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
4434 | ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
4435 | ++ac_tool_warned=yes ;; |
4436 | ++esac |
4437 | ++ CC=$ac_ct_CC |
4438 | ++ fi |
4439 | + fi |
4440 | + |
4441 | + fi |
4442 | + |
4443 | + |
4444 | +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH |
4445 | +-See \`config.log' for more details." >&5 |
4446 | +-echo "$as_me: error: no acceptable C compiler found in \$PATH |
4447 | +-See \`config.log' for more details." >&2;} |
4448 | +- { (exit 1); exit 1; }; } |
4449 | ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4450 | ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4451 | ++as_fn_error "no acceptable C compiler found in \$PATH |
4452 | ++See \`config.log' for more details." "$LINENO" 5; } |
4453 | + |
4454 | + # Provide some information about the compiler. |
4455 | +-echo "$as_me:$LINENO:" \ |
4456 | +- "checking for C compiler version" >&5 |
4457 | +-ac_compiler=`set X $ac_compile; echo $2` |
4458 | +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
4459 | +- (eval $ac_compiler --version </dev/null >&5) 2>&5 |
4460 | +- ac_status=$? |
4461 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4462 | +- (exit $ac_status); } |
4463 | +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 |
4464 | +- (eval $ac_compiler -v </dev/null >&5) 2>&5 |
4465 | +- ac_status=$? |
4466 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4467 | +- (exit $ac_status); } |
4468 | +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 |
4469 | +- (eval $ac_compiler -V </dev/null >&5) 2>&5 |
4470 | ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
4471 | ++set X $ac_compile |
4472 | ++ac_compiler=$2 |
4473 | ++for ac_option in --version -v -V -qversion; do |
4474 | ++ { { ac_try="$ac_compiler $ac_option >&5" |
4475 | ++case "(($ac_try" in |
4476 | ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4477 | ++ *) ac_try_echo=$ac_try;; |
4478 | ++esac |
4479 | ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4480 | ++$as_echo "$ac_try_echo"; } >&5 |
4481 | ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err |
4482 | + ac_status=$? |
4483 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4484 | +- (exit $ac_status); } |
4485 | ++ if test -s conftest.err; then |
4486 | ++ sed '10a\ |
4487 | ++... rest of stderr output deleted ... |
4488 | ++ 10q' conftest.err >conftest.er1 |
4489 | ++ cat conftest.er1 >&5 |
4490 | ++ fi |
4491 | ++ rm -f conftest.er1 conftest.err |
4492 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4493 | ++ test $ac_status = 0; } |
4494 | ++done |
4495 | + |
4496 | +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 |
4497 | +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 |
4498 | +-if test "${ac_cv_c_compiler_gnu+set}" = set; then |
4499 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4500 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
4501 | ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
4502 | ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
4503 | ++ $as_echo_n "(cached) " >&6 |
4504 | + else |
4505 | +- cat >conftest.$ac_ext <<_ACEOF |
4506 | +-#line $LINENO "configure" |
4507 | +-/* confdefs.h. */ |
4508 | +-_ACEOF |
4509 | +-cat confdefs.h >>conftest.$ac_ext |
4510 | +-cat >>conftest.$ac_ext <<_ACEOF |
4511 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4512 | + /* end confdefs.h. */ |
4513 | + |
4514 | + int |
4515 | +@@ -3097,46 +3719,34 @@ main () |
4516 | + return 0; |
4517 | + } |
4518 | + _ACEOF |
4519 | +-rm -f conftest.$ac_objext |
4520 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4521 | +- (eval $ac_compile) 2>&5 |
4522 | +- ac_status=$? |
4523 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4524 | +- (exit $ac_status); } && |
4525 | +- { ac_try='test -s conftest.$ac_objext' |
4526 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4527 | +- (eval $ac_try) 2>&5 |
4528 | +- ac_status=$? |
4529 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4530 | +- (exit $ac_status); }; }; then |
4531 | ++if ac_fn_c_try_compile "$LINENO"; then : |
4532 | + ac_compiler_gnu=yes |
4533 | + else |
4534 | +- echo "$as_me: failed program was:" >&5 |
4535 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
4536 | +- |
4537 | +-ac_compiler_gnu=no |
4538 | ++ ac_compiler_gnu=no |
4539 | + fi |
4540 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
4541 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4542 | + ac_cv_c_compiler_gnu=$ac_compiler_gnu |
4543 | + |
4544 | + fi |
4545 | +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 |
4546 | +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 |
4547 | +-GCC=`test $ac_compiler_gnu = yes && echo yes` |
4548 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 |
4549 | ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } |
4550 | ++if test $ac_compiler_gnu = yes; then |
4551 | ++ GCC=yes |
4552 | ++else |
4553 | ++ GCC= |
4554 | ++fi |
4555 | + ac_test_CFLAGS=${CFLAGS+set} |
4556 | + ac_save_CFLAGS=$CFLAGS |
4557 | +-CFLAGS="-g" |
4558 | +-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
4559 | +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 |
4560 | +-if test "${ac_cv_prog_cc_g+set}" = set; then |
4561 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4562 | +-else |
4563 | +- cat >conftest.$ac_ext <<_ACEOF |
4564 | +-#line $LINENO "configure" |
4565 | +-/* confdefs.h. */ |
4566 | +-_ACEOF |
4567 | +-cat confdefs.h >>conftest.$ac_ext |
4568 | +-cat >>conftest.$ac_ext <<_ACEOF |
4569 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
4570 | ++$as_echo_n "checking whether $CC accepts -g... " >&6; } |
4571 | ++if test "${ac_cv_prog_cc_g+set}" = set; then : |
4572 | ++ $as_echo_n "(cached) " >&6 |
4573 | ++else |
4574 | ++ ac_save_c_werror_flag=$ac_c_werror_flag |
4575 | ++ ac_c_werror_flag=yes |
4576 | ++ ac_cv_prog_cc_g=no |
4577 | ++ CFLAGS="-g" |
4578 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4579 | + /* end confdefs.h. */ |
4580 | + |
4581 | + int |
4582 | +@@ -3147,29 +3757,49 @@ main () |
4583 | + return 0; |
4584 | + } |
4585 | + _ACEOF |
4586 | +-rm -f conftest.$ac_objext |
4587 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4588 | +- (eval $ac_compile) 2>&5 |
4589 | +- ac_status=$? |
4590 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4591 | +- (exit $ac_status); } && |
4592 | +- { ac_try='test -s conftest.$ac_objext' |
4593 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4594 | +- (eval $ac_try) 2>&5 |
4595 | +- ac_status=$? |
4596 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4597 | +- (exit $ac_status); }; }; then |
4598 | ++if ac_fn_c_try_compile "$LINENO"; then : |
4599 | + ac_cv_prog_cc_g=yes |
4600 | + else |
4601 | +- echo "$as_me: failed program was:" >&5 |
4602 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
4603 | ++ CFLAGS="" |
4604 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4605 | ++/* end confdefs.h. */ |
4606 | ++ |
4607 | ++int |
4608 | ++main () |
4609 | ++{ |
4610 | ++ |
4611 | ++ ; |
4612 | ++ return 0; |
4613 | ++} |
4614 | ++_ACEOF |
4615 | ++if ac_fn_c_try_compile "$LINENO"; then : |
4616 | + |
4617 | +-ac_cv_prog_cc_g=no |
4618 | ++else |
4619 | ++ ac_c_werror_flag=$ac_save_c_werror_flag |
4620 | ++ CFLAGS="-g" |
4621 | ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4622 | ++/* end confdefs.h. */ |
4623 | ++ |
4624 | ++int |
4625 | ++main () |
4626 | ++{ |
4627 | ++ |
4628 | ++ ; |
4629 | ++ return 0; |
4630 | ++} |
4631 | ++_ACEOF |
4632 | ++if ac_fn_c_try_compile "$LINENO"; then : |
4633 | ++ ac_cv_prog_cc_g=yes |
4634 | ++fi |
4635 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4636 | + fi |
4637 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
4638 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4639 | + fi |
4640 | +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 |
4641 | +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 |
4642 | ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4643 | ++ ac_c_werror_flag=$ac_save_c_werror_flag |
4644 | ++fi |
4645 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 |
4646 | ++$as_echo "$ac_cv_prog_cc_g" >&6; } |
4647 | + if test "$ac_test_CFLAGS" = set; then |
4648 | + CFLAGS=$ac_save_CFLAGS |
4649 | + elif test $ac_cv_prog_cc_g = yes; then |
4650 | +@@ -3185,19 +3815,14 @@ else |
4651 | + CFLAGS= |
4652 | + fi |
4653 | + fi |
4654 | +-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 |
4655 | +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 |
4656 | +-if test "${ac_cv_prog_cc_stdc+set}" = set; then |
4657 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4658 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
4659 | ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
4660 | ++if test "${ac_cv_prog_cc_c89+set}" = set; then : |
4661 | ++ $as_echo_n "(cached) " >&6 |
4662 | + else |
4663 | +- ac_cv_prog_cc_stdc=no |
4664 | ++ ac_cv_prog_cc_c89=no |
4665 | + ac_save_CC=$CC |
4666 | +-cat >conftest.$ac_ext <<_ACEOF |
4667 | +-#line $LINENO "configure" |
4668 | +-/* confdefs.h. */ |
4669 | +-_ACEOF |
4670 | +-cat confdefs.h >>conftest.$ac_ext |
4671 | +-cat >>conftest.$ac_ext <<_ACEOF |
4672 | ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4673 | + /* end confdefs.h. */ |
4674 | + #include <stdarg.h> |
4675 | + #include <stdio.h> |
4676 | +@@ -3221,6 +3846,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) |
4677 | + va_end (v); |
4678 | + return s; |
4679 | + } |
4680 | ++ |
4681 | ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has |
4682 | ++ function prototypes and stuff, but not '\xHH' hex character constants. |
4683 | ++ These don't provoke an error unfortunately, instead are silently treated |
4684 | ++ as 'x'. The following induces an error, until -std is added to get |
4685 | ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an |
4686 | ++ array size at least. It's necessary to write '\x00'==0 to get something |
4687 | ++ that's true only with -std. */ |
4688 | ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; |
4689 | ++ |
4690 | ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters |
4691 | ++ inside strings and character constants. */ |
4692 | ++#define FOO(x) 'x' |
4693 | ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; |
4694 | ++ |
4695 | + int test (int i, double x); |
4696 | + struct s1 {int (*f) (int a);}; |
4697 | + struct s2 {int (*f) (double a);}; |
4698 | +@@ -3235,168 +3875,37 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; |
4699 | + return 0; |
4700 | + } |
4701 | + _ACEOF |
4702 | +-# Don't try gcc -ansi; that turns off useful extensions and |
4703 | +-# breaks some systems' header files. |
4704 | +-# AIX -qlanglvl=ansi |
4705 | +-# Ultrix and OSF/1 -std1 |
4706 | +-# HP-UX 10.20 and later -Ae |
4707 | +-# HP-UX older versions -Aa -D_HPUX_SOURCE |
4708 | +-# SVR4 -Xc -D__EXTENSIONS__ |
4709 | +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
4710 | ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ |
4711 | ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
4712 | + do |
4713 | + CC="$ac_save_CC $ac_arg" |
4714 | +- rm -f conftest.$ac_objext |
4715 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4716 | +- (eval $ac_compile) 2>&5 |
4717 | +- ac_status=$? |
4718 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4719 | +- (exit $ac_status); } && |
4720 | +- { ac_try='test -s conftest.$ac_objext' |
4721 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4722 | +- (eval $ac_try) 2>&5 |
4723 | +- ac_status=$? |
4724 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4725 | +- (exit $ac_status); }; }; then |
4726 | +- ac_cv_prog_cc_stdc=$ac_arg |
4727 | +-break |
4728 | +-else |
4729 | +- echo "$as_me: failed program was:" >&5 |
4730 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
4731 | +- |
4732 | ++ if ac_fn_c_try_compile "$LINENO"; then : |
4733 | ++ ac_cv_prog_cc_c89=$ac_arg |
4734 | + fi |
4735 | +-rm -f conftest.$ac_objext |
4736 | ++rm -f core conftest.err conftest.$ac_objext |
4737 | ++ test "x$ac_cv_prog_cc_c89" != "xno" && break |
4738 | + done |
4739 | +-rm -f conftest.$ac_ext conftest.$ac_objext |
4740 | ++rm -f conftest.$ac_ext |
4741 | + CC=$ac_save_CC |
4742 | + |
4743 | + fi |
4744 | +- |
4745 | +-case "x$ac_cv_prog_cc_stdc" in |
4746 | +- x|xno) |
4747 | +- echo "$as_me:$LINENO: result: none needed" >&5 |
4748 | +-echo "${ECHO_T}none needed" >&6 ;; |
4749 | ++# AC_CACHE_VAL |
4750 | ++case "x$ac_cv_prog_cc_c89" in |
4751 | ++ x) |
4752 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 |
4753 | ++$as_echo "none needed" >&6; } ;; |
4754 | ++ xno) |
4755 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 |
4756 | ++$as_echo "unsupported" >&6; } ;; |
4757 | + *) |
4758 | +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 |
4759 | +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 |
4760 | +- CC="$CC $ac_cv_prog_cc_stdc" ;; |
4761 | ++ CC="$CC $ac_cv_prog_cc_c89" |
4762 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 |
4763 | ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; |
4764 | + esac |
4765 | +- |
4766 | +-# Some people use a C++ compiler to compile C. Since we use `exit', |
4767 | +-# in C++ we need to declare it. In case someone uses the same compiler |
4768 | +-# for both compiling C and C++ we need to have the C++ compiler decide |
4769 | +-# the declaration of exit, since it's the most demanding environment. |
4770 | +-cat >conftest.$ac_ext <<_ACEOF |
4771 | +-#ifndef __cplusplus |
4772 | +- choke me |
4773 | +-#endif |
4774 | +-_ACEOF |
4775 | +-rm -f conftest.$ac_objext |
4776 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4777 | +- (eval $ac_compile) 2>&5 |
4778 | +- ac_status=$? |
4779 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4780 | +- (exit $ac_status); } && |
4781 | +- { ac_try='test -s conftest.$ac_objext' |
4782 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4783 | +- (eval $ac_try) 2>&5 |
4784 | +- ac_status=$? |
4785 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4786 | +- (exit $ac_status); }; }; then |
4787 | +- for ac_declaration in \ |
4788 | +- ''\ |
4789 | +- '#include <stdlib.h>' \ |
4790 | +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ |
4791 | +- 'extern "C" void std::exit (int); using std::exit;' \ |
4792 | +- 'extern "C" void exit (int) throw ();' \ |
4793 | +- 'extern "C" void exit (int);' \ |
4794 | +- 'void exit (int);' |
4795 | +-do |
4796 | +- cat >conftest.$ac_ext <<_ACEOF |
4797 | +-#line $LINENO "configure" |
4798 | +-/* confdefs.h. */ |
4799 | +-_ACEOF |
4800 | +-cat confdefs.h >>conftest.$ac_ext |
4801 | +-cat >>conftest.$ac_ext <<_ACEOF |
4802 | +-/* end confdefs.h. */ |
4803 | +-#include <stdlib.h> |
4804 | +-$ac_declaration |
4805 | +-int |
4806 | +-main () |
4807 | +-{ |
4808 | +-exit (42); |
4809 | +- ; |
4810 | +- return 0; |
4811 | +-} |
4812 | +-_ACEOF |
4813 | +-rm -f conftest.$ac_objext |
4814 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4815 | +- (eval $ac_compile) 2>&5 |
4816 | +- ac_status=$? |
4817 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4818 | +- (exit $ac_status); } && |
4819 | +- { ac_try='test -s conftest.$ac_objext' |
4820 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4821 | +- (eval $ac_try) 2>&5 |
4822 | +- ac_status=$? |
4823 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4824 | +- (exit $ac_status); }; }; then |
4825 | +- : |
4826 | +-else |
4827 | +- echo "$as_me: failed program was:" >&5 |
4828 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
4829 | +- |
4830 | +-continue |
4831 | +-fi |
4832 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
4833 | +- cat >conftest.$ac_ext <<_ACEOF |
4834 | +-#line $LINENO "configure" |
4835 | +-/* confdefs.h. */ |
4836 | +-_ACEOF |
4837 | +-cat confdefs.h >>conftest.$ac_ext |
4838 | +-cat >>conftest.$ac_ext <<_ACEOF |
4839 | +-/* end confdefs.h. */ |
4840 | +-$ac_declaration |
4841 | +-int |
4842 | +-main () |
4843 | +-{ |
4844 | +-exit (42); |
4845 | +- ; |
4846 | +- return 0; |
4847 | +-} |
4848 | +-_ACEOF |
4849 | +-rm -f conftest.$ac_objext |
4850 | +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4851 | +- (eval $ac_compile) 2>&5 |
4852 | +- ac_status=$? |
4853 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4854 | +- (exit $ac_status); } && |
4855 | +- { ac_try='test -s conftest.$ac_objext' |
4856 | +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4857 | +- (eval $ac_try) 2>&5 |
4858 | +- ac_status=$? |
4859 | +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4860 | +- (exit $ac_status); }; }; then |
4861 | +- break |
4862 | +-else |
4863 | +- echo "$as_me: failed program was:" >&5 |
4864 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
4865 | ++if test "x$ac_cv_prog_cc_c89" != xno; then : |
4866 | + |
4867 | + fi |
4868 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
4869 | +-done |
4870 | +-rm -f conftest* |
4871 | +-if test -n "$ac_declaration"; then |
4872 | +- echo '#ifdef __cplusplus' >>confdefs.h |
4873 | +- echo $ac_declaration >>confdefs.h |
4874 | +- echo '#endif' >>confdefs.h |
4875 | +-fi |
4876 | +- |
4877 | +-else |
4878 | +- echo "$as_me: failed program was:" >&5 |
4879 | +-sed 's/^/| /' conftest.$ac_ext >&5 |
4880 | + |
4881 | +-fi |
4882 | +-rm -f conftest.$ac_objext conftest.$ac_ext |
4883 | + ac_ext=c |
4884 | + ac_cpp='$CPP $CPPFLAGS' |
4885 | + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
4886 | +@@ -3406,10 +3915,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4887 | + if test -n "$ac_tool_prefix"; then |
4888 | + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. |
4889 | + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
4890 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4891 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4892 | +-if test "${ac_cv_prog_RANLIB+set}" = set; then |
4893 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4894 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4895 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4896 | ++if test "${ac_cv_prog_RANLIB+set}" = set; then : |
4897 | ++ $as_echo_n "(cached) " >&6 |
4898 | + else |
4899 | + if test -n "$RANLIB"; then |
4900 | + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. |
4901 | +@@ -3419,35 +3928,37 @@ for as_dir in $PATH |
4902 | + do |
4903 | + IFS=$as_save_IFS |
4904 | + test -z "$as_dir" && as_dir=. |
4905 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4906 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4907 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4908 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4909 | + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
4910 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4911 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4912 | + break 2 |
4913 | + fi |
4914 | + done |
4915 | +-done |
4916 | ++ done |
4917 | ++IFS=$as_save_IFS |
4918 | + |
4919 | + fi |
4920 | + fi |
4921 | + RANLIB=$ac_cv_prog_RANLIB |
4922 | + if test -n "$RANLIB"; then |
4923 | +- echo "$as_me:$LINENO: result: $RANLIB" >&5 |
4924 | +-echo "${ECHO_T}$RANLIB" >&6 |
4925 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 |
4926 | ++$as_echo "$RANLIB" >&6; } |
4927 | + else |
4928 | +- echo "$as_me:$LINENO: result: no" >&5 |
4929 | +-echo "${ECHO_T}no" >&6 |
4930 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4931 | ++$as_echo "no" >&6; } |
4932 | + fi |
4933 | + |
4934 | ++ |
4935 | + fi |
4936 | + if test -z "$ac_cv_prog_RANLIB"; then |
4937 | + ac_ct_RANLIB=$RANLIB |
4938 | + # Extract the first word of "ranlib", so it can be a program name with args. |
4939 | + set dummy ranlib; ac_word=$2 |
4940 | +-echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4941 | +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4942 | +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then |
4943 | +- echo $ECHO_N "(cached) $ECHO_C" >&6 |
4944 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4945 | ++$as_echo_n "checking for $ac_word... " >&6; } |
4946 | ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
4947 | ++ $as_echo_n "(cached) " >&6 |
4948 | + else |
4949 | + if test -n "$ac_ct_RANLIB"; then |
4950 | + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. |
4951 | +@@ -3457,28 +3968,38 @@ for as_dir in $PATH |
4952 | + do |
4953 | + IFS=$as_save_IFS |
4954 | + test -z "$as_dir" && as_dir=. |
4955 | +- for ac_exec_ext in '' $ac_executable_extensions; do |
4956 | +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4957 | ++ for ac_exec_ext in '' $ac_executable_extensions; do |
4958 | ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4959 | + ac_cv_prog_ac_ct_RANLIB="ranlib" |
4960 | +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4961 | ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4962 | + break 2 |
4963 | + fi |
4964 | + done |
4965 | +-done |
4966 | ++ done |
4967 | ++IFS=$as_save_IFS |
4968 | + |
4969 | +- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" |
4970 | + fi |
4971 | + fi |
4972 | + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB |
4973 | + if test -n "$ac_ct_RANLIB"; then |
4974 | +- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 |
4975 | +-echo "${ECHO_T}$ac_ct_RANLIB" >&6 |
4976 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 |
4977 | ++$as_echo "$ac_ct_RANLIB" >&6; } |
4978 | + else |
4979 | +- echo "$as_me:$LINENO: result: no" >&5 |
4980 | +-echo "${ECHO_T}no" >&6 |
4981 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4982 | ++$as_echo "no" >&6; } |
4983 | + fi |
4984 | + |
4985 | +- RANLIB=$ac_ct_RANLIB |
4986 | ++ if test "x$ac_ct_RANLIB" = x; then |
4987 | ++ RANLIB=":" |
4988 | ++ else |
4989 | ++ case $cross_compiling:$ac_tool_warned in |
4990 | ++yes:) |
4991 | ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
4992 | ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
4993 | ++ac_tool_warned=yes ;; |
4994 | ++esac |
4995 | ++ RANLIB=$ac_ct_RANLIB |
4996 | ++ fi |
4997 | + else |
4998 | + RANLIB="$ac_cv_prog_RANLIB" |
4999 | + fi |
5000 | +@@ -3494,22 +4015,25 @@ fi |
The diff has been truncated for viewing.