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