Ubuntu

Merge lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2 into lp:ubuntu/oneiric/zabbix

Proposed by Nigel Jones on 2011-05-21
Status: Merged
Merged at revision: 36
Proposed branch: lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2
Merge into: lp:ubuntu/oneiric/zabbix
Diff against target: 178200 lines (+55095/-60844) 682 files modified
To merge this branch: bzr merge lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2
Reviewer Review Type Date Requested Status
Daniel Holbach Approve on 2011-06-09
Micah Gersten 2011-05-21 Pending
Ubuntu branches 2011-05-21 Pending
Review via email: mp+61855@code.launchpad.net

This proposal supersedes a proposal from 2011-05-03.

Commit Message

* ldap-linker-lp722300.patch: Fix FTBFS issues due to incorrect placement of
  linker arguments. (LP: #722300)
* Merge from debian unstable (LP: #721707). Remaining changes:
  - update build depend for mysql-transition
* New upstream release
* Ignore release candidates via 'uscan' in debian/watch
  (closes: #599921)
* Added --with-ssh2 for SSH2 support during ./configure
  (closes: #609744)
* Fixed typo in debian/rules to properly build with libcurl support
  (closes: #613322)
* New upstream release
* Packaging repository moved to git.debian.org
[ Michael Ablassmeier ]
* zabbix-proxy-pgsql and -mysql: Fix package description (Closes: #586961)
* debian/po/da.po: added (Closes: #585485)

Description of the Change

Proposed Debian/Ubuntu merge, plus FTBFS fix that I've got from Gentoo's BTS & Upstream's BTS.

FTBFS patch will be sent to Debian shortly.

To post a comment you must log in.
Micah Gersten (micahg) wrote : Posted in a previous version of this proposal

Thank you for contributing to Ubuntu Development. Could you please rebase this merge against 1.8.5-1 from Debian unstable? Also, could you please make one change per commit to make the review easier (i.e. merge from Debian in the first, then each change you make on top in separate commits)?

review: Needs Fixing
Nigel Jones (dev-nigelj) wrote :

Hi Micah, thanks for the previous comment, I've resubmitted it as a new branch (I hope I've done it right!) taking into account your advice.

Before committing I would appreciate it if you could check to make sure I've done the tagging correct.

Daniel Holbach (dholbach) wrote :

Good work!

I just took the liberty of adding the number of the Debian linker issue to debian/changelog as well.

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes: