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