projects / openwrt / svn-archive / archive.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
Prevent HAL from being used (#1032)
[openwrt/svn-archive/archive.git] / libs / libgphoto2 / patches / 030-no_hal.patch
1 diff -urN -x autom4te.cache libgphoto2-2.2.1/libgphoto2_port/config.guess libgphoto2-2.2.1.new/libgphoto2_port/config.guess
2 --- libgphoto2-2.2.1/libgphoto2_port/config.guess 2005-10-25 08:14:37.000000000 +0200
3 +++ libgphoto2-2.2.1.new/libgphoto2_port/config.guess 2006-10-22 20:18:24.000000000 +0200
4 @@ -1,9 +1,10 @@
5 #! /bin/sh
6 # Attempt to guess a canonical system name.
7 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
8 -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
9 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
10 +# Inc.
11
12 -timestamp='2005-08-03'
13 +timestamp='2006-07-02'
14
15 # This file is free software; you can redistribute it and/or modify it
16 # under the terms of the GNU General Public License as published by
17 @@ -106,7 +107,7 @@
18 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
19 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
20 : ${TMPDIR=/tmp} ;
21 - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
22 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
23 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
24 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
25 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
26 @@ -138,6 +139,23 @@
27 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
28 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
29
30 +if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
31 + eval $set_cc_for_build
32 + cat << EOF > $dummy.c
33 + #include <features.h>
34 + #ifdef __UCLIBC__
35 + # ifdef __UCLIBC_CONFIG_VERSION__
36 + LIBC=uclibc __UCLIBC_CONFIG_VERSION__
37 + # else
38 + LIBC=uclibc
39 + # endif
40 + #else
41 + LIBC=gnu
42 + #endif
43 +EOF
44 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
45 +fi
46 +
47 # Note: order is significant - the case branches are not exclusive.
48
49 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
50 @@ -206,8 +224,11 @@
51 *:ekkoBSD:*:*)
52 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
53 exit ;;
54 + *:SolidBSD:*:*)
55 + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
56 + exit ;;
57 macppc:MirBSD:*:*)
58 - echo powerppc-unknown-mirbsd${UNAME_RELEASE}
59 + echo powerpc-unknown-mirbsd${UNAME_RELEASE}
60 exit ;;
61 *:MirBSD:*:*)
62 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
63 @@ -764,7 +785,14 @@
64 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
65 exit ;;
66 *:FreeBSD:*:*)
67 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
68 + case ${UNAME_MACHINE} in
69 + pc98)
70 + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
71 + amd64)
72 + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
73 + *)
74 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
75 + esac
76 exit ;;
77 i*:CYGWIN*:*)
78 echo ${UNAME_MACHINE}-pc-cygwin
79 @@ -779,8 +807,11 @@
80 i*:PW*:*)
81 echo ${UNAME_MACHINE}-pc-pw32
82 exit ;;
83 - x86:Interix*:[34]*)
84 - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
85 + x86:Interix*:[3456]*)
86 + echo i586-pc-interix${UNAME_RELEASE}
87 + exit ;;
88 + EM64T:Interix*:[3456]*)
89 + echo x86_64-unknown-interix${UNAME_RELEASE}
90 exit ;;
91 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
92 echo i${UNAME_MACHINE}-pc-mks
93 @@ -815,25 +846,28 @@
94 echo ${UNAME_MACHINE}-pc-minix
95 exit ;;
96 arm*:Linux:*:*)
97 - echo ${UNAME_MACHINE}-unknown-linux-gnu
98 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
99 + exit ;;
100 + avr32*:Linux:*:*)
101 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
102 exit ;;
103 cris:Linux:*:*)
104 - echo cris-axis-linux-gnu
105 + echo cris-axis-linux-${LIBC}
106 exit ;;
107 crisv32:Linux:*:*)
108 - echo crisv32-axis-linux-gnu
109 + echo crisv32-axis-linux-${LIBC}
110 exit ;;
111 frv:Linux:*:*)
112 - echo frv-unknown-linux-gnu
113 + echo frv-unknown-linux-${LIBC}
114 exit ;;
115 ia64:Linux:*:*)
116 - echo ${UNAME_MACHINE}-unknown-linux-gnu
117 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
118 exit ;;
119 m32r*:Linux:*:*)
120 - echo ${UNAME_MACHINE}-unknown-linux-gnu
121 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
122 exit ;;
123 m68*:Linux:*:*)
124 - echo ${UNAME_MACHINE}-unknown-linux-gnu
125 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
126 exit ;;
127 mips:Linux:*:*)
128 eval $set_cc_for_build
129 @@ -851,8 +885,12 @@
130 #endif
131 #endif
132 EOF
133 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
134 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
135 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
136 + /^CPU/{
137 + s: ::g
138 + p
139 + }'`"
140 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
141 ;;
142 mips64:Linux:*:*)
143 eval $set_cc_for_build
144 @@ -870,17 +908,21 @@
145 #endif
146 #endif
147 EOF
148 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
149 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
150 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
151 + /^CPU/{
152 + s: ::g
153 + p
154 + }'`"
155 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
156 ;;
157 or32:Linux:*:*)
158 - echo or32-unknown-linux-gnu
159 + echo or32-unknown-linux-${LIBC}
160 exit ;;
161 ppc:Linux:*:*)
162 - echo powerpc-unknown-linux-gnu
163 + echo powerpc-unknown-linux-${LIBC}
164 exit ;;
165 ppc64:Linux:*:*)
166 - echo powerpc64-unknown-linux-gnu
167 + echo powerpc64-unknown-linux-${LIBC}
168 exit ;;
169 alpha:Linux:*:*)
170 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
171 @@ -893,34 +935,37 @@
172 EV68*) UNAME_MACHINE=alphaev68 ;;
173 esac
174 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
175 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
176 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
177 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
178 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
179 exit ;;
180 parisc:Linux:*:* | hppa:Linux:*:*)
181 # Look for CPU level
182 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
183 - PA7*) echo hppa1.1-unknown-linux-gnu ;;
184 - PA8*) echo hppa2.0-unknown-linux-gnu ;;
185 - *) echo hppa-unknown-linux-gnu ;;
186 + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
187 + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
188 + *) echo hppa-unknown-linux-${LIBC} ;;
189 esac
190 exit ;;
191 parisc64:Linux:*:* | hppa64:Linux:*:*)
192 - echo hppa64-unknown-linux-gnu
193 + echo hppa64-unknown-linux-${LIBC}
194 exit ;;
195 s390:Linux:*:* | s390x:Linux:*:*)
196 echo ${UNAME_MACHINE}-ibm-linux
197 exit ;;
198 sh64*:Linux:*:*)
199 - echo ${UNAME_MACHINE}-unknown-linux-gnu
200 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
201 exit ;;
202 sh*:Linux:*:*)
203 - echo ${UNAME_MACHINE}-unknown-linux-gnu
204 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
205 exit ;;
206 sparc:Linux:*:* | sparc64:Linux:*:*)
207 - echo ${UNAME_MACHINE}-unknown-linux-gnu
208 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
209 + exit ;;
210 + vax:Linux:*:*)
211 + echo ${UNAME_MACHINE}-dec-linux-${LIBC}
212 exit ;;
213 x86_64:Linux:*:*)
214 - echo x86_64-unknown-linux-gnu
215 + echo x86_64-unknown-linux-${LIBC}
216 exit ;;
217 i*86:Linux:*:*)
218 # The BFD linker knows what the default object file format is, so
219 @@ -935,20 +980,22 @@
220 p'`
221 case "$ld_supported_targets" in
222 elf32-i386)
223 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
224 + TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
225 ;;
226 a.out-i386-linux)
227 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
228 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
229 exit ;;
230 coff-i386)
231 - echo "${UNAME_MACHINE}-pc-linux-gnucoff"
232 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
233 exit ;;
234 "")
235 # Either a pre-BFD a.out linker (linux-gnuoldld) or
236 # one that does not give us useful --help.
237 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
238 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
239 exit ;;
240 esac
241 + # This should get integrated into the C code below, but now we hack
242 + if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
243 # Determine whether the default compiler is a.out or elf
244 eval $set_cc_for_build
245 sed 's/^ //' << EOF >$dummy.c
246 @@ -964,7 +1011,7 @@
247 LIBC=gnulibc1
248 # endif
249 #else
250 - #ifdef __INTEL_COMPILER
251 + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
252 LIBC=gnu
253 #else
254 LIBC=gnuaout
255 @@ -974,7 +1021,11 @@
256 LIBC=dietlibc
257 #endif
258 EOF
259 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
260 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
261 + /^LIBC/{
262 + s: ::g
263 + p
264 + }'`"
265 test x"${LIBC}" != x && {
266 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
267 exit
268 @@ -1185,7 +1236,6 @@
269 *:Darwin:*:*)
270 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
271 case $UNAME_PROCESSOR in
272 - *86) UNAME_PROCESSOR=i686 ;;
273 unknown) UNAME_PROCESSOR=powerpc ;;
274 esac
275 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
276 @@ -1264,6 +1314,9 @@
277 i*86:skyos:*:*)
278 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
279 exit ;;
280 + i*86:rdos:*:*)
281 + echo ${UNAME_MACHINE}-pc-rdos
282 + exit ;;
283 esac
284
285 #echo '(No uname command or uname output not recognized.)' 1>&2
286 diff -urN -x autom4te.cache libgphoto2-2.2.1/libgphoto2_port/config.sub libgphoto2-2.2.1.new/libgphoto2_port/config.sub
287 --- libgphoto2-2.2.1/libgphoto2_port/config.sub 2005-10-25 08:14:37.000000000 +0200
288 +++ libgphoto2-2.2.1.new/libgphoto2_port/config.sub 2006-10-22 20:18:24.000000000 +0200
289 @@ -1,9 +1,10 @@
290 #! /bin/sh
291 # Configuration validation subroutine script.
292 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
293 -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
294 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
295 +# Inc.
296
297 -timestamp='2005-07-08'
298 +timestamp='2006-07-02'
299
300 # This file is (in principle) common to ALL GNU software.
301 # The presence of a machine in this file suggests that SOME GNU software
302 @@ -119,8 +120,9 @@
303 # Here we must recognize all the valid KERNEL-OS combinations.
304 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
305 case $maybe_os in
306 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
307 - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
308 + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
309 + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
310 + storm-chaos* | os2-emx* | rtmk-nova*)
311 os=-$maybe_os
312 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
313 ;;
314 @@ -171,6 +173,10 @@
315 -hiux*)
316 os=-hiuxwe2
317 ;;
318 + -sco6)
319 + os=-sco5v6
320 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
321 + ;;
322 -sco5)
323 os=-sco3.2v5
324 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
325 @@ -187,6 +193,10 @@
326 # Don't forget version if it is 3.2v4 or newer.
327 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
328 ;;
329 + -sco5v6*)
330 + # Don't forget version if it is 3.2v4 or newer.
331 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
332 + ;;
333 -sco*)
334 os=-sco3.2v2
335 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
336 @@ -231,15 +241,16 @@
337 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
338 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
339 | am33_2.0 \
340 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
341 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
342 | bfin \
343 | c4x | clipper \
344 - | d10v | d30v | dlx | dsp16xx \
345 + | d10v | d30v | dlx | dsp16xx | dvp \
346 | fr30 | frv \
347 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
348 | i370 | i860 | i960 | ia64 \
349 | ip2k | iq2000 \
350 - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
351 + | m32c | m32r | m32rle | m68000 | m68k | m88k \
352 + | maxq | mb | microblaze | mcore \
353 | mips | mipsbe | mipseb | mipsel | mipsle \
354 | mips16 \
355 | mips64 | mips64el \
356 @@ -257,18 +268,19 @@
357 | mipsisa64sr71k | mipsisa64sr71kel \
358 | mipstx39 | mipstx39el \
359 | mn10200 | mn10300 \
360 - | ms1 \
361 + | mt \
362 | msp430 \
363 + | nios | nios2 \
364 | ns16k | ns32k \
365 | or32 \
366 | pdp10 | pdp11 | pj | pjl \
367 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
368 | pyramid \
369 - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
370 + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
371 | sh64 | sh64le \
372 - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
373 - | sparcv8 | sparcv9 | sparcv9b \
374 - | strongarm \
375 + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
376 + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
377 + | spu | strongarm \
378 | tahoe | thumb | tic4x | tic80 | tron \
379 | v850 | v850e \
380 | we32k \
381 @@ -276,9 +288,6 @@
382 | z8k)
383 basic_machine=$basic_machine-unknown
384 ;;
385 - m32c)
386 - basic_machine=$basic_machine-unknown
387 - ;;
388 m6811 | m68hc11 | m6812 | m68hc12)
389 # Motorola 68HC11/12.
390 basic_machine=$basic_machine-unknown
391 @@ -286,6 +295,9 @@
392 ;;
393 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
394 ;;
395 + ms1)
396 + basic_machine=mt-unknown
397 + ;;
398
399 # We use `pc' rather than `unknown'
400 # because (1) that's what they normally are, and
401 @@ -305,7 +317,7 @@
402 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
403 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
404 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
405 - | avr-* \
406 + | avr-* | avr32-* \
407 | bfin-* | bs2000-* \
408 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
409 | clipper-* | craynv-* | cydra-* \
410 @@ -316,7 +328,7 @@
411 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
412 | i*86-* | i860-* | i960-* | ia64-* \
413 | ip2k-* | iq2000-* \
414 - | m32r-* | m32rle-* \
415 + | m32c-* | m32r-* | m32rle-* \
416 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
417 | m88110-* | m88k-* | maxq-* | mcore-* \
418 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
419 @@ -336,19 +348,20 @@
420 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
421 | mipstx39-* | mipstx39el-* \
422 | mmix-* \
423 - | ms1-* \
424 + | mt-* \
425 | msp430-* \
426 + | nios-* | nios2-* \
427 | none-* | np1-* | ns16k-* | ns32k-* \
428 | orion-* \
429 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
430 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
431 | pyramid-* \
432 | romp-* | rs6000-* \
433 - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
434 + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
435 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
436 - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
437 + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
438 | sparclite-* \
439 - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
440 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
441 | tahoe-* | thumb-* \
442 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
443 | tron-* \
444 @@ -359,8 +372,6 @@
445 | ymp-* \
446 | z8k-*)
447 ;;
448 - m32c-*)
449 - ;;
450 # Recognize the various machine names and aliases which stand
451 # for a CPU type and a company and sometimes even an OS.
452 386bsd)
453 @@ -678,6 +689,24 @@
454 basic_machine=m68k-atari
455 os=-mint
456 ;;
457 + mipsEE* | ee | ps2)
458 + basic_machine=mips64r5900el-scei
459 + case $os in
460 + -linux*)
461 + ;;
462 + *)
463 + os=-elf
464 + ;;
465 + esac
466 + ;;
467 + iop)
468 + basic_machine=mipsel-scei
469 + os=-irx
470 + ;;
471 + dvp)
472 + basic_machine=dvp-scei
473 + os=-elf
474 + ;;
475 mips3*-*)
476 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
477 ;;
478 @@ -696,6 +725,9 @@
479 basic_machine=i386-pc
480 os=-msdos
481 ;;
482 + ms1-*)
483 + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
484 + ;;
485 mvs)
486 basic_machine=i370-ibm
487 os=-mvs
488 @@ -803,6 +835,12 @@
489 pc532 | pc532-*)
490 basic_machine=ns32k-pc532
491 ;;
492 + pc98)
493 + basic_machine=i386-pc
494 + ;;
495 + pc98-*)
496 + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
497 + ;;
498 pentium | p5 | k5 | k6 | nexgen | viac3)
499 basic_machine=i586-pc
500 ;;
501 @@ -859,6 +897,10 @@
502 basic_machine=i586-unknown
503 os=-pw32
504 ;;
505 + rdos)
506 + basic_machine=i386-pc
507 + os=-rdos
508 + ;;
509 rom68k)
510 basic_machine=m68k-rom68k
511 os=-coff
512 @@ -1101,7 +1143,7 @@
513 sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
514 basic_machine=sh-unknown
515 ;;
516 - sparc | sparcv8 | sparcv9 | sparcv9b)
517 + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
518 basic_machine=sparc-sun
519 ;;
520 cydra)
521 @@ -1174,21 +1216,23 @@
522 | -aos* \
523 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
524 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
525 - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
526 + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
527 + | -openbsd* | -solidbsd* \
528 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
529 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
530 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
531 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
532 | -chorusos* | -chorusrdb* \
533 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
534 - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
535 + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
536 + | -uxpv* | -beos* | -mpeix* | -udk* \
537 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
538 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
539 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
540 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
541 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
542 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
543 - | -skyos* | -haiku*)
544 + | -skyos* | -haiku* | -rdos* | -toppers* | -irx*)
545 # Remember, each alternative MUST END IN *, to match a version number.
546 ;;
547 -qnx*)
548 @@ -1340,6 +1384,9 @@
549 # system, and we'll never get to this point.
550
551 case $basic_machine in
552 + spu-*)
553 + os=-elf
554 + ;;
555 *-acorn)
556 os=-riscix1.2
557 ;;
558 @@ -1349,9 +1396,9 @@
559 arm*-semi)
560 os=-aout
561 ;;
562 - c4x-* | tic4x-*)
563 - os=-coff
564 - ;;
565 + c4x-* | tic4x-*)
566 + os=-coff
567 + ;;
568 # This must come before the *-dec entry.
569 pdp10-*)
570 os=-tops20
571 diff -urN -x autom4te.cache libgphoto2-2.2.1/libgphoto2_port/configure libgphoto2-2.2.1.new/libgphoto2_port/configure
572 --- libgphoto2-2.2.1/libgphoto2_port/configure 2006-06-19 21:16:52.000000000 +0200
573 +++ libgphoto2-2.2.1.new/libgphoto2_port/configure 2006-12-10 13:08:41.000000000 +0100
574 @@ -1,27 +1,56 @@
575 #! /bin/sh
576 # Guess values for system-dependent variables and create Makefiles.
577 -# Generated by GNU Autoconf 2.59 for libgphoto2_port 0.6.1.
578 +# Generated by GNU Autoconf 2.61 for libgphoto2_port 0.6.1.
579 #
580 # Report bugs to <gphoto-devel@lists.sourceforge.net>.
581 #
582 -# Copyright (C) 2003 Free Software Foundation, Inc.
583 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
584 +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
585 # This configure script is free software; the Free Software Foundation
586 # gives unlimited permission to copy, distribute and modify it.
587 ## --------------------- ##
588 ## M4sh Initialization. ##
589 ## --------------------- ##
590
591 -# Be Bourne compatible
592 +# Be more Bourne compatible
593 +DUALCASE=1; export DUALCASE # for MKS sh
594 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
595 emulate sh
596 NULLCMD=:
597 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
598 # is contrary to our usage. Disable this feature.
599 alias -g '${1+"$@"}'='"$@"'
600 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
601 - set -o posix
602 + setopt NO_GLOB_SUBST
603 +else
604 + case `(set -o) 2>/dev/null` in
605 + *posix*) set -o posix ;;
606 +esac
607 +
608 +fi
609 +
610 +
611 +
612 +
613 +# PATH needs CR
614 +# Avoid depending upon Character Ranges.
615 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
616 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
617 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
618 +as_cr_digits='0123456789'
619 +as_cr_alnum=$as_cr_Letters$as_cr_digits
620 +
621 +# The user is always right.
622 +if test "${PATH_SEPARATOR+set}" != set; then
623 + echo "#! /bin/sh" >conf$$.sh
624 + echo "exit 0" >>conf$$.sh
625 + chmod +x conf$$.sh
626 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
627 + PATH_SEPARATOR=';'
628 + else
629 + PATH_SEPARATOR=:
630 + fi
631 + rm -f conf$$.sh
632 fi
633 -DUALCASE=1; export DUALCASE # for MKS sh
634
635 # Support unset when possible.
636 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
637 @@ -31,8 +60,43 @@
638 fi
639
640
641 +# IFS
642 +# We need space, tab and new line, in precisely that order. Quoting is
643 +# there to prevent editors from complaining about space-tab.
644 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
645 +# splitting by setting IFS to empty value.)
646 +as_nl='
647 +'
648 +IFS=" "" $as_nl"
649 +
650 +# Find who we are. Look in the path if we contain no directory separator.
651 +case $0 in
652 + *[\\/]* ) as_myself=$0 ;;
653 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
654 +for as_dir in $PATH
655 +do
656 + IFS=$as_save_IFS
657 + test -z "$as_dir" && as_dir=.
658 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
659 +done
660 +IFS=$as_save_IFS
661 +
662 + ;;
663 +esac
664 +# We did not find ourselves, most probably we were run as `sh COMMAND'
665 +# in which case we are not to be found in the path.
666 +if test "x$as_myself" = x; then
667 + as_myself=$0
668 +fi
669 +if test ! -f "$as_myself"; then
670 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
671 + { (exit 1); exit 1; }
672 +fi
673 +
674 # Work around bugs in pre-3.0 UWIN ksh.
675 -$as_unset ENV MAIL MAILPATH
676 +for as_var in ENV MAIL MAILPATH
677 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
678 +done
679 PS1='$ '
680 PS2='> '
681 PS4='+ '
682 @@ -46,18 +110,19 @@
683 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
684 eval $as_var=C; export $as_var
685 else
686 - $as_unset $as_var
687 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
688 fi
689 done
690
691 # Required to use basename.
692 -if expr a : '\(a\)' >/dev/null 2>&1; then
693 +if expr a : '\(a\)' >/dev/null 2>&1 &&
694 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
695 as_expr=expr
696 else
697 as_expr=false
698 fi
699
700 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
701 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
702 as_basename=basename
703 else
704 as_basename=false
705 @@ -65,157 +130,388 @@
706
707
708 # Name of the executable.
709 -as_me=`$as_basename "$0" ||
710 +as_me=`$as_basename -- "$0" ||
711 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
712 X"$0" : 'X\(//\)$' \| \
713 - X"$0" : 'X\(/\)$' \| \
714 - . : '\(.\)' 2>/dev/null ||
715 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
716 echo X/"$0" |
717 - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
718 - /^X\/\(\/\/\)$/{ s//\1/; q; }
719 - /^X\/\(\/\).*/{ s//\1/; q; }
720 - s/.*/./; q'`
721 + sed '/^.*\/\([^/][^/]*\)\/*$/{
722 + s//\1/
723 + q
724 + }
725 + /^X\/\(\/\/\)$/{
726 + s//\1/
727 + q
728 + }
729 + /^X\/\(\/\).*/{
730 + s//\1/
731 + q
732 + }
733 + s/.*/./; q'`
734
735 +# CDPATH.
736 +$as_unset CDPATH
737
738 -# PATH needs CR, and LINENO needs CR and PATH.
739 -# Avoid depending upon Character Ranges.
740 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
741 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
742 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
743 -as_cr_digits='0123456789'
744 -as_cr_alnum=$as_cr_Letters$as_cr_digits
745
746 -# The user is always right.
747 -if test "${PATH_SEPARATOR+set}" != set; then
748 - echo "#! /bin/sh" >conf$$.sh
749 - echo "exit 0" >>conf$$.sh
750 - chmod +x conf$$.sh
751 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
752 - PATH_SEPARATOR=';'
753 - else
754 - PATH_SEPARATOR=:
755 - fi
756 - rm -f conf$$.sh
757 +if test "x$CONFIG_SHELL" = x; then
758 + if (eval ":") 2>/dev/null; then
759 + as_have_required=yes
760 +else
761 + as_have_required=no
762 fi
763
764 + if test $as_have_required = yes && (eval ":
765 +(as_func_return () {
766 + (exit \$1)
767 +}
768 +as_func_success () {
769 + as_func_return 0
770 +}
771 +as_func_failure () {
772 + as_func_return 1
773 +}
774 +as_func_ret_success () {
775 + return 0
776 +}
777 +as_func_ret_failure () {
778 + return 1
779 +}
780
781 - as_lineno_1=$LINENO
782 - as_lineno_2=$LINENO
783 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
784 - test "x$as_lineno_1" != "x$as_lineno_2" &&
785 - test "x$as_lineno_3" = "x$as_lineno_2" || {
786 - # Find who we are. Look in the path if we contain no path at all
787 - # relative or not.
788 - case $0 in
789 - *[\\/]* ) as_myself=$0 ;;
790 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
791 -for as_dir in $PATH
792 -do
793 - IFS=$as_save_IFS
794 - test -z "$as_dir" && as_dir=.
795 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
796 -done
797 +exitcode=0
798 +if as_func_success; then
799 + :
800 +else
801 + exitcode=1
802 + echo as_func_success failed.
803 +fi
804
805 - ;;
806 - esac
807 - # We did not find ourselves, most probably we were run as `sh COMMAND'
808 - # in which case we are not to be found in the path.
809 - if test "x$as_myself" = x; then
810 - as_myself=$0
811 - fi
812 - if test ! -f "$as_myself"; then
813 - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
814 - { (exit 1); exit 1; }; }
815 - fi
816 - case $CONFIG_SHELL in
817 - '')
818 +if as_func_failure; then
819 + exitcode=1
820 + echo as_func_failure succeeded.
821 +fi
822 +
823 +if as_func_ret_success; then
824 + :
825 +else
826 + exitcode=1
827 + echo as_func_ret_success failed.
828 +fi
829 +
830 +if as_func_ret_failure; then
831 + exitcode=1
832 + echo as_func_ret_failure succeeded.
833 +fi
834 +
835 +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
836 + :
837 +else
838 + exitcode=1
839 + echo positional parameters were not saved.
840 +fi
841 +
842 +test \$exitcode = 0) || { (exit 1); exit 1; }
843 +
844 +(
845 + as_lineno_1=\$LINENO
846 + as_lineno_2=\$LINENO
847 + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
848 + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
849 +") 2> /dev/null; then
850 + :
851 +else
852 + as_candidate_shells=
853 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
854 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
855 do
856 IFS=$as_save_IFS
857 test -z "$as_dir" && as_dir=.
858 - for as_base in sh bash ksh sh5; do
859 - case $as_dir in
860 + case $as_dir in
861 /*)
862 - if ("$as_dir/$as_base" -c '
863 + for as_base in sh bash ksh sh5; do
864 + as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
865 + done;;
866 + esac
867 +done
868 +IFS=$as_save_IFS
869 +
870 +
871 + for as_shell in $as_candidate_shells $SHELL; do
872 + # Try only shells that exist, to save several forks.
873 + if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
874 + { ("$as_shell") 2> /dev/null <<\_ASEOF
875 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
876 + emulate sh
877 + NULLCMD=:
878 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
879 + # is contrary to our usage. Disable this feature.
880 + alias -g '${1+"$@"}'='"$@"'
881 + setopt NO_GLOB_SUBST
882 +else
883 + case `(set -o) 2>/dev/null` in
884 + *posix*) set -o posix ;;
885 +esac
886 +
887 +fi
888 +
889 +
890 +:
891 +_ASEOF
892 +}; then
893 + CONFIG_SHELL=$as_shell
894 + as_have_required=yes
895 + if { "$as_shell" 2> /dev/null <<\_ASEOF
896 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
897 + emulate sh
898 + NULLCMD=:
899 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
900 + # is contrary to our usage. Disable this feature.
901 + alias -g '${1+"$@"}'='"$@"'
902 + setopt NO_GLOB_SUBST
903 +else
904 + case `(set -o) 2>/dev/null` in
905 + *posix*) set -o posix ;;
906 +esac
907 +
908 +fi
909 +
910 +
911 +:
912 +(as_func_return () {
913 + (exit $1)
914 +}
915 +as_func_success () {
916 + as_func_return 0
917 +}
918 +as_func_failure () {
919 + as_func_return 1
920 +}
921 +as_func_ret_success () {
922 + return 0
923 +}
924 +as_func_ret_failure () {
925 + return 1
926 +}
927 +
928 +exitcode=0
929 +if as_func_success; then
930 + :
931 +else
932 + exitcode=1
933 + echo as_func_success failed.
934 +fi
935 +
936 +if as_func_failure; then
937 + exitcode=1
938 + echo as_func_failure succeeded.
939 +fi
940 +
941 +if as_func_ret_success; then
942 + :
943 +else
944 + exitcode=1
945 + echo as_func_ret_success failed.
946 +fi
947 +
948 +if as_func_ret_failure; then
949 + exitcode=1
950 + echo as_func_ret_failure succeeded.
951 +fi
952 +
953 +if ( set x; as_func_ret_success y && test x = "$1" ); then
954 + :
955 +else
956 + exitcode=1
957 + echo positional parameters were not saved.
958 +fi
959 +
960 +test $exitcode = 0) || { (exit 1); exit 1; }
961 +
962 +(
963 as_lineno_1=$LINENO
964 as_lineno_2=$LINENO
965 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
966 test "x$as_lineno_1" != "x$as_lineno_2" &&
967 - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
968 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
969 - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
970 - CONFIG_SHELL=$as_dir/$as_base
971 - export CONFIG_SHELL
972 - exec "$CONFIG_SHELL" "$0" ${1+"$@"}
973 - fi;;
974 - esac
975 - done
976 -done
977 -;;
978 - esac
979 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
980 +
981 +_ASEOF
982 +}; then
983 + break
984 +fi
985 +
986 +fi
987 +
988 + done
989 +
990 + if test "x$CONFIG_SHELL" != x; then
991 + for as_var in BASH_ENV ENV
992 + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
993 + done
994 + export CONFIG_SHELL
995 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
996 +fi
997 +
998 +
999 + if test $as_have_required = no; then
1000 + echo This script requires a shell more modern than all the
1001 + echo shells that I found on your system. Please install a
1002 + echo modern shell, or manually run the script under such a
1003 + echo shell if you do have one.
1004 + { (exit 1); exit 1; }
1005 +fi
1006 +
1007 +
1008 +fi
1009 +
1010 +fi
1011 +
1012 +
1013 +
1014 +(eval "as_func_return () {
1015 + (exit \$1)
1016 +}
1017 +as_func_success () {
1018 + as_func_return 0
1019 +}
1020 +as_func_failure () {
1021 + as_func_return 1
1022 +}
1023 +as_func_ret_success () {
1024 + return 0
1025 +}
1026 +as_func_ret_failure () {
1027 + return 1
1028 +}
1029 +
1030 +exitcode=0
1031 +if as_func_success; then
1032 + :
1033 +else
1034 + exitcode=1
1035 + echo as_func_success failed.
1036 +fi
1037 +
1038 +if as_func_failure; then
1039 + exitcode=1
1040 + echo as_func_failure succeeded.
1041 +fi
1042 +
1043 +if as_func_ret_success; then
1044 + :
1045 +else
1046 + exitcode=1
1047 + echo as_func_ret_success failed.
1048 +fi
1049 +
1050 +if as_func_ret_failure; then
1051 + exitcode=1
1052 + echo as_func_ret_failure succeeded.
1053 +fi
1054 +
1055 +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
1056 + :
1057 +else
1058 + exitcode=1
1059 + echo positional parameters were not saved.
1060 +fi
1061 +
1062 +test \$exitcode = 0") || {
1063 + echo No shell found that supports shell functions.
1064 + echo Please tell autoconf@gnu.org about your system,
1065 + echo including any error possibly output before this
1066 + echo message
1067 +}
1068 +
1069 +
1070 +
1071 + as_lineno_1=$LINENO
1072 + as_lineno_2=$LINENO
1073 + test "x$as_lineno_1" != "x$as_lineno_2" &&
1074 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
1075
1076 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
1077 # uniformly replaced by the line number. The first 'sed' inserts a
1078 - # line-number line before each line; the second 'sed' does the real
1079 - # work. The second script uses 'N' to pair each line-number line
1080 - # with the numbered line, and appends trailing '-' during
1081 - # substitution so that $LINENO is not a special case at line end.
1082 + # line-number line after each line using $LINENO; the second 'sed'
1083 + # does the real work. The second script uses 'N' to pair each
1084 + # line-number line with the line containing $LINENO, and appends
1085 + # trailing '-' during substitution so that $LINENO is not a special
1086 + # case at line end.
1087 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
1088 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
1089 - sed '=' <$as_myself |
1090 + # scripts with optimization help from Paolo Bonzini. Blame Lee
1091 + # E. McMahon (1931-1989) for sed's syntax. :-)
1092 + sed -n '
1093 + p
1094 + /[$]LINENO/=
1095 + ' <$as_myself |
1096 sed '
1097 + s/[$]LINENO.*/&-/
1098 + t lineno
1099 + b
1100 + :lineno
1101 N
1102 - s,$,-,
1103 - : loop
1104 - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
1105 + :loop
1106 + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
1107 t loop
1108 - s,-$,,
1109 - s,^['$as_cr_digits']*\n,,
1110 + s/-\n.*//
1111 ' >$as_me.lineno &&
1112 - chmod +x $as_me.lineno ||
1113 + chmod +x "$as_me.lineno" ||
1114 { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1115 { (exit 1); exit 1; }; }
1116
1117 # Don't try to exec as it changes $[0], causing all sort of problems
1118 # (the dirname of $[0] is not the place where we might find the
1119 - # original and so on. Autoconf is especially sensible to this).
1120 - . ./$as_me.lineno
1121 + # original and so on. Autoconf is especially sensitive to this).
1122 + . "./$as_me.lineno"
1123 # Exit status is that of the last command.
1124 exit
1125 }
1126
1127
1128 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
1129 - *c*,-n*) ECHO_N= ECHO_C='
1130 -' ECHO_T=' ' ;;
1131 - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
1132 - *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
1133 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
1134 + as_dirname=dirname
1135 +else
1136 + as_dirname=false
1137 +fi
1138 +
1139 +ECHO_C= ECHO_N= ECHO_T=
1140 +case `echo -n x` in
1141 +-n*)
1142 + case `echo 'x\c'` in
1143 + *c*) ECHO_T=' ';; # ECHO_T is single tab character.
1144 + *) ECHO_C='\c';;
1145 + esac;;
1146 +*)
1147 + ECHO_N='-n';;
1148 esac
1149
1150 -if expr a : '\(a\)' >/dev/null 2>&1; then
1151 +if expr a : '\(a\)' >/dev/null 2>&1 &&
1152 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
1153 as_expr=expr
1154 else
1155 as_expr=false
1156 fi
1157
1158 rm -f conf$$ conf$$.exe conf$$.file
1159 +if test -d conf$$.dir; then
1160 + rm -f conf$$.dir/conf$$.file
1161 +else
1162 + rm -f conf$$.dir
1163 + mkdir conf$$.dir
1164 +fi
1165 echo >conf$$.file
1166 if ln -s conf$$.file conf$$ 2>/dev/null; then
1167 - # We could just check for DJGPP; but this test a) works b) is more generic
1168 - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
1169 - if test -f conf$$.exe; then
1170 - # Don't use ln at all; we don't have any links
1171 + as_ln_s='ln -s'
1172 + # ... but there are two gotchas:
1173 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1174 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1175 + # In both cases, we have to default to `cp -p'.
1176 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1177 as_ln_s='cp -p'
1178 - else
1179 - as_ln_s='ln -s'
1180 - fi
1181 elif ln conf$$.file conf$$ 2>/dev/null; then
1182 as_ln_s=ln
1183 else
1184 as_ln_s='cp -p'
1185 fi
1186 -rm -f conf$$ conf$$.exe conf$$.file
1187 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
1188 +rmdir conf$$.dir 2>/dev/null
1189
1190 if mkdir -p . 2>/dev/null; then
1191 as_mkdir_p=:
1192 @@ -224,7 +520,28 @@
1193 as_mkdir_p=false
1194 fi
1195
1196 -as_executable_p="test -f"
1197 +if test -x / >/dev/null 2>&1; then
1198 + as_test_x='test -x'
1199 +else
1200 + if ls -dL / >/dev/null 2>&1; then
1201 + as_ls_L_option=L
1202 + else
1203 + as_ls_L_option=
1204 + fi
1205 + as_test_x='
1206 + eval sh -c '\''
1207 + if test -d "$1"; then
1208 + test -d "$1/.";
1209 + else
1210 + case $1 in
1211 + -*)set "./$1";;
1212 + esac;
1213 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
1214 + ???[sx]*):;;*)false;;esac;fi
1215 + '\'' sh
1216 + '
1217 +fi
1218 +as_executable_p=$as_test_x
1219
1220 # Sed expression to map a string onto a valid CPP name.
1221 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
1222 @@ -233,15 +550,6 @@
1223 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
1224
1225
1226 -# IFS
1227 -# We need space, tab and new line, in precisely that order.
1228 -as_nl='
1229 -'
1230 -IFS=" $as_nl"
1231 -
1232 -# CDPATH.
1233 -$as_unset CDPATH
1234 -
1235
1236
1237 # Check that we are running under the correct shell.
1238 @@ -397,29 +705,26 @@
1239
1240 tagnames=${tagnames+${tagnames},}F77
1241
1242 +exec 7<&0 </dev/null 6>&1
1243 +
1244 # Name of the host.
1245 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
1246 # so uname gets run too.
1247 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
1248
1249 -exec 6>&1
1250 -
1251 #
1252 # Initializations.
1253 #
1254 ac_default_prefix=/usr/local
1255 +ac_clean_files=
1256 ac_config_libobj_dir=.
1257 +LIBOBJS=
1258 cross_compiling=no
1259 subdirs=
1260 MFLAGS=
1261 MAKEFLAGS=
1262 SHELL=${CONFIG_SHELL-/bin/sh}
1263
1264 -# Maximum number of lines to put in a shell here document.
1265 -# This variable seems obsolete. It should probably be removed, and
1266 -# only ac_max_sed_lines should be used.
1267 -: ${ac_max_here_lines=38}
1268 -
1269 # Identity of this package.
1270 PACKAGE_NAME='libgphoto2_port'
1271 PACKAGE_TARNAME='libgphoto2_port'
1272 @@ -431,43 +736,217 @@
1273 # Factoring default headers for most tests.
1274 ac_includes_default="\
1275 #include <stdio.h>
1276 -#if HAVE_SYS_TYPES_H
1277 +#ifdef HAVE_SYS_TYPES_H
1278 # include <sys/types.h>
1279 #endif
1280 -#if HAVE_SYS_STAT_H
1281 +#ifdef HAVE_SYS_STAT_H
1282 # include <sys/stat.h>
1283 #endif
1284 -#if STDC_HEADERS
1285 +#ifdef STDC_HEADERS
1286 # include <stdlib.h>
1287 # include <stddef.h>
1288 #else
1289 -# if HAVE_STDLIB_H
1290 +# ifdef HAVE_STDLIB_H
1291 # include <stdlib.h>
1292 # endif
1293 #endif
1294 -#if HAVE_STRING_H
1295 -# if !STDC_HEADERS && HAVE_MEMORY_H
1296 +#ifdef HAVE_STRING_H
1297 +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
1298 # include <memory.h>
1299 # endif
1300 # include <string.h>
1301 #endif
1302 -#if HAVE_STRINGS_H
1303 +#ifdef HAVE_STRINGS_H
1304 # include <strings.h>
1305 #endif
1306 -#if HAVE_INTTYPES_H
1307 +#ifdef HAVE_INTTYPES_H
1308 # include <inttypes.h>
1309 -#else
1310 -# if HAVE_STDINT_H
1311 -# include <stdint.h>
1312 -# endif
1313 #endif
1314 -#if HAVE_UNISTD_H
1315 +#ifdef HAVE_STDINT_H
1316 +# include <stdint.h>
1317 +#endif
1318 +#ifdef HAVE_UNISTD_H
1319 # include <unistd.h>
1320 #endif"
1321
1322 -ac_subdirs_all="$ac_subdirs_all libltdl"
1323 -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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBGPHOTO2_PORT_AGE LIBGPHOTO2_PORT_REVISION LIBGPHOTO2_PORT_CURRENT LIBGPHOTO2_PORT_CURRENT_MIN LIBGPHOTO2_PORT_VERSION_INFO 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 CPP EGREP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBADD_DL LIBLTDL INCLTDL subdirs LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTDLINCL URL_GPHOTO_HOME URL_GPHOTO_PROJECT URL_DIGICAM_LIST URL_JPHOTO_HOME URL_USB_MASSSTORAGE MAIL_GPHOTO_DEVEL MAIL_GPHOTO_USER MAIL_GPHOTO_TRANSLATION GETTEXT_PACKAGE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB localedir MDNS_LIBS SERIAL_LIBS PKG_CONFIG PKG_CONFIG_PATH LIBUSB_CFLAGS LIBUSB_LIBS ac_pt_PKG_CONFIG LIBUSB_CONFIG_PROG HAVE_LIBUSB_TRUE HAVE_LIBUSB_FALSE HAL_CFLAGS HAL_LIBS IOLIB_SUBDIRS iolibdir docdir GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE htmldir apidocdir} AM_CPPFLAGS AM_LDFLAGS LIBOBJS LTLIBOBJS'
1324 +ac_subst_vars='SHELL
1325 +PATH_SEPARATOR
1326 +PACKAGE_NAME
1327 +PACKAGE_TARNAME
1328 +PACKAGE_VERSION
1329 +PACKAGE_STRING
1330 +PACKAGE_BUGREPORT
1331 +exec_prefix
1332 +prefix
1333 +program_transform_name
1334 +bindir
1335 +sbindir
1336 +libexecdir
1337 +datarootdir
1338 +datadir
1339 +sysconfdir
1340 +sharedstatedir
1341 +localstatedir
1342 +includedir
1343 +oldincludedir
1344 +docdir
1345 +infodir
1346 +htmldir
1347 +dvidir
1348 +pdfdir
1349 +psdir
1350 +libdir
1351 +localedir
1352 +mandir
1353 +DEFS
1354 +ECHO_C
1355 +ECHO_N
1356 +ECHO_T
1357 +LIBS
1358 +build_alias
1359 +host_alias
1360 +target_alias
1361 +INSTALL_PROGRAM
1362 +INSTALL_SCRIPT
1363 +INSTALL_DATA
1364 +CYGPATH_W
1365 +PACKAGE
1366 +VERSION
1367 +ACLOCAL
1368 +AUTOCONF
1369 +AUTOMAKE
1370 +AUTOHEADER
1371 +MAKEINFO
1372 +install_sh
1373 +STRIP
1374 +INSTALL_STRIP_PROGRAM
1375 +mkdir_p
1376 +AWK
1377 +SET_MAKE
1378 +am__leading_dot
1379 +AMTAR
1380 +am__tar
1381 +am__untar
1382 +LIBGPHOTO2_PORT_AGE
1383 +LIBGPHOTO2_PORT_REVISION
1384 +LIBGPHOTO2_PORT_CURRENT
1385 +LIBGPHOTO2_PORT_CURRENT_MIN
1386 +LIBGPHOTO2_PORT_VERSION_INFO
1387 +CC
1388 +CFLAGS
1389 +LDFLAGS
1390 +CPPFLAGS
1391 +ac_ct_CC
1392 +EXEEXT
1393 +OBJEXT
1394 +DEPDIR
1395 +am__include
1396 +am__quote
1397 +AMDEP_TRUE
1398 +AMDEP_FALSE
1399 +AMDEPBACKSLASH
1400 +CCDEPMODE
1401 +am__fastdepCC_TRUE
1402 +am__fastdepCC_FALSE
1403 +CPP
1404 +GREP
1405 +EGREP
1406 +INSTALL_LTDL_TRUE
1407 +INSTALL_LTDL_FALSE
1408 +CONVENIENCE_LTDL_TRUE
1409 +CONVENIENCE_LTDL_FALSE
1410 +build
1411 +build_cpu
1412 +build_vendor
1413 +build_os
1414 +host
1415 +host_cpu
1416 +host_vendor
1417 +host_os
1418 +LIBADD_DL
1419 +LIBLTDL
1420 +INCLTDL
1421 +subdirs
1422 +LN_S
1423 +ECHO
1424 +AR
1425 +RANLIB
1426 +DLLTOOL
1427 +AS
1428 +OBJDUMP
1429 +CXX
1430 +CXXFLAGS
1431 +ac_ct_CXX
1432 +CXXDEPMODE
1433 +am__fastdepCXX_TRUE
1434 +am__fastdepCXX_FALSE
1435 +CXXCPP
1436 +F77
1437 +FFLAGS
1438 +ac_ct_F77
1439 +LIBTOOL
1440 +LTDLINCL
1441 +URL_GPHOTO_HOME
1442 +URL_GPHOTO_PROJECT
1443 +URL_DIGICAM_LIST
1444 +URL_JPHOTO_HOME
1445 +URL_USB_MASSSTORAGE
1446 +MAIL_GPHOTO_DEVEL
1447 +MAIL_GPHOTO_USER
1448 +MAIL_GPHOTO_TRANSLATION
1449 +GETTEXT_PACKAGE
1450 +MKINSTALLDIRS
1451 +USE_NLS
1452 +MSGFMT
1453 +GMSGFMT
1454 +XGETTEXT
1455 +MSGMERGE
1456 +LIBICONV
1457 +LTLIBICONV
1458 +INTLLIBS
1459 +LIBINTL
1460 +LTLIBINTL
1461 +POSUB
1462 +MDNS_LIBS
1463 +SERIAL_LIBS
1464 +PKG_CONFIG
1465 +PKG_CONFIG_PATH
1466 +LIBUSB_CFLAGS
1467 +LIBUSB_LIBS
1468 +LIBUSB_CONFIG_PROG
1469 +HAVE_LIBUSB_TRUE
1470 +HAVE_LIBUSB_FALSE
1471 +IOLIB_SUBDIRS
1472 +iolibdir
1473 +GTKDOC
1474 +ENABLE_GTK_DOC_TRUE
1475 +ENABLE_GTK_DOC_FALSE
1476 +apidocdir}
1477 +AM_CPPFLAGS
1478 +AM_LDFLAGS
1479 +LIBOBJS
1480 +LTLIBOBJS'
1481 ac_subst_files=''
1482 + ac_precious_vars='build_alias
1483 +host_alias
1484 +target_alias
1485 +CC
1486 +CFLAGS
1487 +LDFLAGS
1488 +LIBS
1489 +CPPFLAGS
1490 +CPP
1491 +CXX
1492 +CXXFLAGS
1493 +CCC
1494 +CXXCPP
1495 +F77
1496 +FFLAGS
1497 +PKG_CONFIG
1498 +PKG_CONFIG_PATH
1499 +LIBUSB_CFLAGS
1500 +LIBUSB_LIBS'
1501 +ac_subdirs_all='libltdl'
1502
1503 # Initialize some variables set by options.
1504 ac_init_help=
1505 @@ -494,34 +973,48 @@
1506 # and all the variables that are supposed to be based on exec_prefix
1507 # by default will actually change.
1508 # Use braces instead of parens because sh, perl, etc. also accept them.
1509 +# (The list follows the same order as the GNU Coding Standards.)
1510 bindir='${exec_prefix}/bin'
1511 sbindir='${exec_prefix}/sbin'
1512 libexecdir='${exec_prefix}/libexec'
1513 -datadir='${prefix}/share'
1514 +datarootdir='${prefix}/share'
1515 +datadir='${datarootdir}'
1516 sysconfdir='${prefix}/etc'
1517 sharedstatedir='${prefix}/com'
1518 localstatedir='${prefix}/var'
1519 -libdir='${exec_prefix}/lib'
1520 includedir='${prefix}/include'
1521 oldincludedir='/usr/include'
1522 -infodir='${prefix}/info'
1523 -mandir='${prefix}/man'
1524 +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
1525 +infodir='${datarootdir}/info'
1526 +htmldir='${docdir}'
1527 +dvidir='${docdir}'
1528 +pdfdir='${docdir}'
1529 +psdir='${docdir}'
1530 +libdir='${exec_prefix}/lib'
1531 +localedir='${datarootdir}/locale'
1532 +mandir='${datarootdir}/man'
1533
1534 ac_prev=
1535 +ac_dashdash=
1536 for ac_option
1537 do
1538 # If the previous option needs an argument, assign it.
1539 if test -n "$ac_prev"; then
1540 - eval "$ac_prev=\$ac_option"
1541 + eval $ac_prev=\$ac_option
1542 ac_prev=
1543 continue
1544 fi
1545
1546 - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
1547 + case $ac_option in
1548 + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1549 + *) ac_optarg=yes ;;
1550 + esac
1551
1552 # Accept the important Cygnus configure options, so we can diagnose typos.
1553
1554 - case $ac_option in
1555 + case $ac_dashdash$ac_option in
1556 + --)
1557 + ac_dashdash=yes ;;
1558
1559 -bindir | --bindir | --bindi | --bind | --bin | --bi)
1560 ac_prev=bindir ;;
1561 @@ -543,33 +1036,45 @@
1562 --config-cache | -C)
1563 cache_file=config.cache ;;
1564
1565 - -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
1566 + -datadir | --datadir | --datadi | --datad)
1567 ac_prev=datadir ;;
1568 - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
1569 - | --da=*)
1570 + -datadir=* | --datadir=* | --datadi=* | --datad=*)
1571 datadir=$ac_optarg ;;
1572
1573 + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
1574 + | --dataroo | --dataro | --datar)
1575 + ac_prev=datarootdir ;;
1576 + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
1577 + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
1578 + datarootdir=$ac_optarg ;;
1579 +
1580 -disable-* | --disable-*)
1581 ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1582 # Reject names that are not valid shell variable names.
1583 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1584 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1585 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1586 { (exit 1); exit 1; }; }
1587 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
1588 - eval "enable_$ac_feature=no" ;;
1589 + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1590 + eval enable_$ac_feature=no ;;
1591 +
1592 + -docdir | --docdir | --docdi | --doc | --do)
1593 + ac_prev=docdir ;;
1594 + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
1595 + docdir=$ac_optarg ;;
1596 +
1597 + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
1598 + ac_prev=dvidir ;;
1599 + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
1600 + dvidir=$ac_optarg ;;
1601
1602 -enable-* | --enable-*)
1603 ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1604 # Reject names that are not valid shell variable names.
1605 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1606 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1607 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1608 { (exit 1); exit 1; }; }
1609 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
1610 - case $ac_option in
1611 - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
1612 - *) ac_optarg=yes ;;
1613 - esac
1614 - eval "enable_$ac_feature='$ac_optarg'" ;;
1615 + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1616 + eval enable_$ac_feature=\$ac_optarg ;;
1617
1618 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
1619 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
1620 @@ -596,6 +1101,12 @@
1621 -host=* | --host=* | --hos=* | --ho=*)
1622 host_alias=$ac_optarg ;;
1623
1624 + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
1625 + ac_prev=htmldir ;;
1626 + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
1627 + | --ht=*)
1628 + htmldir=$ac_optarg ;;
1629 +
1630 -includedir | --includedir | --includedi | --included | --include \
1631 | --includ | --inclu | --incl | --inc)
1632 ac_prev=includedir ;;
1633 @@ -620,13 +1131,16 @@
1634 | --libexe=* | --libex=* | --libe=*)
1635 libexecdir=$ac_optarg ;;
1636
1637 + -localedir | --localedir | --localedi | --localed | --locale)
1638 + ac_prev=localedir ;;
1639 + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
1640 + localedir=$ac_optarg ;;
1641 +
1642 -localstatedir | --localstatedir | --localstatedi | --localstated \
1643 - | --localstate | --localstat | --localsta | --localst \
1644 - | --locals | --local | --loca | --loc | --lo)
1645 + | --localstate | --localstat | --localsta | --localst | --locals)
1646 ac_prev=localstatedir ;;
1647 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
1648 - | --localstate=* | --localstat=* | --localsta=* | --localst=* \
1649 - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
1650 + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
1651 localstatedir=$ac_optarg ;;
1652
1653 -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
1654 @@ -691,6 +1205,16 @@
1655 | --progr-tra=* | --program-tr=* | --program-t=*)
1656 program_transform_name=$ac_optarg ;;
1657
1658 + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
1659 + ac_prev=pdfdir ;;
1660 + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
1661 + pdfdir=$ac_optarg ;;
1662 +
1663 + -psdir | --psdir | --psdi | --psd | --ps)
1664 + ac_prev=psdir ;;
1665 + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
1666 + psdir=$ac_optarg ;;
1667 +
1668 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1669 | -silent | --silent | --silen | --sile | --sil)
1670 silent=yes ;;
1671 @@ -743,24 +1267,20 @@
1672 -with-* | --with-*)
1673 ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1674 # Reject names that are not valid shell variable names.
1675 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1676 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1677 { echo "$as_me: error: invalid package name: $ac_package" >&2
1678 { (exit 1); exit 1; }; }
1679 - ac_package=`echo $ac_package| sed 's/-/_/g'`
1680 - case $ac_option in
1681 - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
1682 - *) ac_optarg=yes ;;
1683 - esac
1684 - eval "with_$ac_package='$ac_optarg'" ;;
1685 + ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1686 + eval with_$ac_package=\$ac_optarg ;;
1687
1688 -without-* | --without-*)
1689 ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1690 # Reject names that are not valid shell variable names.
1691 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1692 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1693 { echo "$as_me: error: invalid package name: $ac_package" >&2
1694 { (exit 1); exit 1; }; }
1695 - ac_package=`echo $ac_package | sed 's/-/_/g'`
1696 - eval "with_$ac_package=no" ;;
1697 + ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1698 + eval with_$ac_package=no ;;
1699
1700 --x)
1701 # Obsolete; use --with-x.
1702 @@ -791,8 +1311,7 @@
1703 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1704 { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1705 { (exit 1); exit 1; }; }
1706 - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
1707 - eval "$ac_envvar='$ac_optarg'"
1708 + eval $ac_envvar=\$ac_optarg
1709 export $ac_envvar ;;
1710
1711 *)
1712 @@ -812,27 +1331,19 @@
1713 { (exit 1); exit 1; }; }
1714 fi
1715
1716 -# Be sure to have absolute paths.
1717 -for ac_var in exec_prefix prefix
1718 -do
1719 - eval ac_val=$`echo $ac_var`
1720 - case $ac_val in
1721 - [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
1722 - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1723 - { (exit 1); exit 1; }; };;
1724 - esac
1725 -done
1726 -
1727 -# Be sure to have absolute paths.
1728 -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
1729 - localstatedir libdir includedir oldincludedir infodir mandir
1730 +# Be sure to have absolute directory names.
1731 +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1732 + datadir sysconfdir sharedstatedir localstatedir includedir \
1733 + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1734 + libdir localedir mandir
1735 do
1736 - eval ac_val=$`echo $ac_var`
1737 + eval ac_val=\$$ac_var
1738 case $ac_val in
1739 - [\\/$]* | ?:[\\/]* ) ;;
1740 - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1741 - { (exit 1); exit 1; }; };;
1742 + [\\/$]* | ?:[\\/]* ) continue;;
1743 + NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1744 esac
1745 + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1746 + { (exit 1); exit 1; }; }
1747 done
1748
1749 # There might be people who depend on the old broken behavior: `$host'
1750 @@ -859,118 +1370,76 @@
1751 test "$silent" = yes && exec 6>/dev/null
1752
1753
1754 -# Find the source files, if location was not specified.
1755 -if test -z "$srcdir"; then
1756 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
1757 +ac_ls_di=`ls -di .` &&
1758 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1759 + { echo "$as_me: error: Working directory cannot be determined" >&2
1760 + { (exit 1); exit 1; }; }
1761 +test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1762 + { echo "$as_me: error: pwd does not report name of working directory" >&2
1763 + { (exit 1); exit 1; }; }
1764 +
1765 +
1766 +# Find the source files, if location was not specified.
1767 +if test -z "$srcdir"; then
1768 ac_srcdir_defaulted=yes
1769 - # Try the directory containing this script, then its parent.
1770 - ac_confdir=`(dirname "$0") 2>/dev/null ||
1771 + # Try the directory containing this script, then the parent directory.
1772 + ac_confdir=`$as_dirname -- "$0" ||
1773 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1774 X"$0" : 'X\(//\)[^/]' \| \
1775 X"$0" : 'X\(//\)$' \| \
1776 - X"$0" : 'X\(/\)' \| \
1777 - . : '\(.\)' 2>/dev/null ||
1778 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1779 echo X"$0" |
1780 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
1781 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
1782 - /^X\(\/\/\)$/{ s//\1/; q; }
1783 - /^X\(\/\).*/{ s//\1/; q; }
1784 - s/.*/./; q'`
1785 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1786 + s//\1/
1787 + q
1788 + }
1789 + /^X\(\/\/\)[^/].*/{
1790 + s//\1/
1791 + q
1792 + }
1793 + /^X\(\/\/\)$/{
1794 + s//\1/
1795 + q
1796 + }
1797 + /^X\(\/\).*/{
1798 + s//\1/
1799 + q
1800 + }
1801 + s/.*/./; q'`
1802 srcdir=$ac_confdir
1803 - if test ! -r $srcdir/$ac_unique_file; then
1804 + if test ! -r "$srcdir/$ac_unique_file"; then
1805 srcdir=..
1806 fi
1807 else
1808 ac_srcdir_defaulted=no
1809 fi
1810 -if test ! -r $srcdir/$ac_unique_file; then
1811 - if test "$ac_srcdir_defaulted" = yes; then
1812 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
1813 - { (exit 1); exit 1; }; }
1814 - else
1815 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1816 +if test ! -r "$srcdir/$ac_unique_file"; then
1817 + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1818 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1819 { (exit 1); exit 1; }; }
1820 - fi
1821 fi
1822 -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
1823 - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
1824 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1825 +ac_abs_confdir=`(
1826 + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
1827 { (exit 1); exit 1; }; }
1828 -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
1829 -ac_env_build_alias_set=${build_alias+set}
1830 -ac_env_build_alias_value=$build_alias
1831 -ac_cv_env_build_alias_set=${build_alias+set}
1832 -ac_cv_env_build_alias_value=$build_alias
1833 -ac_env_host_alias_set=${host_alias+set}
1834 -ac_env_host_alias_value=$host_alias
1835 -ac_cv_env_host_alias_set=${host_alias+set}
1836 -ac_cv_env_host_alias_value=$host_alias
1837 -ac_env_target_alias_set=${target_alias+set}
1838 -ac_env_target_alias_value=$target_alias
1839 -ac_cv_env_target_alias_set=${target_alias+set}
1840 -ac_cv_env_target_alias_value=$target_alias
1841 -ac_env_CC_set=${CC+set}
1842 -ac_env_CC_value=$CC
1843 -ac_cv_env_CC_set=${CC+set}
1844 -ac_cv_env_CC_value=$CC
1845 -ac_env_CFLAGS_set=${CFLAGS+set}
1846 -ac_env_CFLAGS_value=$CFLAGS
1847 -ac_cv_env_CFLAGS_set=${CFLAGS+set}
1848 -ac_cv_env_CFLAGS_value=$CFLAGS
1849 -ac_env_LDFLAGS_set=${LDFLAGS+set}
1850 -ac_env_LDFLAGS_value=$LDFLAGS
1851 -ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
1852 -ac_cv_env_LDFLAGS_value=$LDFLAGS
1853 -ac_env_CPPFLAGS_set=${CPPFLAGS+set}
1854 -ac_env_CPPFLAGS_value=$CPPFLAGS
1855 -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
1856 -ac_cv_env_CPPFLAGS_value=$CPPFLAGS
1857 -ac_env_CPP_set=${CPP+set}
1858 -ac_env_CPP_value=$CPP
1859 -ac_cv_env_CPP_set=${CPP+set}
1860 -ac_cv_env_CPP_value=$CPP
1861 -ac_env_CXX_set=${CXX+set}
1862 -ac_env_CXX_value=$CXX
1863 -ac_cv_env_CXX_set=${CXX+set}
1864 -ac_cv_env_CXX_value=$CXX
1865 -ac_env_CXXFLAGS_set=${CXXFLAGS+set}
1866 -ac_env_CXXFLAGS_value=$CXXFLAGS
1867 -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
1868 -ac_cv_env_CXXFLAGS_value=$CXXFLAGS
1869 -ac_env_CXXCPP_set=${CXXCPP+set}
1870 -ac_env_CXXCPP_value=$CXXCPP
1871 -ac_cv_env_CXXCPP_set=${CXXCPP+set}
1872 -ac_cv_env_CXXCPP_value=$CXXCPP
1873 -ac_env_F77_set=${F77+set}
1874 -ac_env_F77_value=$F77
1875 -ac_cv_env_F77_set=${F77+set}
1876 -ac_cv_env_F77_value=$F77
1877 -ac_env_FFLAGS_set=${FFLAGS+set}
1878 -ac_env_FFLAGS_value=$FFLAGS
1879 -ac_cv_env_FFLAGS_set=${FFLAGS+set}
1880 -ac_cv_env_FFLAGS_value=$FFLAGS
1881 -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
1882 -ac_env_PKG_CONFIG_value=$PKG_CONFIG
1883 -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
1884 -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
1885 -ac_env_PKG_CONFIG_PATH_set=${PKG_CONFIG_PATH+set}
1886 -ac_env_PKG_CONFIG_PATH_value=$PKG_CONFIG_PATH
1887 -ac_cv_env_PKG_CONFIG_PATH_set=${PKG_CONFIG_PATH+set}
1888 -ac_cv_env_PKG_CONFIG_PATH_value=$PKG_CONFIG_PATH
1889 -ac_env_LIBUSB_CFLAGS_set=${LIBUSB_CFLAGS+set}
1890 -ac_env_LIBUSB_CFLAGS_value=$LIBUSB_CFLAGS
1891 -ac_cv_env_LIBUSB_CFLAGS_set=${LIBUSB_CFLAGS+set}
1892 -ac_cv_env_LIBUSB_CFLAGS_value=$LIBUSB_CFLAGS
1893 -ac_env_LIBUSB_LIBS_set=${LIBUSB_LIBS+set}
1894 -ac_env_LIBUSB_LIBS_value=$LIBUSB_LIBS
1895 -ac_cv_env_LIBUSB_LIBS_set=${LIBUSB_LIBS+set}
1896 -ac_cv_env_LIBUSB_LIBS_value=$LIBUSB_LIBS
1897 -ac_env_HAL_CFLAGS_set=${HAL_CFLAGS+set}
1898 -ac_env_HAL_CFLAGS_value=$HAL_CFLAGS
1899 -ac_cv_env_HAL_CFLAGS_set=${HAL_CFLAGS+set}
1900 -ac_cv_env_HAL_CFLAGS_value=$HAL_CFLAGS
1901 -ac_env_HAL_LIBS_set=${HAL_LIBS+set}
1902 -ac_env_HAL_LIBS_value=$HAL_LIBS
1903 -ac_cv_env_HAL_LIBS_set=${HAL_LIBS+set}
1904 -ac_cv_env_HAL_LIBS_value=$HAL_LIBS
1905 + pwd)`
1906 +# When building in place, set srcdir=.
1907 +if test "$ac_abs_confdir" = "$ac_pwd"; then
1908 + srcdir=.
1909 +fi
1910 +# Remove unnecessary trailing slashes from srcdir.
1911 +# Double slashes in file names in object file debugging info
1912 +# mess up M-x gdb in Emacs.
1913 +case $srcdir in
1914 +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
1915 +esac
1916 +for ac_var in $ac_precious_vars; do
1917 + eval ac_env_${ac_var}_set=\${${ac_var}+set}
1918 + eval ac_env_${ac_var}_value=\$${ac_var}
1919 + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
1920 + eval ac_cv_env_${ac_var}_value=\$${ac_var}
1921 +done
1922
1923 #
1924 # Report the --help message.
1925 @@ -999,9 +1468,6 @@
1926 -n, --no-create do not create output files
1927 --srcdir=DIR find the sources in DIR [configure dir or \`..']
1928
1929 -_ACEOF
1930 -
1931 - cat <<_ACEOF
1932 Installation directories:
1933 --prefix=PREFIX install architecture-independent files in PREFIX
1934 [$ac_default_prefix]
1935 @@ -1019,15 +1485,22 @@
1936 --bindir=DIR user executables [EPREFIX/bin]
1937 --sbindir=DIR system admin executables [EPREFIX/sbin]
1938 --libexecdir=DIR program executables [EPREFIX/libexec]
1939 - --datadir=DIR read-only architecture-independent data [PREFIX/share]
1940 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1941 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1942 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1943 --libdir=DIR object code libraries [EPREFIX/lib]
1944 --includedir=DIR C header files [PREFIX/include]
1945 --oldincludedir=DIR C header files for non-gcc [/usr/include]
1946 - --infodir=DIR info documentation [PREFIX/info]
1947 - --mandir=DIR man documentation [PREFIX/man]
1948 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1949 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1950 + --infodir=DIR info documentation [DATAROOTDIR/info]
1951 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1952 + --mandir=DIR man documentation [DATAROOTDIR/man]
1953 + --docdir=DIR documentation root [DATAROOTDIR/doc/libgphoto2_port]
1954 + --htmldir=DIR html documentation [DOCDIR]
1955 + --dvidir=DIR dvi documentation [DOCDIR]
1956 + --pdfdir=DIR pdf documentation [DOCDIR]
1957 + --psdir=DIR ps documentation [DOCDIR]
1958 _ACEOF
1959
1960 cat <<\_ACEOF
1961 @@ -1055,10 +1528,8 @@
1962 --disable-dependency-tracking speeds up one-time build
1963 --enable-dependency-tracking do not reject slow dependency extractors
1964 --enable-ltdl-install install libltdl
1965 - --enable-shared[=PKGS]
1966 - build shared libraries [default=yes]
1967 - --enable-static[=PKGS]
1968 - build static libraries [default=yes]
1969 + --enable-shared[=PKGS] build shared libraries [default=yes]
1970 + --enable-static[=PKGS] build static libraries [default=yes]
1971 --enable-fast-install[=PKGS]
1972 optimize for fast installation [default=yes]
1973 --disable-libtool-lock avoid locking (might break parallel builds)
1974 @@ -1083,8 +1554,7 @@
1975 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1976 --with-pic try to use only PIC/non-PIC objects [default=use
1977 both]
1978 - --with-tags[=TAGS]
1979 - include additional configurations [automatic]
1980 + --with-tags[=TAGS] include additional configurations [automatic]
1981 --with-gnu-ld assume the C compiler uses GNU ld default=no
1982 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1983 --without-libiconv-prefix don't search for libiconv in includedir and libdir
1984 @@ -1100,8 +1570,9 @@
1985 CFLAGS C compiler flags
1986 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
1987 nonstandard directory <lib dir>
1988 - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
1989 - headers in a nonstandard directory <include dir>
1990 + LIBS libraries to pass to the linker, e.g. -l<library>
1991 + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
1992 + you have headers in a nonstandard directory <include dir>
1993 CPP C preprocessor
1994 CXX C++ compiler command
1995 CXXFLAGS C++ compiler flags
1996 @@ -1114,128 +1585,92 @@
1997 LIBUSB_CFLAGS
1998 CFLAGS for compiling with libusb
1999 LIBUSB_LIBS LIBS to add for linking against libusb
2000 - HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
2001 - HAL_LIBS linker flags for HAL, overriding pkg-config
2002
2003 Use these variables to override the choices made by `configure' or to help
2004 it to find libraries and programs with nonstandard names/locations.
2005
2006 Report bugs to <gphoto-devel@lists.sourceforge.net>.
2007 _ACEOF
2008 +ac_status=$?
2009 fi
2010
2011 if test "$ac_init_help" = "recursive"; then
2012 # If there are subdirs, report their specific --help.
2013 - ac_popdir=`pwd`
2014 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
2015 - test -d $ac_dir || continue
2016 + test -d "$ac_dir" || continue
2017 ac_builddir=.
2018
2019 -if test "$ac_dir" != .; then
2020 +case "$ac_dir" in
2021 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
2022 +*)
2023 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
2024 - # A "../" for each directory in $ac_dir_suffix.
2025 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
2026 -else
2027 - ac_dir_suffix= ac_top_builddir=
2028 -fi
2029 + # A ".." for each directory in $ac_dir_suffix.
2030 + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
2031 + case $ac_top_builddir_sub in
2032 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
2033 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
2034 + esac ;;
2035 +esac
2036 +ac_abs_top_builddir=$ac_pwd
2037 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
2038 +# for backward compatibility:
2039 +ac_top_builddir=$ac_top_build_prefix
2040
2041 case $srcdir in
2042 - .) # No --srcdir option. We are building in place.
2043 + .) # We are building in place.
2044 ac_srcdir=.
2045 - if test -z "$ac_top_builddir"; then
2046 - ac_top_srcdir=.
2047 - else
2048 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
2049 - fi ;;
2050 - [\\/]* | ?:[\\/]* ) # Absolute path.
2051 + ac_top_srcdir=$ac_top_builddir_sub
2052 + ac_abs_top_srcdir=$ac_pwd ;;
2053 + [\\/]* | ?:[\\/]* ) # Absolute name.
2054 ac_srcdir=$srcdir$ac_dir_suffix;
2055 - ac_top_srcdir=$srcdir ;;
2056 - *) # Relative path.
2057 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
2058 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
2059 -esac
2060 -
2061 -# Do not use `cd foo && pwd` to compute absolute paths, because
2062 -# the directories may not exist.
2063 -case `pwd` in
2064 -.) ac_abs_builddir="$ac_dir";;
2065 -*)
2066 - case "$ac_dir" in
2067 - .) ac_abs_builddir=`pwd`;;
2068 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
2069 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
2070 - esac;;
2071 -esac
2072 -case $ac_abs_builddir in
2073 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
2074 -*)
2075 - case ${ac_top_builddir}. in
2076 - .) ac_abs_top_builddir=$ac_abs_builddir;;
2077 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
2078 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
2079 - esac;;
2080 -esac
2081 -case $ac_abs_builddir in
2082 -.) ac_abs_srcdir=$ac_srcdir;;
2083 -*)
2084 - case $ac_srcdir in
2085 - .) ac_abs_srcdir=$ac_abs_builddir;;
2086 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
2087 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
2088 - esac;;
2089 -esac
2090 -case $ac_abs_builddir in
2091 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
2092 -*)
2093 - case $ac_top_srcdir in
2094 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
2095 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
2096 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
2097 - esac;;
2098 -esac
2099 -
2100 - cd $ac_dir
2101 - # Check for guested configure; otherwise get Cygnus style configure.
2102 - if test -f $ac_srcdir/configure.gnu; then
2103 - echo
2104 - $SHELL $ac_srcdir/configure.gnu --help=recursive
2105 - elif test -f $ac_srcdir/configure; then
2106 - echo
2107 - $SHELL $ac_srcdir/configure --help=recursive
2108 - elif test -f $ac_srcdir/configure.ac ||
2109 - test -f $ac_srcdir/configure.in; then
2110 - echo
2111 - $ac_configure --help
2112 + ac_top_srcdir=$srcdir
2113 + ac_abs_top_srcdir=$srcdir ;;
2114 + *) # Relative name.
2115 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
2116 + ac_top_srcdir=$ac_top_build_prefix$srcdir
2117 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
2118 +esac
2119 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
2120 +
2121 + cd "$ac_dir" || { ac_status=$?; continue; }
2122 + # Check for guested configure.
2123 + if test -f "$ac_srcdir/configure.gnu"; then
2124 + echo &&
2125 + $SHELL "$ac_srcdir/configure.gnu" --help=recursive
2126 + elif test -f "$ac_srcdir/configure"; then
2127 + echo &&
2128 + $SHELL "$ac_srcdir/configure" --help=recursive
2129 else
2130 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
2131 - fi
2132 - cd "$ac_popdir"
2133 + fi || ac_status=$?
2134 + cd "$ac_pwd" || { ac_status=$?; break; }
2135 done
2136 fi
2137
2138 -test -n "$ac_init_help" && exit 0
2139 +test -n "$ac_init_help" && exit $ac_status
2140 if $ac_init_version; then
2141 cat <<\_ACEOF
2142 libgphoto2_port configure 0.6.1
2143 -generated by GNU Autoconf 2.59
2144 +generated by GNU Autoconf 2.61
2145
2146 -Copyright (C) 2003 Free Software Foundation, Inc.
2147 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2148 +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
2149 This configure script is free software; the Free Software Foundation
2150 gives unlimited permission to copy, distribute and modify it.
2151 _ACEOF
2152 - exit 0
2153 + exit
2154 fi
2155 -exec 5>config.log
2156 -cat >&5 <<_ACEOF
2157 +cat >config.log <<_ACEOF
2158 This file contains any messages produced by compilers while
2159 running configure, to aid debugging if configure makes a mistake.
2160
2161 It was created by libgphoto2_port $as_me 0.6.1, which was
2162 -generated by GNU Autoconf 2.59. Invocation command line was
2163 +generated by GNU Autoconf 2.61. Invocation command line was
2164
2165 $ $0 $@
2166
2167 _ACEOF
2168 +exec 5>>config.log
2169 {
2170 cat <<_ASUNAME
2171 ## --------- ##
2172 @@ -1254,7 +1689,7 @@
2173 /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
2174 /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
2175 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
2176 -hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
2177 +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
2178 /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
2179 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
2180 /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
2181 @@ -1268,6 +1703,7 @@
2182 test -z "$as_dir" && as_dir=.
2183 echo "PATH: $as_dir"
2184 done
2185 +IFS=$as_save_IFS
2186
2187 } >&5
2188
2189 @@ -1289,7 +1725,6 @@
2190 ac_configure_args=
2191 ac_configure_args0=
2192 ac_configure_args1=
2193 -ac_sep=
2194 ac_must_keep_next=false
2195 for ac_pass in 1 2
2196 do
2197 @@ -1300,7 +1735,7 @@
2198 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
2199 | -silent | --silent | --silen | --sile | --sil)
2200 continue ;;
2201 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
2202 + *\'*)
2203 ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
2204 esac
2205 case $ac_pass in
2206 @@ -1322,9 +1757,7 @@
2207 -* ) ac_must_keep_next=true ;;
2208 esac
2209 fi
2210 - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
2211 - # Get rid of the leading space.
2212 - ac_sep=" "
2213 + ac_configure_args="$ac_configure_args '$ac_arg'"
2214 ;;
2215 esac
2216 done
2217 @@ -1335,8 +1768,8 @@
2218 # When interrupted or exit'd, cleanup temporary files, and complete
2219 # config.log. We remove comments because anyway the quotes in there
2220 # would cause problems or look ugly.
2221 -# WARNING: Be sure not to use single quotes in there, as some shells,
2222 -# such as our DU 5.0 friend, will then `close' the trap.
2223 +# WARNING: Use '\'' to represent an apostrophe within the trap.
2224 +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
2225 trap 'exit_status=$?
2226 # Save into config.log some information that might help in debugging.
2227 {
2228 @@ -1349,20 +1782,34 @@
2229 _ASBOX
2230 echo
2231 # The following way of writing the cache mishandles newlines in values,
2232 -{
2233 +(
2234 + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
2235 + eval ac_val=\$$ac_var
2236 + case $ac_val in #(
2237 + *${as_nl}*)
2238 + case $ac_var in #(
2239 + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
2240 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
2241 + esac
2242 + case $ac_var in #(
2243 + _ | IFS | as_nl) ;; #(
2244 + *) $as_unset $ac_var ;;
2245 + esac ;;
2246 + esac
2247 + done
2248 (set) 2>&1 |
2249 - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
2250 - *ac_space=\ *)
2251 + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
2252 + *${as_nl}ac_space=\ *)
2253 sed -n \
2254 - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
2255 - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
2256 - ;;
2257 + "s/'\''/'\''\\\\'\'''\''/g;
2258 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
2259 + ;; #(
2260 *)
2261 - sed -n \
2262 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
2263 + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
2264 ;;
2265 - esac;
2266 -}
2267 + esac |
2268 + sort
2269 +)
2270 echo
2271
2272 cat <<\_ASBOX
2273 @@ -1373,22 +1820,28 @@
2274 echo
2275 for ac_var in $ac_subst_vars
2276 do
2277 - eval ac_val=$`echo $ac_var`
2278 - echo "$ac_var='"'"'$ac_val'"'"'"
2279 + eval ac_val=\$$ac_var
2280 + case $ac_val in
2281 + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
2282 + esac
2283 + echo "$ac_var='\''$ac_val'\''"
2284 done | sort
2285 echo
2286
2287 if test -n "$ac_subst_files"; then
2288 cat <<\_ASBOX
2289 -## ------------- ##
2290 -## Output files. ##
2291 -## ------------- ##
2292 +## ------------------- ##
2293 +## File substitutions. ##
2294 +## ------------------- ##
2295 _ASBOX
2296 echo
2297 for ac_var in $ac_subst_files
2298 do
2299 - eval ac_val=$`echo $ac_var`
2300 - echo "$ac_var='"'"'$ac_val'"'"'"
2301 + eval ac_val=\$$ac_var
2302 + case $ac_val in
2303 + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
2304 + esac
2305 + echo "$ac_var='\''$ac_val'\''"
2306 done | sort
2307 echo
2308 fi
2309 @@ -1400,26 +1853,24 @@
2310 ## ----------- ##
2311 _ASBOX
2312 echo
2313 - sed "/^$/d" confdefs.h | sort
2314 + cat confdefs.h
2315 echo
2316 fi
2317 test "$ac_signal" != 0 &&
2318 echo "$as_me: caught signal $ac_signal"
2319 echo "$as_me: exit $exit_status"
2320 } >&5
2321 - rm -f core *.core &&
2322 - rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
2323 + rm -f core *.core core.conftest.* &&
2324 + rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
2325 exit $exit_status
2326 - ' 0
2327 +' 0
2328 for ac_signal in 1 2 13 15; do
2329 trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
2330 done
2331 ac_signal=0
2332
2333 # confdefs.h avoids OS command line length limits that DEFS can exceed.
2334 -rm -rf conftest* confdefs.h
2335 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
2336 -echo >confdefs.h
2337 +rm -f -r conftest* confdefs.h
2338
2339 # Predefined preprocessor variables.
2340
2341 @@ -1450,14 +1901,17 @@
2342
2343 # Let the site file select an alternate cache file if it wants to.
2344 # Prefer explicitly selected file to automatically selected ones.
2345 -if test -z "$CONFIG_SITE"; then
2346 - if test "x$prefix" != xNONE; then
2347 - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
2348 - else
2349 - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
2350 - fi
2351 +if test -n "$CONFIG_SITE"; then
2352 + set x "$CONFIG_SITE"
2353 +elif test "x$prefix" != xNONE; then
2354 + set x "$prefix/share/config.site" "$prefix/etc/config.site"
2355 +else
2356 + set x "$ac_default_prefix/share/config.site" \
2357 + "$ac_default_prefix/etc/config.site"
2358 fi
2359 -for ac_site_file in $CONFIG_SITE; do
2360 +shift
2361 +for ac_site_file
2362 +do
2363 if test -r "$ac_site_file"; then
2364 { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
2365 echo "$as_me: loading site script $ac_site_file" >&6;}
2366 @@ -1473,8 +1927,8 @@
2367 { echo "$as_me:$LINENO: loading cache $cache_file" >&5
2368 echo "$as_me: loading cache $cache_file" >&6;}
2369 case $cache_file in
2370 - [\\/]* | ?:[\\/]* ) . $cache_file;;
2371 - *) . ./$cache_file;;
2372 + [\\/]* | ?:[\\/]* ) . "$cache_file";;
2373 + *) . "./$cache_file";;
2374 esac
2375 fi
2376 else
2377 @@ -1486,12 +1940,11 @@
2378 # Check that the precious variables saved in the cache have kept the same
2379 # value.
2380 ac_cache_corrupted=false
2381 -for ac_var in `(set) 2>&1 |
2382 - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
2383 +for ac_var in $ac_precious_vars; do
2384 eval ac_old_set=\$ac_cv_env_${ac_var}_set
2385 eval ac_new_set=\$ac_env_${ac_var}_set
2386 - eval ac_old_val="\$ac_cv_env_${ac_var}_value"
2387 - eval ac_new_val="\$ac_env_${ac_var}_value"
2388 + eval ac_old_val=\$ac_cv_env_${ac_var}_value
2389 + eval ac_new_val=\$ac_env_${ac_var}_value
2390 case $ac_old_set,$ac_new_set in
2391 set,)
2392 { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
2393 @@ -1516,8 +1969,7 @@
2394 # Pass precious variables to config.status.
2395 if test "$ac_new_set" = set; then
2396 case $ac_new_val in
2397 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
2398 - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
2399 + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
2400 *) ac_arg=$ac_var=$ac_new_val ;;
2401 esac
2402 case " $ac_configure_args " in
2403 @@ -1534,12 +1986,6 @@
2404 { (exit 1); exit 1; }; }
2405 fi
2406
2407 -ac_ext=c
2408 -ac_cpp='$CPP $CPPFLAGS'
2409 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2410 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2411 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
2412 -
2413
2414
2415
2416 @@ -1564,47 +2010,48 @@
2417
2418
2419
2420 +ac_ext=c
2421 +ac_cpp='$CPP $CPPFLAGS'
2422 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2423 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2424 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
2425
2426
2427
2428 - ac_config_headers="$ac_config_headers config.h"
2429 +ac_config_headers="$ac_config_headers config.h"
2430
2431 -case m4 in
2432 - [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;;
2433 - *) ac_macro_dir=$srcdir/m4 ;;
2434 -esac
2435 -if test -d "$ac_macro_dir"; then :
2436 -else
2437 - { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5
2438 -echo "$as_me: error: cannot find macro directory \`m4'" >&2;}
2439 - { (exit 1); exit 1; }; }
2440 -fi
2441
2442 am__api_version="1.9"
2443 ac_aux_dir=
2444 -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
2445 - if test -f $ac_dir/install-sh; then
2446 +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2447 + if test -f "$ac_dir/install-sh"; then
2448 ac_aux_dir=$ac_dir
2449 ac_install_sh="$ac_aux_dir/install-sh -c"
2450 break
2451 - elif test -f $ac_dir/install.sh; then
2452 + elif test -f "$ac_dir/install.sh"; then
2453 ac_aux_dir=$ac_dir
2454 ac_install_sh="$ac_aux_dir/install.sh -c"
2455 break
2456 - elif test -f $ac_dir/shtool; then
2457 + elif test -f "$ac_dir/shtool"; then
2458 ac_aux_dir=$ac_dir
2459 ac_install_sh="$ac_aux_dir/shtool install -c"
2460 break
2461 fi
2462 done
2463 if test -z "$ac_aux_dir"; then
2464 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
2465 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
2466 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
2467 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
2468 { (exit 1); exit 1; }; }
2469 fi
2470 -ac_config_guess="$SHELL $ac_aux_dir/config.guess"
2471 -ac_config_sub="$SHELL $ac_aux_dir/config.sub"
2472 -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
2473 +
2474 +# These three variables are undocumented and unsupported,
2475 +# and are intended to be withdrawn in a future Autoconf release.
2476 +# They can cause serious problems if a builder's source tree is in a directory
2477 +# whose full name contains unusual characters.
2478 +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
2479 +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
2480 +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
2481 +
2482
2483 # Find a good install program. We prefer a C program (faster),
2484 # so one script is as good as another. But avoid the broken or
2485 @@ -1619,8 +2066,8 @@
2486 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2487 # OS/2's system install, which has a completely different semantic
2488 # ./install, which can be erroneously created by make from ./install.sh.
2489 -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2490 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
2491 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2492 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
2493 if test -z "$INSTALL"; then
2494 if test "${ac_cv_path_install+set}" = set; then
2495 echo $ECHO_N "(cached) $ECHO_C" >&6
2496 @@ -1642,7 +2089,7 @@
2497 # by default.
2498 for ac_prog in ginstall scoinst install; do
2499 for ac_exec_ext in '' $ac_executable_extensions; do
2500 - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2501 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2502 if test $ac_prog = install &&
2503 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2504 # AIX install. It has an incompatible calling convention.
2505 @@ -1661,21 +2108,22 @@
2506 ;;
2507 esac
2508 done
2509 +IFS=$as_save_IFS
2510
2511
2512 fi
2513 if test "${ac_cv_path_install+set}" = set; then
2514 INSTALL=$ac_cv_path_install
2515 else
2516 - # As a last resort, use the slow shell script. We don't cache a
2517 - # path for INSTALL within a source directory, because that will
2518 + # As a last resort, use the slow shell script. Don't cache a
2519 + # value for INSTALL within a source directory, because that will
2520 # break other packages using the cache if that directory is
2521 - # removed, or if the path is relative.
2522 + # removed, or if the value is a relative name.
2523 INSTALL=$ac_install_sh
2524 fi
2525 fi
2526 -echo "$as_me:$LINENO: result: $INSTALL" >&5
2527 -echo "${ECHO_T}$INSTALL" >&6
2528 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5
2529 +echo "${ECHO_T}$INSTALL" >&6; }
2530
2531 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2532 # It thinks the first close brace ends the variable substitution.
2533 @@ -1685,8 +2133,8 @@
2534
2535 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2536
2537 -echo "$as_me:$LINENO: checking whether build environment is sane" >&5
2538 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
2539 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
2540 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
2541 # Just in case
2542 sleep 1
2543 echo timestamp > conftest.file
2544 @@ -1728,20 +2176,20 @@
2545 Check your system clock" >&2;}
2546 { (exit 1); exit 1; }; }
2547 fi
2548 -echo "$as_me:$LINENO: result: yes" >&5
2549 -echo "${ECHO_T}yes" >&6
2550 +{ echo "$as_me:$LINENO: result: yes" >&5
2551 +echo "${ECHO_T}yes" >&6; }
2552 test "$program_prefix" != NONE &&
2553 - program_transform_name="s,^,$program_prefix,;$program_transform_name"
2554 + program_transform_name="s&^&$program_prefix&;$program_transform_name"
2555 # Use a double $ so make ignores it.
2556 test "$program_suffix" != NONE &&
2557 - program_transform_name="s,\$,$program_suffix,;$program_transform_name"
2558 + program_transform_name="s&\$&$program_suffix&;$program_transform_name"
2559 # Double any \ or $. echo might interpret backslashes.
2560 # By default was `s,x,x', remove it if useless.
2561 cat <<\_ACEOF >conftest.sed
2562 s/[\\$]/&&/g;s/;s,x,x,$//
2563 _ACEOF
2564 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
2565 -rm conftest.sed
2566 +rm -f conftest.sed
2567
2568 # expand $ac_aux_dir to an absolute path
2569 am_aux_dir=`cd $ac_aux_dir && pwd`
2570 @@ -1793,8 +2241,8 @@
2571 do
2572 # Extract the first word of "$ac_prog", so it can be a program name with args.
2573 set dummy $ac_prog; ac_word=$2
2574 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2575 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2576 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2577 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2578 if test "${ac_cv_prog_AWK+set}" = set; then
2579 echo $ECHO_N "(cached) $ECHO_C" >&6
2580 else
2581 @@ -1807,54 +2255,57 @@
2582 IFS=$as_save_IFS
2583 test -z "$as_dir" && as_dir=.
2584 for ac_exec_ext in '' $ac_executable_extensions; do
2585 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2586 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2587 ac_cv_prog_AWK="$ac_prog"
2588 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2589 break 2
2590 fi
2591 done
2592 done
2593 +IFS=$as_save_IFS
2594
2595 fi
2596 fi
2597 AWK=$ac_cv_prog_AWK
2598 if test -n "$AWK"; then
2599 - echo "$as_me:$LINENO: result: $AWK" >&5
2600 -echo "${ECHO_T}$AWK" >&6
2601 + { echo "$as_me:$LINENO: result: $AWK" >&5
2602 +echo "${ECHO_T}$AWK" >&6; }
2603 else
2604 - echo "$as_me:$LINENO: result: no" >&5
2605 -echo "${ECHO_T}no" >&6
2606 + { echo "$as_me:$LINENO: result: no" >&5
2607 +echo "${ECHO_T}no" >&6; }
2608 fi
2609
2610 +
2611 test -n "$AWK" && break
2612 done
2613
2614 -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2615 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
2616 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
2617 -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
2618 +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2619 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
2620 +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2621 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
2622 echo $ECHO_N "(cached) $ECHO_C" >&6
2623 else
2624 cat >conftest.make <<\_ACEOF
2625 +SHELL = /bin/sh
2626 all:
2627 - @echo 'ac_maketemp="$(MAKE)"'
2628 + @echo '@@@%%%=$(MAKE)=@@@%%%'
2629 _ACEOF
2630 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
2631 -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
2632 -if test -n "$ac_maketemp"; then
2633 - eval ac_cv_prog_make_${ac_make}_set=yes
2634 -else
2635 - eval ac_cv_prog_make_${ac_make}_set=no
2636 -fi
2637 +case `${MAKE-make} -f conftest.make 2>/dev/null` in
2638 + *@@@%%%=?*=@@@%%%*)
2639 + eval ac_cv_prog_make_${ac_make}_set=yes;;
2640 + *)
2641 + eval ac_cv_prog_make_${ac_make}_set=no;;
2642 +esac
2643 rm -f conftest.make
2644 fi
2645 -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
2646 - echo "$as_me:$LINENO: result: yes" >&5
2647 -echo "${ECHO_T}yes" >&6
2648 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2649 + { echo "$as_me:$LINENO: result: yes" >&5
2650 +echo "${ECHO_T}yes" >&6; }
2651 SET_MAKE=
2652 else
2653 - echo "$as_me:$LINENO: result: no" >&5
2654 -echo "${ECHO_T}no" >&6
2655 + { echo "$as_me:$LINENO: result: no" >&5
2656 +echo "${ECHO_T}no" >&6; }
2657 SET_MAKE="MAKE=${MAKE-make}"
2658 fi
2659
2660 @@ -1925,8 +2376,8 @@
2661 if test -n "$ac_tool_prefix"; then
2662 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2663 set dummy ${ac_tool_prefix}strip; ac_word=$2
2664 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2665 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2666 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2667 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2668 if test "${ac_cv_prog_STRIP+set}" = set; then
2669 echo $ECHO_N "(cached) $ECHO_C" >&6
2670 else
2671 @@ -1939,32 +2390,34 @@
2672 IFS=$as_save_IFS
2673 test -z "$as_dir" && as_dir=.
2674 for ac_exec_ext in '' $ac_executable_extensions; do
2675 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2676 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2677 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2678 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2679 break 2
2680 fi
2681 done
2682 done
2683 +IFS=$as_save_IFS
2684
2685 fi
2686 fi
2687 STRIP=$ac_cv_prog_STRIP
2688 if test -n "$STRIP"; then
2689 - echo "$as_me:$LINENO: result: $STRIP" >&5
2690 -echo "${ECHO_T}$STRIP" >&6
2691 + { echo "$as_me:$LINENO: result: $STRIP" >&5
2692 +echo "${ECHO_T}$STRIP" >&6; }
2693 else
2694 - echo "$as_me:$LINENO: result: no" >&5
2695 -echo "${ECHO_T}no" >&6
2696 + { echo "$as_me:$LINENO: result: no" >&5
2697 +echo "${ECHO_T}no" >&6; }
2698 fi
2699
2700 +
2701 fi
2702 if test -z "$ac_cv_prog_STRIP"; then
2703 ac_ct_STRIP=$STRIP
2704 # Extract the first word of "strip", so it can be a program name with args.
2705 set dummy strip; ac_word=$2
2706 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2707 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2708 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2709 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2710 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
2711 echo $ECHO_N "(cached) $ECHO_C" >&6
2712 else
2713 @@ -1977,27 +2430,41 @@
2714 IFS=$as_save_IFS
2715 test -z "$as_dir" && as_dir=.
2716 for ac_exec_ext in '' $ac_executable_extensions; do
2717 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2718 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2719 ac_cv_prog_ac_ct_STRIP="strip"
2720 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2721 break 2
2722 fi
2723 done
2724 done
2725 +IFS=$as_save_IFS
2726
2727 - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
2728 fi
2729 fi
2730 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2731 if test -n "$ac_ct_STRIP"; then
2732 - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2733 -echo "${ECHO_T}$ac_ct_STRIP" >&6
2734 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2735 +echo "${ECHO_T}$ac_ct_STRIP" >&6; }
2736 else
2737 - echo "$as_me:$LINENO: result: no" >&5
2738 -echo "${ECHO_T}no" >&6
2739 + { echo "$as_me:$LINENO: result: no" >&5
2740 +echo "${ECHO_T}no" >&6; }
2741 fi
2742
2743 - STRIP=$ac_ct_STRIP
2744 + if test "x$ac_ct_STRIP" = x; then
2745 + STRIP=":"
2746 + else
2747 + case $cross_compiling:$ac_tool_warned in
2748 +yes:)
2749 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2750 +whose name does not start with the host triplet. If you think this
2751 +configuration is useful to you, please write to autoconf@gnu.org." >&5
2752 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2753 +whose name does not start with the host triplet. If you think this
2754 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2755 +ac_tool_warned=yes ;;
2756 +esac
2757 + STRIP=$ac_ct_STRIP
2758 + fi
2759 else
2760 STRIP="$ac_cv_prog_STRIP"
2761 fi
2762 @@ -2039,8 +2506,8 @@
2763 if test -n "$ac_tool_prefix"; then
2764 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2765 set dummy ${ac_tool_prefix}gcc; ac_word=$2
2766 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2767 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2768 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2769 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2770 if test "${ac_cv_prog_CC+set}" = set; then
2771 echo $ECHO_N "(cached) $ECHO_C" >&6
2772 else
2773 @@ -2053,32 +2520,34 @@
2774 IFS=$as_save_IFS
2775 test -z "$as_dir" && as_dir=.
2776 for ac_exec_ext in '' $ac_executable_extensions; do
2777 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2778 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2779 ac_cv_prog_CC="${ac_tool_prefix}gcc"
2780 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2781 break 2
2782 fi
2783 done
2784 done
2785 +IFS=$as_save_IFS
2786
2787 fi
2788 fi
2789 CC=$ac_cv_prog_CC
2790 if test -n "$CC"; then
2791 - echo "$as_me:$LINENO: result: $CC" >&5
2792 -echo "${ECHO_T}$CC" >&6
2793 + { echo "$as_me:$LINENO: result: $CC" >&5
2794 +echo "${ECHO_T}$CC" >&6; }
2795 else
2796 - echo "$as_me:$LINENO: result: no" >&5
2797 -echo "${ECHO_T}no" >&6
2798 + { echo "$as_me:$LINENO: result: no" >&5
2799 +echo "${ECHO_T}no" >&6; }
2800 fi
2801
2802 +
2803 fi
2804 if test -z "$ac_cv_prog_CC"; then
2805 ac_ct_CC=$CC
2806 # Extract the first word of "gcc", so it can be a program name with args.
2807 set dummy gcc; ac_word=$2
2808 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2809 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2810 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2811 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2812 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2813 echo $ECHO_N "(cached) $ECHO_C" >&6
2814 else
2815 @@ -2091,36 +2560,51 @@
2816 IFS=$as_save_IFS
2817 test -z "$as_dir" && as_dir=.
2818 for ac_exec_ext in '' $ac_executable_extensions; do
2819 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2820 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2821 ac_cv_prog_ac_ct_CC="gcc"
2822 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2823 break 2
2824 fi
2825 done
2826 done
2827 +IFS=$as_save_IFS
2828
2829 fi
2830 fi
2831 ac_ct_CC=$ac_cv_prog_ac_ct_CC
2832 if test -n "$ac_ct_CC"; then
2833 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2834 -echo "${ECHO_T}$ac_ct_CC" >&6
2835 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2836 +echo "${ECHO_T}$ac_ct_CC" >&6; }
2837 else
2838 - echo "$as_me:$LINENO: result: no" >&5
2839 -echo "${ECHO_T}no" >&6
2840 + { echo "$as_me:$LINENO: result: no" >&5
2841 +echo "${ECHO_T}no" >&6; }
2842 fi
2843
2844 - CC=$ac_ct_CC
2845 + if test "x$ac_ct_CC" = x; then
2846 + CC=""
2847 + else
2848 + case $cross_compiling:$ac_tool_warned in
2849 +yes:)
2850 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2851 +whose name does not start with the host triplet. If you think this
2852 +configuration is useful to you, please write to autoconf@gnu.org." >&5
2853 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2854 +whose name does not start with the host triplet. If you think this
2855 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2856 +ac_tool_warned=yes ;;
2857 +esac
2858 + CC=$ac_ct_CC
2859 + fi
2860 else
2861 CC="$ac_cv_prog_CC"
2862 fi
2863
2864 if test -z "$CC"; then
2865 - if test -n "$ac_tool_prefix"; then
2866 - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
2867 + if test -n "$ac_tool_prefix"; then
2868 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
2869 set dummy ${ac_tool_prefix}cc; ac_word=$2
2870 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2871 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2872 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2873 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2874 if test "${ac_cv_prog_CC+set}" = set; then
2875 echo $ECHO_N "(cached) $ECHO_C" >&6
2876 else
2877 @@ -2133,74 +2617,34 @@
2878 IFS=$as_save_IFS
2879 test -z "$as_dir" && as_dir=.
2880 for ac_exec_ext in '' $ac_executable_extensions; do
2881 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2882 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2883 ac_cv_prog_CC="${ac_tool_prefix}cc"
2884 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2885 break 2
2886 fi
2887 done
2888 done
2889 +IFS=$as_save_IFS
2890
2891 fi
2892 fi
2893 CC=$ac_cv_prog_CC
2894 if test -n "$CC"; then
2895 - echo "$as_me:$LINENO: result: $CC" >&5
2896 -echo "${ECHO_T}$CC" >&6
2897 -else
2898 - echo "$as_me:$LINENO: result: no" >&5
2899 -echo "${ECHO_T}no" >&6
2900 -fi
2901 -
2902 -fi
2903 -if test -z "$ac_cv_prog_CC"; then
2904 - ac_ct_CC=$CC
2905 - # Extract the first word of "cc", so it can be a program name with args.
2906 -set dummy cc; ac_word=$2
2907 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2908 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2909 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2910 - echo $ECHO_N "(cached) $ECHO_C" >&6
2911 -else
2912 - if test -n "$ac_ct_CC"; then
2913 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
2914 -else
2915 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2916 -for as_dir in $PATH
2917 -do
2918 - IFS=$as_save_IFS
2919 - test -z "$as_dir" && as_dir=.
2920 - for ac_exec_ext in '' $ac_executable_extensions; do
2921 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2922 - ac_cv_prog_ac_ct_CC="cc"
2923 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2924 - break 2
2925 - fi
2926 -done
2927 -done
2928 -
2929 -fi
2930 -fi
2931 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
2932 -if test -n "$ac_ct_CC"; then
2933 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2934 -echo "${ECHO_T}$ac_ct_CC" >&6
2935 + { echo "$as_me:$LINENO: result: $CC" >&5
2936 +echo "${ECHO_T}$CC" >&6; }
2937 else
2938 - echo "$as_me:$LINENO: result: no" >&5
2939 -echo "${ECHO_T}no" >&6
2940 + { echo "$as_me:$LINENO: result: no" >&5
2941 +echo "${ECHO_T}no" >&6; }
2942 fi
2943
2944 - CC=$ac_ct_CC
2945 -else
2946 - CC="$ac_cv_prog_CC"
2947 -fi
2948
2949 + fi
2950 fi
2951 if test -z "$CC"; then
2952 # Extract the first word of "cc", so it can be a program name with args.
2953 set dummy cc; ac_word=$2
2954 -echo "$as_me:$LINENO: checking for $ac_word" >&5
2955 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2956 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2957 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2958 if test "${ac_cv_prog_CC+set}" = set; then
2959 echo $ECHO_N "(cached) $ECHO_C" >&6
2960 else
2961 @@ -2214,7 +2658,7 @@
2962 IFS=$as_save_IFS
2963 test -z "$as_dir" && as_dir=.
2964 for ac_exec_ext in '' $ac_executable_extensions; do
2965 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2966 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2967 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
2968 ac_prog_rejected=yes
2969 continue
2970 @@ -2225,6 +2669,7 @@
2971 fi
2972 done
2973 done
2974 +IFS=$as_save_IFS
2975
2976 if test $ac_prog_rejected = yes; then
2977 # We found a bogon in the path, so make sure we never use it.
2978 @@ -2242,22 +2687,23 @@
2979 fi
2980 CC=$ac_cv_prog_CC
2981 if test -n "$CC"; then
2982 - echo "$as_me:$LINENO: result: $CC" >&5
2983 -echo "${ECHO_T}$CC" >&6
2984 + { echo "$as_me:$LINENO: result: $CC" >&5
2985 +echo "${ECHO_T}$CC" >&6; }
2986 else
2987 - echo "$as_me:$LINENO: result: no" >&5
2988 -echo "${ECHO_T}no" >&6
2989 + { echo "$as_me:$LINENO: result: no" >&5
2990 +echo "${ECHO_T}no" >&6; }
2991 fi
2992
2993 +
2994 fi
2995 if test -z "$CC"; then
2996 if test -n "$ac_tool_prefix"; then
2997 - for ac_prog in cl
2998 + for ac_prog in cl.exe
2999 do
3000 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3001 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3002 -echo "$as_me:$LINENO: checking for $ac_word" >&5
3003 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3004 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3005 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3006 if test "${ac_cv_prog_CC+set}" = set; then
3007 echo $ECHO_N "(cached) $ECHO_C" >&6
3008 else
3009 @@ -2270,36 +2716,38 @@
3010 IFS=$as_save_IFS
3011 test -z "$as_dir" && as_dir=.
3012 for ac_exec_ext in '' $ac_executable_extensions; do
3013 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3014 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3015 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3016 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3017 break 2
3018 fi
3019 done
3020 done
3021 +IFS=$as_save_IFS
3022
3023 fi
3024 fi
3025 CC=$ac_cv_prog_CC
3026 if test -n "$CC"; then
3027 - echo "$as_me:$LINENO: result: $CC" >&5
3028 -echo "${ECHO_T}$CC" >&6
3029 + { echo "$as_me:$LINENO: result: $CC" >&5
3030 +echo "${ECHO_T}$CC" >&6; }
3031 else
3032 - echo "$as_me:$LINENO: result: no" >&5
3033 -echo "${ECHO_T}no" >&6
3034 + { echo "$as_me:$LINENO: result: no" >&5
3035 +echo "${ECHO_T}no" >&6; }
3036 fi
3037
3038 +
3039 test -n "$CC" && break
3040 done
3041 fi
3042 if test -z "$CC"; then
3043 ac_ct_CC=$CC
3044 - for ac_prog in cl
3045 + for ac_prog in cl.exe
3046 do
3047 # Extract the first word of "$ac_prog", so it can be a program name with args.
3048 set dummy $ac_prog; ac_word=$2
3049 -echo "$as_me:$LINENO: checking for $ac_word" >&5
3050 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3051 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3052 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3053 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3054 echo $ECHO_N "(cached) $ECHO_C" >&6
3055 else
3056 @@ -2312,29 +2760,45 @@
3057 IFS=$as_save_IFS
3058 test -z "$as_dir" && as_dir=.
3059 for ac_exec_ext in '' $ac_executable_extensions; do
3060 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3061 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3062 ac_cv_prog_ac_ct_CC="$ac_prog"
3063 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3064 break 2
3065 fi
3066 done
3067 done
3068 +IFS=$as_save_IFS
3069
3070 fi
3071 fi
3072 ac_ct_CC=$ac_cv_prog_ac_ct_CC
3073 if test -n "$ac_ct_CC"; then
3074 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3075 -echo "${ECHO_T}$ac_ct_CC" >&6
3076 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3077 +echo "${ECHO_T}$ac_ct_CC" >&6; }
3078 else
3079 - echo "$as_me:$LINENO: result: no" >&5
3080 -echo "${ECHO_T}no" >&6
3081 + { echo "$as_me:$LINENO: result: no" >&5
3082 +echo "${ECHO_T}no" >&6; }
3083 fi
3084
3085 +
3086 test -n "$ac_ct_CC" && break
3087 done
3088
3089 - CC=$ac_ct_CC
3090 + if test "x$ac_ct_CC" = x; then
3091 + CC=""
3092 + else
3093 + case $cross_compiling:$ac_tool_warned in
3094 +yes:)
3095 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3096 +whose name does not start with the host triplet. If you think this
3097 +configuration is useful to you, please write to autoconf@gnu.org." >&5
3098 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3099 +whose name does not start with the host triplet. If you think this
3100 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3101 +ac_tool_warned=yes ;;
3102 +esac
3103 + CC=$ac_ct_CC
3104 + fi
3105 fi
3106
3107 fi
3108 @@ -2347,21 +2811,35 @@
3109 { (exit 1); exit 1; }; }
3110
3111 # Provide some information about the compiler.
3112 -echo "$as_me:$LINENO:" \
3113 - "checking for C compiler version" >&5
3114 +echo "$as_me:$LINENO: checking for C compiler version" >&5
3115 ac_compiler=`set X $ac_compile; echo $2`
3116 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
3117 - (eval $ac_compiler --version </dev/null >&5) 2>&5
3118 +{ (ac_try="$ac_compiler --version >&5"
3119 +case "(($ac_try" in
3120 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3121 + *) ac_try_echo=$ac_try;;
3122 +esac
3123 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3124 + (eval "$ac_compiler --version >&5") 2>&5
3125 ac_status=$?
3126 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3127 (exit $ac_status); }
3128 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
3129 - (eval $ac_compiler -v </dev/null >&5) 2>&5
3130 +{ (ac_try="$ac_compiler -v >&5"
3131 +case "(($ac_try" in
3132 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3133 + *) ac_try_echo=$ac_try;;
3134 +esac
3135 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3136 + (eval "$ac_compiler -v >&5") 2>&5
3137 ac_status=$?
3138 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3139 (exit $ac_status); }
3140 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
3141 - (eval $ac_compiler -V </dev/null >&5) 2>&5
3142 +{ (ac_try="$ac_compiler -V >&5"
3143 +case "(($ac_try" in
3144 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3145 + *) ac_try_echo=$ac_try;;
3146 +esac
3147 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3148 + (eval "$ac_compiler -V >&5") 2>&5
3149 ac_status=$?
3150 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3151 (exit $ac_status); }
3152 @@ -2386,47 +2864,77 @@
3153 # Try to create an executable without -o first, disregard a.out.
3154 # It will help us diagnose broken compilers, and finding out an intuition
3155 # of exeext.
3156 -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3157 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
3158 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3159 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
3160 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3161 -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
3162 - (eval $ac_link_default) 2>&5
3163 +#
3164 +# List of possible output files, starting from the most likely.
3165 +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
3166 +# only as a last resort. b.out is created by i960 compilers.
3167 +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
3168 +#
3169 +# The IRIX 6 linker writes into existing files which may not be
3170 +# executable, retaining their permissions. Remove them first so a
3171 +# subsequent execution test works.
3172 +ac_rmfiles=
3173 +for ac_file in $ac_files
3174 +do
3175 + case $ac_file in
3176 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
3177 + * ) ac_rmfiles="$ac_rmfiles $ac_file";;
3178 + esac
3179 +done
3180 +rm -f $ac_rmfiles
3181 +
3182 +if { (ac_try="$ac_link_default"
3183 +case "(($ac_try" in
3184 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3185 + *) ac_try_echo=$ac_try;;
3186 +esac
3187 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3188 + (eval "$ac_link_default") 2>&5
3189 ac_status=$?
3190 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3191 (exit $ac_status); }; then
3192 - # Find the output, starting from the most likely. This scheme is
3193 -# not robust to junk in `.', hence go to wildcards (a.*) only as a last
3194 -# resort.
3195 -
3196 -# Be careful to initialize this variable, since it used to be cached.
3197 -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
3198 -ac_cv_exeext=
3199 -# b.out is created by i960 compilers.
3200 -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
3201 + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
3202 +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
3203 +# in a Makefile. We should not override ac_cv_exeext if it was cached,
3204 +# so that the user can short-circuit this test for compilers unknown to
3205 +# Autoconf.
3206 +for ac_file in $ac_files ''
3207 do
3208 test -f "$ac_file" || continue
3209 case $ac_file in
3210 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
3211 - ;;
3212 - conftest.$ac_ext )
3213 - # This is the source file.
3214 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
3215 ;;
3216 [ab].out )
3217 # We found the default executable, but exeext='' is most
3218 # certainly right.
3219 break;;
3220 *.* )
3221 - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3222 - # FIXME: I believe we export ac_cv_exeext for Libtool,
3223 - # but it would be cool to find out if it's true. Does anybody
3224 - # maintain Libtool? --akim.
3225 - export ac_cv_exeext
3226 + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3227 + then :; else
3228 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3229 + fi
3230 + # We set ac_cv_exeext here because the later test for it is not
3231 + # safe: cross compilers may not add the suffix if given an `-o'
3232 + # argument, so we may need to know it at that point already.
3233 + # Even if this section looks crufty: it has the advantage of
3234 + # actually working.
3235 break;;
3236 * )
3237 break;;
3238 esac
3239 done
3240 +test "$ac_cv_exeext" = no && ac_cv_exeext=
3241 +
3242 else
3243 + ac_file=''
3244 +fi
3245 +
3246 +{ echo "$as_me:$LINENO: result: $ac_file" >&5
3247 +echo "${ECHO_T}$ac_file" >&6; }
3248 +if test -z "$ac_file"; then
3249 echo "$as_me: failed program was:" >&5
3250 sed 's/^/| /' conftest.$ac_ext >&5
3251
3252 @@ -2438,19 +2946,21 @@
3253 fi
3254
3255 ac_exeext=$ac_cv_exeext
3256 -echo "$as_me:$LINENO: result: $ac_file" >&5
3257 -echo "${ECHO_T}$ac_file" >&6
3258
3259 -# Check the compiler produces executables we can run. If not, either
3260 +# Check that the compiler produces executables we can run. If not, either
3261 # the compiler is broken, or we cross compile.
3262 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3263 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
3264 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3265 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
3266 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
3267 # If not cross compiling, check that we can run a simple program.
3268 if test "$cross_compiling" != yes; then
3269 if { ac_try='./$ac_file'
3270 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3271 - (eval $ac_try) 2>&5
3272 + { (case "(($ac_try" in
3273 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3274 + *) ac_try_echo=$ac_try;;
3275 +esac
3276 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3277 + (eval "$ac_try") 2>&5
3278 ac_status=$?
3279 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3280 (exit $ac_status); }; }; then
3281 @@ -2469,22 +2979,27 @@
3282 fi
3283 fi
3284 fi
3285 -echo "$as_me:$LINENO: result: yes" >&5
3286 -echo "${ECHO_T}yes" >&6
3287 +{ echo "$as_me:$LINENO: result: yes" >&5
3288 +echo "${ECHO_T}yes" >&6; }
3289
3290 rm -f a.out a.exe conftest$ac_cv_exeext b.out
3291 ac_clean_files=$ac_clean_files_save
3292 -# Check the compiler produces executables we can run. If not, either
3293 +# Check that the compiler produces executables we can run. If not, either
3294 # the compiler is broken, or we cross compile.
3295 -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3296 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
3297 -echo "$as_me:$LINENO: result: $cross_compiling" >&5
3298 -echo "${ECHO_T}$cross_compiling" >&6
3299 -
3300 -echo "$as_me:$LINENO: checking for suffix of executables" >&5
3301 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
3302 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3303 - (eval $ac_link) 2>&5
3304 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3305 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
3306 +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
3307 +echo "${ECHO_T}$cross_compiling" >&6; }
3308 +
3309 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
3310 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
3311 +if { (ac_try="$ac_link"
3312 +case "(($ac_try" in
3313 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3314 + *) ac_try_echo=$ac_try;;
3315 +esac
3316 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3317 + (eval "$ac_link") 2>&5
3318 ac_status=$?
3319 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3320 (exit $ac_status); }; then
3321 @@ -2495,9 +3010,8 @@
3322 for ac_file in conftest.exe conftest conftest.*; do
3323 test -f "$ac_file" || continue
3324 case $ac_file in
3325 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
3326 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
3327 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3328 - export ac_cv_exeext
3329 break;;
3330 * ) break;;
3331 esac
3332 @@ -2511,14 +3025,14 @@
3333 fi
3334
3335 rm -f conftest$ac_cv_exeext
3336 -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3337 -echo "${ECHO_T}$ac_cv_exeext" >&6
3338 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3339 +echo "${ECHO_T}$ac_cv_exeext" >&6; }
3340
3341 rm -f conftest.$ac_ext
3342 EXEEXT=$ac_cv_exeext
3343 ac_exeext=$EXEEXT
3344 -echo "$as_me:$LINENO: checking for suffix of object files" >&5
3345 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
3346 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
3347 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
3348 if test "${ac_cv_objext+set}" = set; then
3349 echo $ECHO_N "(cached) $ECHO_C" >&6
3350 else
3351 @@ -2538,14 +3052,20 @@
3352 }
3353 _ACEOF
3354 rm -f conftest.o conftest.obj
3355 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3356 - (eval $ac_compile) 2>&5
3357 +if { (ac_try="$ac_compile"
3358 +case "(($ac_try" in
3359 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3360 + *) ac_try_echo=$ac_try;;
3361 +esac
3362 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3363 + (eval "$ac_compile") 2>&5
3364 ac_status=$?
3365 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3366 (exit $ac_status); }; then
3367 - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
3368 + for ac_file in conftest.o conftest.obj conftest.*; do
3369 + test -f "$ac_file" || continue;
3370 case $ac_file in
3371 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
3372 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
3373 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
3374 break;;
3375 esac
3376 @@ -2563,12 +3083,12 @@
3377
3378 rm -f conftest.$ac_cv_objext conftest.$ac_ext
3379 fi
3380 -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3381 -echo "${ECHO_T}$ac_cv_objext" >&6
3382 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3383 +echo "${ECHO_T}$ac_cv_objext" >&6; }
3384 OBJEXT=$ac_cv_objext
3385 ac_objext=$OBJEXT
3386 -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3387 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
3388 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3389 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
3390 if test "${ac_cv_c_compiler_gnu+set}" = set; then
3391 echo $ECHO_N "(cached) $ECHO_C" >&6
3392 else
3393 @@ -2591,49 +3111,49 @@
3394 }
3395 _ACEOF
3396 rm -f conftest.$ac_objext
3397 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3398 - (eval $ac_compile) 2>conftest.er1
3399 +if { (ac_try="$ac_compile"
3400 +case "(($ac_try" in
3401 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3402 + *) ac_try_echo=$ac_try;;
3403 +esac
3404 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3405 + (eval "$ac_compile") 2>conftest.er1
3406 ac_status=$?
3407 grep -v '^ *+' conftest.er1 >conftest.err
3408 rm -f conftest.er1
3409 cat conftest.err >&5
3410 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3411 - (exit $ac_status); } &&
3412 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3413 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3414 - (eval $ac_try) 2>&5
3415 - ac_status=$?
3416 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3417 - (exit $ac_status); }; } &&
3418 - { ac_try='test -s conftest.$ac_objext'
3419 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3420 - (eval $ac_try) 2>&5
3421 - ac_status=$?
3422 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3423 - (exit $ac_status); }; }; then
3424 + (exit $ac_status); } && {
3425 + test -z "$ac_c_werror_flag" ||
3426 + test ! -s conftest.err
3427 + } && test -s conftest.$ac_objext; then
3428 ac_compiler_gnu=yes
3429 else
3430 echo "$as_me: failed program was:" >&5
3431 sed 's/^/| /' conftest.$ac_ext >&5
3432
3433 -ac_compiler_gnu=no
3434 + ac_compiler_gnu=no
3435 fi
3436 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3437 +
3438 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3439 ac_cv_c_compiler_gnu=$ac_compiler_gnu
3440
3441 fi
3442 -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3443 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
3444 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3445 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
3446 GCC=`test $ac_compiler_gnu = yes && echo yes`
3447 ac_test_CFLAGS=${CFLAGS+set}
3448 ac_save_CFLAGS=$CFLAGS
3449 -CFLAGS="-g"
3450 -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3451 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
3452 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3453 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
3454 if test "${ac_cv_prog_cc_g+set}" = set; then
3455 echo $ECHO_N "(cached) $ECHO_C" >&6
3456 else
3457 - cat >conftest.$ac_ext <<_ACEOF
3458 + ac_save_c_werror_flag=$ac_c_werror_flag
3459 + ac_c_werror_flag=yes
3460 + ac_cv_prog_cc_g=no
3461 + CFLAGS="-g"
3462 + cat >conftest.$ac_ext <<_ACEOF
3463 /* confdefs.h. */
3464 _ACEOF
3465 cat confdefs.h >>conftest.$ac_ext
3466 @@ -2649,37 +3169,118 @@
3467 }
3468 _ACEOF
3469 rm -f conftest.$ac_objext
3470 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3471 - (eval $ac_compile) 2>conftest.er1
3472 +if { (ac_try="$ac_compile"
3473 +case "(($ac_try" in
3474 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3475 + *) ac_try_echo=$ac_try;;
3476 +esac
3477 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3478 + (eval "$ac_compile") 2>conftest.er1
3479 ac_status=$?
3480 grep -v '^ *+' conftest.er1 >conftest.err
3481 rm -f conftest.er1
3482 cat conftest.err >&5
3483 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3484 - (exit $ac_status); } &&
3485 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3486 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3487 - (eval $ac_try) 2>&5
3488 + (exit $ac_status); } && {
3489 + test -z "$ac_c_werror_flag" ||
3490 + test ! -s conftest.err
3491 + } && test -s conftest.$ac_objext; then
3492 + ac_cv_prog_cc_g=yes
3493 +else
3494 + echo "$as_me: failed program was:" >&5
3495 +sed 's/^/| /' conftest.$ac_ext >&5
3496 +
3497 + CFLAGS=""
3498 + cat >conftest.$ac_ext <<_ACEOF
3499 +/* confdefs.h. */
3500 +_ACEOF
3501 +cat confdefs.h >>conftest.$ac_ext
3502 +cat >>conftest.$ac_ext <<_ACEOF
3503 +/* end confdefs.h. */
3504 +
3505 +int
3506 +main ()
3507 +{
3508 +
3509 + ;
3510 + return 0;
3511 +}
3512 +_ACEOF
3513 +rm -f conftest.$ac_objext
3514 +if { (ac_try="$ac_compile"
3515 +case "(($ac_try" in
3516 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3517 + *) ac_try_echo=$ac_try;;
3518 +esac
3519 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3520 + (eval "$ac_compile") 2>conftest.er1
3521 ac_status=$?
3522 + grep -v '^ *+' conftest.er1 >conftest.err
3523 + rm -f conftest.er1
3524 + cat conftest.err >&5
3525 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3526 - (exit $ac_status); }; } &&
3527 - { ac_try='test -s conftest.$ac_objext'
3528 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3529 - (eval $ac_try) 2>&5
3530 + (exit $ac_status); } && {
3531 + test -z "$ac_c_werror_flag" ||
3532 + test ! -s conftest.err
3533 + } && test -s conftest.$ac_objext; then
3534 + :
3535 +else
3536 + echo "$as_me: failed program was:" >&5
3537 +sed 's/^/| /' conftest.$ac_ext >&5
3538 +
3539 + ac_c_werror_flag=$ac_save_c_werror_flag
3540 + CFLAGS="-g"
3541 + cat >conftest.$ac_ext <<_ACEOF
3542 +/* confdefs.h. */
3543 +_ACEOF
3544 +cat confdefs.h >>conftest.$ac_ext
3545 +cat >>conftest.$ac_ext <<_ACEOF
3546 +/* end confdefs.h. */
3547 +
3548 +int
3549 +main ()
3550 +{
3551 +
3552 + ;
3553 + return 0;
3554 +}
3555 +_ACEOF
3556 +rm -f conftest.$ac_objext
3557 +if { (ac_try="$ac_compile"
3558 +case "(($ac_try" in
3559 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3560 + *) ac_try_echo=$ac_try;;
3561 +esac
3562 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3563 + (eval "$ac_compile") 2>conftest.er1
3564 ac_status=$?
3565 + grep -v '^ *+' conftest.er1 >conftest.err
3566 + rm -f conftest.er1
3567 + cat conftest.err >&5
3568 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3569 - (exit $ac_status); }; }; then
3570 + (exit $ac_status); } && {
3571 + test -z "$ac_c_werror_flag" ||
3572 + test ! -s conftest.err
3573 + } && test -s conftest.$ac_objext; then
3574 ac_cv_prog_cc_g=yes
3575 else
3576 echo "$as_me: failed program was:" >&5
3577 sed 's/^/| /' conftest.$ac_ext >&5
3578
3579 -ac_cv_prog_cc_g=no
3580 +
3581 +fi
3582 +
3583 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3584 +fi
3585 +
3586 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3587 fi
3588 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3589 +
3590 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3591 + ac_c_werror_flag=$ac_save_c_werror_flag
3592 fi
3593 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3594 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
3595 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3596 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
3597 if test "$ac_test_CFLAGS" = set; then
3598 CFLAGS=$ac_save_CFLAGS
3599 elif test $ac_cv_prog_cc_g = yes; then
3600 @@ -2695,12 +3296,12 @@
3601 CFLAGS=
3602 fi
3603 fi
3604 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
3605 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
3606 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
3607 +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
3608 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
3609 +if test "${ac_cv_prog_cc_c89+set}" = set; then
3610 echo $ECHO_N "(cached) $ECHO_C" >&6
3611 else
3612 - ac_cv_prog_cc_stdc=no
3613 + ac_cv_prog_cc_c89=no
3614 ac_save_CC=$CC
3615 cat >conftest.$ac_ext <<_ACEOF
3616 /* confdefs.h. */
3617 @@ -2734,12 +3335,17 @@
3618 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
3619 function prototypes and stuff, but not '\xHH' hex character constants.
3620 These don't provoke an error unfortunately, instead are silently treated
3621 - as 'x'. The following induces an error, until -std1 is added to get
3622 + as 'x'. The following induces an error, until -std is added to get
3623 proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
3624 array size at least. It's necessary to write '\x00'==0 to get something
3625 - that's true only with -std1. */
3626 + that's true only with -std. */
3627 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
3628
3629 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
3630 + inside strings and character constants. */
3631 +#define FOO(x) 'x'
3632 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
3633 +
3634 int test (int i, double x);
3635 struct s1 {int (*f) (int a);};
3636 struct s2 {int (*f) (double a);};
3637 @@ -2754,201 +3360,57 @@
3638 return 0;
3639 }
3640 _ACEOF
3641 -# Don't try gcc -ansi; that turns off useful extensions and
3642 -# breaks some systems' header files.
3643 -# AIX -qlanglvl=ansi
3644 -# Ultrix and OSF/1 -std1
3645 -# HP-UX 10.20 and later -Ae
3646 -# HP-UX older versions -Aa -D_HPUX_SOURCE
3647 -# SVR4 -Xc -D__EXTENSIONS__
3648 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3649 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
3650 + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3651 do
3652 CC="$ac_save_CC $ac_arg"
3653 rm -f conftest.$ac_objext
3654 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3655 - (eval $ac_compile) 2>conftest.er1
3656 +if { (ac_try="$ac_compile"
3657 +case "(($ac_try" in
3658 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3659 + *) ac_try_echo=$ac_try;;
3660 +esac
3661 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3662 + (eval "$ac_compile") 2>conftest.er1
3663 ac_status=$?
3664 grep -v '^ *+' conftest.er1 >conftest.err
3665 rm -f conftest.er1
3666 cat conftest.err >&5
3667 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3668 - (exit $ac_status); } &&
3669 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3670 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3671 - (eval $ac_try) 2>&5
3672 - ac_status=$?
3673 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3674 - (exit $ac_status); }; } &&
3675 - { ac_try='test -s conftest.$ac_objext'
3676 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3677 - (eval $ac_try) 2>&5
3678 - ac_status=$?
3679 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3680 - (exit $ac_status); }; }; then
3681 - ac_cv_prog_cc_stdc=$ac_arg
3682 -break
3683 + (exit $ac_status); } && {
3684 + test -z "$ac_c_werror_flag" ||
3685 + test ! -s conftest.err
3686 + } && test -s conftest.$ac_objext; then
3687 + ac_cv_prog_cc_c89=$ac_arg
3688 else
3689 echo "$as_me: failed program was:" >&5
3690 sed 's/^/| /' conftest.$ac_ext >&5
3691
3692 +
3693 fi
3694 -rm -f conftest.err conftest.$ac_objext
3695 +
3696 +rm -f core conftest.err conftest.$ac_objext
3697 + test "x$ac_cv_prog_cc_c89" != "xno" && break
3698 done
3699 -rm -f conftest.$ac_ext conftest.$ac_objext
3700 +rm -f conftest.$ac_ext
3701 CC=$ac_save_CC
3702
3703 fi
3704 -
3705 -case "x$ac_cv_prog_cc_stdc" in
3706 - x|xno)
3707 - echo "$as_me:$LINENO: result: none needed" >&5
3708 -echo "${ECHO_T}none needed" >&6 ;;
3709 +# AC_CACHE_VAL
3710 +case "x$ac_cv_prog_cc_c89" in
3711 + x)
3712 + { echo "$as_me:$LINENO: result: none needed" >&5
3713 +echo "${ECHO_T}none needed" >&6; } ;;
3714 + xno)
3715 + { echo "$as_me:$LINENO: result: unsupported" >&5
3716 +echo "${ECHO_T}unsupported" >&6; } ;;
3717 *)
3718 - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
3719 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
3720 - CC="$CC $ac_cv_prog_cc_stdc" ;;
3721 + CC="$CC $ac_cv_prog_cc_c89"
3722 + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
3723 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
3724 esac
3725
3726 -# Some people use a C++ compiler to compile C. Since we use `exit',
3727 -# in C++ we need to declare it. In case someone uses the same compiler
3728 -# for both compiling C and C++ we need to have the C++ compiler decide
3729 -# the declaration of exit, since it's the most demanding environment.
3730 -cat >conftest.$ac_ext <<_ACEOF
3731 -#ifndef __cplusplus
3732 - choke me
3733 -#endif
3734 -_ACEOF
3735 -rm -f conftest.$ac_objext
3736 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3737 - (eval $ac_compile) 2>conftest.er1
3738 - ac_status=$?
3739 - grep -v '^ *+' conftest.er1 >conftest.err
3740 - rm -f conftest.er1
3741 - cat conftest.err >&5
3742 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3743 - (exit $ac_status); } &&
3744 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3745 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3746 - (eval $ac_try) 2>&5
3747 - ac_status=$?
3748 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3749 - (exit $ac_status); }; } &&
3750 - { ac_try='test -s conftest.$ac_objext'
3751 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3752 - (eval $ac_try) 2>&5
3753 - ac_status=$?
3754 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3755 - (exit $ac_status); }; }; then
3756 - for ac_declaration in \
3757 - '' \
3758 - 'extern "C" void std::exit (int) throw (); using std::exit;' \
3759 - 'extern "C" void std::exit (int); using std::exit;' \
3760 - 'extern "C" void exit (int) throw ();' \
3761 - 'extern "C" void exit (int);' \
3762 - 'void exit (int);'
3763 -do
3764 - cat >conftest.$ac_ext <<_ACEOF
3765 -/* confdefs.h. */
3766 -_ACEOF
3767 -cat confdefs.h >>conftest.$ac_ext
3768 -cat >>conftest.$ac_ext <<_ACEOF
3769 -/* end confdefs.h. */
3770 -$ac_declaration
3771 -#include <stdlib.h>
3772 -int
3773 -main ()
3774 -{
3775 -exit (42);
3776 - ;
3777 - return 0;
3778 -}
3779 -_ACEOF
3780 -rm -f conftest.$ac_objext
3781 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3782 - (eval $ac_compile) 2>conftest.er1
3783 - ac_status=$?
3784 - grep -v '^ *+' conftest.er1 >conftest.err
3785 - rm -f conftest.er1
3786 - cat conftest.err >&5
3787 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3788 - (exit $ac_status); } &&
3789 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3790 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3791 - (eval $ac_try) 2>&5
3792 - ac_status=$?
3793 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3794 - (exit $ac_status); }; } &&
3795 - { ac_try='test -s conftest.$ac_objext'
3796 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3797 - (eval $ac_try) 2>&5
3798 - ac_status=$?
3799 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3800 - (exit $ac_status); }; }; then
3801 - :
3802 -else
3803 - echo "$as_me: failed program was:" >&5
3804 -sed 's/^/| /' conftest.$ac_ext >&5
3805 -
3806 -continue
3807 -fi
3808 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3809 - cat >conftest.$ac_ext <<_ACEOF
3810 -/* confdefs.h. */
3811 -_ACEOF
3812 -cat confdefs.h >>conftest.$ac_ext
3813 -cat >>conftest.$ac_ext <<_ACEOF
3814 -/* end confdefs.h. */
3815 -$ac_declaration
3816 -int
3817 -main ()
3818 -{
3819 -exit (42);
3820 - ;
3821 - return 0;
3822 -}
3823 -_ACEOF
3824 -rm -f conftest.$ac_objext
3825 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3826 - (eval $ac_compile) 2>conftest.er1
3827 - ac_status=$?
3828 - grep -v '^ *+' conftest.er1 >conftest.err
3829 - rm -f conftest.er1
3830 - cat conftest.err >&5
3831 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3832 - (exit $ac_status); } &&
3833 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3834 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3835 - (eval $ac_try) 2>&5
3836 - ac_status=$?
3837 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3838 - (exit $ac_status); }; } &&
3839 - { ac_try='test -s conftest.$ac_objext'
3840 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3841 - (eval $ac_try) 2>&5
3842 - ac_status=$?
3843 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3844 - (exit $ac_status); }; }; then
3845 - break
3846 -else
3847 - echo "$as_me: failed program was:" >&5
3848 -sed 's/^/| /' conftest.$ac_ext >&5
3849 -
3850 -fi
3851 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3852 -done
3853 -rm -f conftest*
3854 -if test -n "$ac_declaration"; then
3855 - echo '#ifdef __cplusplus' >>confdefs.h
3856 - echo $ac_declaration >>confdefs.h
3857 - echo '#endif' >>confdefs.h
3858 -fi
3859 -
3860 -else
3861 - echo "$as_me: failed program was:" >&5
3862 -sed 's/^/| /' conftest.$ac_ext >&5
3863
3864 -fi
3865 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3866 ac_ext=c
3867 ac_cpp='$CPP $CPPFLAGS'
3868 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3869 @@ -2956,7 +3418,7 @@
3870 ac_compiler_gnu=$ac_cv_c_compiler_gnu
3871 DEPDIR="${am__leading_dot}deps"
3872
3873 - ac_config_commands="$ac_config_commands depfiles"
3874 +ac_config_commands="$ac_config_commands depfiles"
3875
3876
3877 am_make=${MAKE-make}
3878 @@ -2966,8 +3428,8 @@
3879 .PHONY: am__doit
3880 END
3881 # If we don't find an include directive, just comment out the code.
3882 -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
3883 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
3884 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
3885 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
3886 am__include="#"
3887 am__quote=
3888 _am_result=none
3889 @@ -2994,15 +3456,15 @@
3890 fi
3891
3892
3893 -echo "$as_me:$LINENO: result: $_am_result" >&5
3894 -echo "${ECHO_T}$_am_result" >&6
3895 +{ echo "$as_me:$LINENO: result: $_am_result" >&5
3896 +echo "${ECHO_T}$_am_result" >&6; }
3897 rm -f confinc confmf
3898
3899 -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
3900 +# Check whether --enable-dependency-tracking was given.
3901 if test "${enable_dependency_tracking+set}" = set; then
3902 - enableval="$enable_dependency_tracking"
3903 + enableval=$enable_dependency_tracking;
3904 +fi
3905
3906 -fi;
3907 if test "x$enable_dependency_tracking" != xno; then
3908 am_depcomp="$ac_aux_dir/depcomp"
3909 AMDEPBACKSLASH='\'
3910 @@ -3022,8 +3484,8 @@
3911
3912 depcc="$CC" am_compiler_list=
3913
3914 -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
3915 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
3916 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
3917 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
3918 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
3919 echo $ECHO_N "(cached) $ECHO_C" >&6
3920 else
3921 @@ -3112,8 +3574,8 @@
3922 fi
3923
3924 fi
3925 -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
3926 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
3927 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
3928 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
3929 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
3930
3931
3932 @@ -3134,8 +3596,8 @@
3933 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3934 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3935 ac_compiler_gnu=$ac_cv_c_compiler_gnu
3936 -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
3937 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
3938 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
3939 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
3940 # On Suns, sometimes $CPP names a directory.
3941 if test -n "$CPP" && test -d "$CPP"; then
3942 CPP=
3943 @@ -3169,24 +3631,22 @@
3944 #endif
3945 Syntax error
3946 _ACEOF
3947 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
3948 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3949 +if { (ac_try="$ac_cpp conftest.$ac_ext"
3950 +case "(($ac_try" in
3951 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3952 + *) ac_try_echo=$ac_try;;
3953 +esac
3954 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3955 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3956 ac_status=$?
3957 grep -v '^ *+' conftest.er1 >conftest.err
3958 rm -f conftest.er1
3959 cat conftest.err >&5
3960 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3961 - (exit $ac_status); } >/dev/null; then
3962 - if test -s conftest.err; then
3963 - ac_cpp_err=$ac_c_preproc_warn_flag
3964 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
3965 - else
3966 - ac_cpp_err=
3967 - fi
3968 -else
3969 - ac_cpp_err=yes
3970 -fi
3971 -if test -z "$ac_cpp_err"; then
3972 + (exit $ac_status); } >/dev/null && {
3973 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3974 + test ! -s conftest.err
3975 + }; then
3976 :
3977 else
3978 echo "$as_me: failed program was:" >&5
3979 @@ -3195,9 +3655,10 @@
3980 # Broken: fails on valid input.
3981 continue
3982 fi
3983 +
3984 rm -f conftest.err conftest.$ac_ext
3985
3986 - # OK, works on sane cases. Now check whether non-existent headers
3987 + # OK, works on sane cases. Now check whether nonexistent headers
3988 # can be detected and how.
3989 cat >conftest.$ac_ext <<_ACEOF
3990 /* confdefs.h. */
3991 @@ -3207,24 +3668,22 @@
3992 /* end confdefs.h. */
3993 #include <ac_nonexistent.h>
3994 _ACEOF
3995 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
3996 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3997 +if { (ac_try="$ac_cpp conftest.$ac_ext"
3998 +case "(($ac_try" in
3999 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4000 + *) ac_try_echo=$ac_try;;
4001 +esac
4002 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4003 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4004 ac_status=$?
4005 grep -v '^ *+' conftest.er1 >conftest.err
4006 rm -f conftest.er1
4007 cat conftest.err >&5
4008 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4009 - (exit $ac_status); } >/dev/null; then
4010 - if test -s conftest.err; then
4011 - ac_cpp_err=$ac_c_preproc_warn_flag
4012 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4013 - else
4014 - ac_cpp_err=
4015 - fi
4016 -else
4017 - ac_cpp_err=yes
4018 -fi
4019 -if test -z "$ac_cpp_err"; then
4020 + (exit $ac_status); } >/dev/null && {
4021 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4022 + test ! -s conftest.err
4023 + }; then
4024 # Broken: success on invalid input.
4025 continue
4026 else
4027 @@ -3235,6 +3694,7 @@
4028 ac_preproc_ok=:
4029 break
4030 fi
4031 +
4032 rm -f conftest.err conftest.$ac_ext
4033
4034 done
4035 @@ -3252,8 +3712,8 @@
4036 else
4037 ac_cv_prog_CPP=$CPP
4038 fi
4039 -echo "$as_me:$LINENO: result: $CPP" >&5
4040 -echo "${ECHO_T}$CPP" >&6
4041 +{ echo "$as_me:$LINENO: result: $CPP" >&5
4042 +echo "${ECHO_T}$CPP" >&6; }
4043 ac_preproc_ok=false
4044 for ac_c_preproc_warn_flag in '' yes
4045 do
4046 @@ -3276,24 +3736,22 @@
4047 #endif
4048 Syntax error
4049 _ACEOF
4050 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4051 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4052 +if { (ac_try="$ac_cpp conftest.$ac_ext"
4053 +case "(($ac_try" in
4054 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4055 + *) ac_try_echo=$ac_try;;
4056 +esac
4057 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4058 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4059 ac_status=$?
4060 grep -v '^ *+' conftest.er1 >conftest.err
4061 rm -f conftest.er1
4062 cat conftest.err >&5
4063 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4064 - (exit $ac_status); } >/dev/null; then
4065 - if test -s conftest.err; then
4066 - ac_cpp_err=$ac_c_preproc_warn_flag
4067 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4068 - else
4069 - ac_cpp_err=
4070 - fi
4071 -else
4072 - ac_cpp_err=yes
4073 -fi
4074 -if test -z "$ac_cpp_err"; then
4075 + (exit $ac_status); } >/dev/null && {
4076 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4077 + test ! -s conftest.err
4078 + }; then
4079 :
4080 else
4081 echo "$as_me: failed program was:" >&5
4082 @@ -3302,9 +3760,10 @@
4083 # Broken: fails on valid input.
4084 continue
4085 fi
4086 +
4087 rm -f conftest.err conftest.$ac_ext
4088
4089 - # OK, works on sane cases. Now check whether non-existent headers
4090 + # OK, works on sane cases. Now check whether nonexistent headers
4091 # can be detected and how.
4092 cat >conftest.$ac_ext <<_ACEOF
4093 /* confdefs.h. */
4094 @@ -3314,24 +3773,22 @@
4095 /* end confdefs.h. */
4096 #include <ac_nonexistent.h>
4097 _ACEOF
4098 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4099 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4100 +if { (ac_try="$ac_cpp conftest.$ac_ext"
4101 +case "(($ac_try" in
4102 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4103 + *) ac_try_echo=$ac_try;;
4104 +esac
4105 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4106 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4107 ac_status=$?
4108 grep -v '^ *+' conftest.er1 >conftest.err
4109 rm -f conftest.er1
4110 cat conftest.err >&5
4111 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4112 - (exit $ac_status); } >/dev/null; then
4113 - if test -s conftest.err; then
4114 - ac_cpp_err=$ac_c_preproc_warn_flag
4115 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4116 - else
4117 - ac_cpp_err=
4118 - fi
4119 -else
4120 - ac_cpp_err=yes
4121 -fi
4122 -if test -z "$ac_cpp_err"; then
4123 + (exit $ac_status); } >/dev/null && {
4124 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4125 + test ! -s conftest.err
4126 + }; then
4127 # Broken: success on invalid input.
4128 continue
4129 else
4130 @@ -3342,6 +3799,7 @@
4131 ac_preproc_ok=:
4132 break
4133 fi
4134 +
4135 rm -f conftest.err conftest.$ac_ext
4136
4137 done
4138 @@ -3376,8 +3834,8 @@
4139 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
4140 # OS/2's system install, which has a completely different semantic
4141 # ./install, which can be erroneously created by make from ./install.sh.
4142 -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
4143 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
4144 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
4145 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
4146 if test -z "$INSTALL"; then
4147 if test "${ac_cv_path_install+set}" = set; then
4148 echo $ECHO_N "(cached) $ECHO_C" >&6
4149 @@ -3399,7 +3857,7 @@
4150 # by default.
4151 for ac_prog in ginstall scoinst install; do
4152 for ac_exec_ext in '' $ac_executable_extensions; do
4153 - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
4154 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
4155 if test $ac_prog = install &&
4156 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
4157 # AIX install. It has an incompatible calling convention.
4158 @@ -3418,21 +3876,22 @@
4159 ;;
4160 esac
4161 done
4162 +IFS=$as_save_IFS
4163
4164
4165 fi
4166 if test "${ac_cv_path_install+set}" = set; then
4167 INSTALL=$ac_cv_path_install
4168 else
4169 - # As a last resort, use the slow shell script. We don't cache a
4170 - # path for INSTALL within a source directory, because that will
4171 + # As a last resort, use the slow shell script. Don't cache a
4172 + # value for INSTALL within a source directory, because that will
4173 # break other packages using the cache if that directory is
4174 - # removed, or if the path is relative.
4175 + # removed, or if the value is a relative name.
4176 INSTALL=$ac_install_sh
4177 fi
4178 fi
4179 -echo "$as_me:$LINENO: result: $INSTALL" >&5
4180 -echo "${ECHO_T}$INSTALL" >&6
4181 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5
4182 +echo "${ECHO_T}$INSTALL" >&6; }
4183
4184 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
4185 # It thinks the first close brace ends the variable substitution.
4186 @@ -3458,8 +3917,8 @@
4187 INCLTDL="$LTDLINCL"
4188
4189
4190 -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
4191 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
4192 +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
4193 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
4194 if test "${ac_cv_c_const+set}" = set; then
4195 echo $ECHO_N "(cached) $ECHO_C" >&6
4196 else
4197 @@ -3477,10 +3936,10 @@
4198 #ifndef __cplusplus
4199 /* Ultrix mips cc rejects this. */
4200 typedef int charset[2];
4201 - const charset x;
4202 + const charset cs;
4203 /* SunOS 4.1.1 cc rejects this. */
4204 - char const *const *ccp;
4205 - char **p;
4206 + char const *const *pcpcc;
4207 + char **ppc;
4208 /* NEC SVR4.0.2 mips cc rejects this. */
4209 struct point {int x, y;};
4210 static struct point const zero = {0,0};
4211 @@ -3489,16 +3948,17 @@
4212 an arm of an if-expression whose if-part is not a constant
4213 expression */
4214 const char *g = "string";
4215 - ccp = &g + (g ? g-g : 0);
4216 + pcpcc = &g + (g ? g-g : 0);
4217 /* HPUX 7.0 cc rejects these. */
4218 - ++ccp;
4219 - p = (char**) ccp;
4220 - ccp = (char const *const *) p;
4221 + ++pcpcc;
4222 + ppc = (char**) pcpcc;
4223 + pcpcc = (char const *const *) ppc;
4224 { /* SCO 3.2v4 cc rejects this. */
4225 char *t;
4226 char const *s = 0 ? (char *) 0 : (char const *) 0;
4227
4228 *t++ = 0;
4229 + if (s) return 0;
4230 }
4231 { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
4232 int x[] = {25, 17};
4233 @@ -3517,7 +3977,9 @@
4234 }
4235 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
4236 const int foo = 10;
4237 + if (!foo) return 0;
4238 }
4239 + return !cs[0] && !zero.x;
4240 #endif
4241
4242 ;
4243 @@ -3525,37 +3987,34 @@
4244 }
4245 _ACEOF
4246 rm -f conftest.$ac_objext
4247 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4248 - (eval $ac_compile) 2>conftest.er1
4249 +if { (ac_try="$ac_compile"
4250 +case "(($ac_try" in
4251 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4252 + *) ac_try_echo=$ac_try;;
4253 +esac
4254 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4255 + (eval "$ac_compile") 2>conftest.er1
4256 ac_status=$?
4257 grep -v '^ *+' conftest.er1 >conftest.err
4258 rm -f conftest.er1
4259 cat conftest.err >&5
4260 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4261 - (exit $ac_status); } &&
4262 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4263 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4264 - (eval $ac_try) 2>&5
4265 - ac_status=$?
4266 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4267 - (exit $ac_status); }; } &&
4268 - { ac_try='test -s conftest.$ac_objext'
4269 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4270 - (eval $ac_try) 2>&5
4271 - ac_status=$?
4272 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4273 - (exit $ac_status); }; }; then
4274 + (exit $ac_status); } && {
4275 + test -z "$ac_c_werror_flag" ||
4276 + test ! -s conftest.err
4277 + } && test -s conftest.$ac_objext; then
4278 ac_cv_c_const=yes
4279 else
4280 echo "$as_me: failed program was:" >&5
4281 sed 's/^/| /' conftest.$ac_ext >&5
4282
4283 -ac_cv_c_const=no
4284 + ac_cv_c_const=no
4285 fi
4286 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4287 +
4288 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4289 fi
4290 -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
4291 -echo "${ECHO_T}$ac_cv_c_const" >&6
4292 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
4293 +echo "${ECHO_T}$ac_cv_c_const" >&6; }
4294 if test $ac_cv_c_const = no; then
4295
4296 cat >>confdefs.h <<\_ACEOF
4297 @@ -3565,23 +4024,170 @@
4298 fi
4299
4300
4301 -echo "$as_me:$LINENO: checking for egrep" >&5
4302 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6
4303 -if test "${ac_cv_prog_egrep+set}" = set; then
4304 +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
4305 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
4306 +if test "${ac_cv_path_GREP+set}" = set; then
4307 + echo $ECHO_N "(cached) $ECHO_C" >&6
4308 +else
4309 + # Extract the first word of "grep ggrep" to use in msg output
4310 +if test -z "$GREP"; then
4311 +set dummy grep ggrep; ac_prog_name=$2
4312 +if test "${ac_cv_path_GREP+set}" = set; then
4313 + echo $ECHO_N "(cached) $ECHO_C" >&6
4314 +else
4315 + ac_path_GREP_found=false
4316 +# Loop through the user's path and test for each of PROGNAME-LIST
4317 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4318 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4319 +do
4320 + IFS=$as_save_IFS
4321 + test -z "$as_dir" && as_dir=.
4322 + for ac_prog in grep ggrep; do
4323 + for ac_exec_ext in '' $ac_executable_extensions; do
4324 + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4325 + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4326 + # Check for GNU ac_path_GREP and select it if it is found.
4327 + # Check for GNU $ac_path_GREP
4328 +case `"$ac_path_GREP" --version 2>&1` in
4329 +*GNU*)
4330 + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
4331 +*)
4332 + ac_count=0
4333 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
4334 + while :
4335 + do
4336 + cat "conftest.in" "conftest.in" >"conftest.tmp"
4337 + mv "conftest.tmp" "conftest.in"
4338 + cp "conftest.in" "conftest.nl"
4339 + echo 'GREP' >> "conftest.nl"
4340 + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4341 + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4342 + ac_count=`expr $ac_count + 1`
4343 + if test $ac_count -gt ${ac_path_GREP_max-0}; then
4344 + # Best one so far, save it but keep looking for a better one
4345 + ac_cv_path_GREP="$ac_path_GREP"
4346 + ac_path_GREP_max=$ac_count
4347 + fi
4348 + # 10*(2^10) chars as input seems more than enough
4349 + test $ac_count -gt 10 && break
4350 + done
4351 + rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4352 +esac
4353 +
4354 +
4355 + $ac_path_GREP_found && break 3
4356 + done
4357 +done
4358 +
4359 +done
4360 +IFS=$as_save_IFS
4361 +
4362 +
4363 +fi
4364 +
4365 +GREP="$ac_cv_path_GREP"
4366 +if test -z "$GREP"; then
4367 + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4368 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4369 + { (exit 1); exit 1; }; }
4370 +fi
4371 +
4372 +else
4373 + ac_cv_path_GREP=$GREP
4374 +fi
4375 +
4376 +
4377 +fi
4378 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
4379 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
4380 + GREP="$ac_cv_path_GREP"
4381 +
4382 +
4383 +{ echo "$as_me:$LINENO: checking for egrep" >&5
4384 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
4385 +if test "${ac_cv_path_EGREP+set}" = set; then
4386 + echo $ECHO_N "(cached) $ECHO_C" >&6
4387 +else
4388 + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
4389 + then ac_cv_path_EGREP="$GREP -E"
4390 + else
4391 + # Extract the first word of "egrep" to use in msg output
4392 +if test -z "$EGREP"; then
4393 +set dummy egrep; ac_prog_name=$2
4394 +if test "${ac_cv_path_EGREP+set}" = set; then
4395 echo $ECHO_N "(cached) $ECHO_C" >&6
4396 else
4397 - if echo a | (grep -E '(a|b)') >/dev/null 2>&1
4398 - then ac_cv_prog_egrep='grep -E'
4399 - else ac_cv_prog_egrep='egrep'
4400 + ac_path_EGREP_found=false
4401 +# Loop through the user's path and test for each of PROGNAME-LIST
4402 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4403 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4404 +do
4405 + IFS=$as_save_IFS
4406 + test -z "$as_dir" && as_dir=.
4407 + for ac_prog in egrep; do
4408 + for ac_exec_ext in '' $ac_executable_extensions; do
4409 + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4410 + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4411 + # Check for GNU ac_path_EGREP and select it if it is found.
4412 + # Check for GNU $ac_path_EGREP
4413 +case `"$ac_path_EGREP" --version 2>&1` in
4414 +*GNU*)
4415 + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
4416 +*)
4417 + ac_count=0
4418 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
4419 + while :
4420 + do
4421 + cat "conftest.in" "conftest.in" >"conftest.tmp"
4422 + mv "conftest.tmp" "conftest.in"
4423 + cp "conftest.in" "conftest.nl"
4424 + echo 'EGREP' >> "conftest.nl"
4425 + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4426 + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4427 + ac_count=`expr $ac_count + 1`
4428 + if test $ac_count -gt ${ac_path_EGREP_max-0}; then
4429 + # Best one so far, save it but keep looking for a better one
4430 + ac_cv_path_EGREP="$ac_path_EGREP"
4431 + ac_path_EGREP_max=$ac_count
4432 fi
4433 + # 10*(2^10) chars as input seems more than enough
4434 + test $ac_count -gt 10 && break
4435 + done
4436 + rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4437 +esac
4438 +
4439 +
4440 + $ac_path_EGREP_found && break 3
4441 + done
4442 +done
4443 +
4444 +done
4445 +IFS=$as_save_IFS
4446 +
4447 +
4448 +fi
4449 +
4450 +EGREP="$ac_cv_path_EGREP"
4451 +if test -z "$EGREP"; then
4452 + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4453 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4454 + { (exit 1); exit 1; }; }
4455 +fi
4456 +
4457 +else
4458 + ac_cv_path_EGREP=$EGREP
4459 +fi
4460 +
4461 +
4462 + fi
4463 fi
4464 -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
4465 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6
4466 - EGREP=$ac_cv_prog_egrep
4467 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
4468 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
4469 + EGREP="$ac_cv_path_EGREP"
4470
4471
4472 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
4473 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
4474 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
4475 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
4476 if test "${ac_cv_header_stdc+set}" = set; then
4477 echo $ECHO_N "(cached) $ECHO_C" >&6
4478 else
4479 @@ -3605,34 +4211,31 @@
4480 }
4481 _ACEOF
4482 rm -f conftest.$ac_objext
4483 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4484 - (eval $ac_compile) 2>conftest.er1
4485 +if { (ac_try="$ac_compile"
4486 +case "(($ac_try" in
4487 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4488 + *) ac_try_echo=$ac_try;;
4489 +esac
4490 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4491 + (eval "$ac_compile") 2>conftest.er1
4492 ac_status=$?
4493 grep -v '^ *+' conftest.er1 >conftest.err
4494 rm -f conftest.er1
4495 cat conftest.err >&5
4496 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4497 - (exit $ac_status); } &&
4498 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4499 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4500 - (eval $ac_try) 2>&5
4501 - ac_status=$?
4502 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4503 - (exit $ac_status); }; } &&
4504 - { ac_try='test -s conftest.$ac_objext'
4505 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4506 - (eval $ac_try) 2>&5
4507 - ac_status=$?
4508 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4509 - (exit $ac_status); }; }; then
4510 + (exit $ac_status); } && {
4511 + test -z "$ac_c_werror_flag" ||
4512 + test ! -s conftest.err
4513 + } && test -s conftest.$ac_objext; then
4514 ac_cv_header_stdc=yes
4515 else
4516 echo "$as_me: failed program was:" >&5
4517 sed 's/^/| /' conftest.$ac_ext >&5
4518
4519 -ac_cv_header_stdc=no
4520 + ac_cv_header_stdc=no
4521 fi
4522 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4523 +
4524 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4525
4526 if test $ac_cv_header_stdc = yes; then
4527 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
4528 @@ -3688,6 +4291,7 @@
4529 cat >>conftest.$ac_ext <<_ACEOF
4530 /* end confdefs.h. */
4531 #include <ctype.h>
4532 +#include <stdlib.h>
4533 #if ((' ' & 0x0FF) == 0x020)
4534 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
4535 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
4536 @@ -3707,18 +4311,27 @@
4537 for (i = 0; i < 256; i++)
4538 if (XOR (islower (i), ISLOWER (i))
4539 || toupper (i) != TOUPPER (i))
4540 - exit(2);
4541 - exit (0);
4542 + return 2;
4543 + return 0;
4544 }
4545 _ACEOF
4546 rm -f conftest$ac_exeext
4547 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4548 - (eval $ac_link) 2>&5
4549 +if { (ac_try="$ac_link"
4550 +case "(($ac_try" in
4551 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4552 + *) ac_try_echo=$ac_try;;
4553 +esac
4554 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4555 + (eval "$ac_link") 2>&5
4556 ac_status=$?
4557 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4558 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4559 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4560 - (eval $ac_try) 2>&5
4561 + { (case "(($ac_try" in
4562 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4563 + *) ac_try_echo=$ac_try;;
4564 +esac
4565 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4566 + (eval "$ac_try") 2>&5
4567 ac_status=$?
4568 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4569 (exit $ac_status); }; }; then
4570 @@ -3731,12 +4344,14 @@
4571 ( exit $ac_status )
4572 ac_cv_header_stdc=no
4573 fi
4574 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4575 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4576 fi
4577 +
4578 +
4579 fi
4580 fi
4581 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
4582 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
4583 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
4584 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
4585 if test $ac_cv_header_stdc = yes; then
4586
4587 cat >>confdefs.h <<\_ACEOF
4588 @@ -3753,9 +4368,9 @@
4589 ac_header_dirent=no
4590 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
4591 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
4592 -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
4593 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
4594 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
4595 +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
4596 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
4597 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
4598 echo $ECHO_N "(cached) $ECHO_C" >&6
4599 else
4600 cat >conftest.$ac_ext <<_ACEOF
4601 @@ -3777,37 +4392,35 @@
4602 }
4603 _ACEOF
4604 rm -f conftest.$ac_objext
4605 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4606 - (eval $ac_compile) 2>conftest.er1
4607 +if { (ac_try="$ac_compile"
4608 +case "(($ac_try" in
4609 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4610 + *) ac_try_echo=$ac_try;;
4611 +esac
4612 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4613 + (eval "$ac_compile") 2>conftest.er1
4614 ac_status=$?
4615 grep -v '^ *+' conftest.er1 >conftest.err
4616 rm -f conftest.er1
4617 cat conftest.err >&5
4618 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4619 - (exit $ac_status); } &&
4620 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4621 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4622 - (eval $ac_try) 2>&5
4623 - ac_status=$?
4624 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4625 - (exit $ac_status); }; } &&
4626 - { ac_try='test -s conftest.$ac_objext'
4627 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4628 - (eval $ac_try) 2>&5
4629 - ac_status=$?
4630 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4631 - (exit $ac_status); }; }; then
4632 + (exit $ac_status); } && {
4633 + test -z "$ac_c_werror_flag" ||
4634 + test ! -s conftest.err
4635 + } && test -s conftest.$ac_objext; then
4636 eval "$as_ac_Header=yes"
4637 else
4638 echo "$as_me: failed program was:" >&5
4639 sed 's/^/| /' conftest.$ac_ext >&5
4640
4641 -eval "$as_ac_Header=no"
4642 + eval "$as_ac_Header=no"
4643 fi
4644 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4645 +
4646 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4647 fi
4648 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
4649 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
4650 +ac_res=`eval echo '${'$as_ac_Header'}'`
4651 + { echo "$as_me:$LINENO: result: $ac_res" >&5
4652 +echo "${ECHO_T}$ac_res" >&6; }
4653 if test `eval echo '${'$as_ac_Header'}'` = yes; then
4654 cat >>confdefs.h <<_ACEOF
4655 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
4656 @@ -3819,13 +4432,12 @@
4657 done
4658 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
4659 if test $ac_header_dirent = dirent.h; then
4660 - echo "$as_me:$LINENO: checking for library containing opendir" >&5
4661 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
4662 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5
4663 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
4664 if test "${ac_cv_search_opendir+set}" = set; then
4665 echo $ECHO_N "(cached) $ECHO_C" >&6
4666 else
4667 ac_func_search_save_LIBS=$LIBS
4668 -ac_cv_search_opendir=no
4669 cat >conftest.$ac_ext <<_ACEOF
4670 /* confdefs.h. */
4671 _ACEOF
4672 @@ -3833,124 +4445,83 @@
4673 cat >>conftest.$ac_ext <<_ACEOF
4674 /* end confdefs.h. */
4675
4676 -/* Override any gcc2 internal prototype to avoid an error. */
4677 +/* Override any GCC internal prototype to avoid an error.
4678 + Use char because int might match the return type of a GCC
4679 + builtin and then its argument prototype would still apply. */
4680 #ifdef __cplusplus
4681 extern "C"
4682 #endif
4683 -/* We use char because int might match the return type of a gcc2
4684 - builtin and then its argument prototype would still apply. */
4685 char opendir ();
4686 int
4687 main ()
4688 {
4689 -opendir ();
4690 +return opendir ();
4691 ;
4692 return 0;
4693 }
4694 _ACEOF
4695 -rm -f conftest.$ac_objext conftest$ac_exeext
4696 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4697 - (eval $ac_link) 2>conftest.er1
4698 +for ac_lib in '' dir; do
4699 + if test -z "$ac_lib"; then
4700 + ac_res="none required"
4701 + else
4702 + ac_res=-l$ac_lib
4703 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4704 + fi
4705 + rm -f conftest.$ac_objext conftest$ac_exeext
4706 +if { (ac_try="$ac_link"
4707 +case "(($ac_try" in
4708 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4709 + *) ac_try_echo=$ac_try;;
4710 +esac
4711 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4712 + (eval "$ac_link") 2>conftest.er1
4713 ac_status=$?
4714 grep -v '^ *+' conftest.er1 >conftest.err
4715 rm -f conftest.er1
4716 cat conftest.err >&5
4717 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4718 - (exit $ac_status); } &&
4719 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4720 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4721 - (eval $ac_try) 2>&5
4722 - ac_status=$?
4723 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4724 - (exit $ac_status); }; } &&
4725 - { ac_try='test -s conftest$ac_exeext'
4726 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4727 - (eval $ac_try) 2>&5
4728 - ac_status=$?
4729 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4730 - (exit $ac_status); }; }; then
4731 - ac_cv_search_opendir="none required"
4732 + (exit $ac_status); } && {
4733 + test -z "$ac_c_werror_flag" ||
4734 + test ! -s conftest.err
4735 + } && test -s conftest$ac_exeext &&
4736 + $as_test_x conftest$ac_exeext; then
4737 + ac_cv_search_opendir=$ac_res
4738 else
4739 echo "$as_me: failed program was:" >&5
4740 sed 's/^/| /' conftest.$ac_ext >&5
4741
4742 -fi
4743 -rm -f conftest.err conftest.$ac_objext \
4744 - conftest$ac_exeext conftest.$ac_ext
4745 -if test "$ac_cv_search_opendir" = no; then
4746 - for ac_lib in dir; do
4747 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4748 - cat >conftest.$ac_ext <<_ACEOF
4749 -/* confdefs.h. */
4750 -_ACEOF
4751 -cat confdefs.h >>conftest.$ac_ext
4752 -cat >>conftest.$ac_ext <<_ACEOF
4753 -/* end confdefs.h. */
4754
4755 -/* Override any gcc2 internal prototype to avoid an error. */
4756 -#ifdef __cplusplus
4757 -extern "C"
4758 -#endif
4759 -/* We use char because int might match the return type of a gcc2
4760 - builtin and then its argument prototype would still apply. */
4761 -char opendir ();
4762 -int
4763 -main ()
4764 -{
4765 -opendir ();
4766 - ;
4767 - return 0;
4768 -}
4769 -_ACEOF
4770 -rm -f conftest.$ac_objext conftest$ac_exeext
4771 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4772 - (eval $ac_link) 2>conftest.er1
4773 - ac_status=$?
4774 - grep -v '^ *+' conftest.er1 >conftest.err
4775 - rm -f conftest.er1
4776 - cat conftest.err >&5
4777 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4778 - (exit $ac_status); } &&
4779 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4780 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4781 - (eval $ac_try) 2>&5
4782 - ac_status=$?
4783 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4784 - (exit $ac_status); }; } &&
4785 - { ac_try='test -s conftest$ac_exeext'
4786 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4787 - (eval $ac_try) 2>&5
4788 - ac_status=$?
4789 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4790 - (exit $ac_status); }; }; then
4791 - ac_cv_search_opendir="-l$ac_lib"
4792 -break
4793 -else
4794 - echo "$as_me: failed program was:" >&5
4795 -sed 's/^/| /' conftest.$ac_ext >&5
4796 +fi
4797
4798 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4799 + conftest$ac_exeext
4800 + if test "${ac_cv_search_opendir+set}" = set; then
4801 + break
4802 fi
4803 -rm -f conftest.err conftest.$ac_objext \
4804 - conftest$ac_exeext conftest.$ac_ext
4805 - done
4806 +done
4807 +if test "${ac_cv_search_opendir+set}" = set; then
4808 + :
4809 +else
4810 + ac_cv_search_opendir=no
4811 fi
4812 +rm conftest.$ac_ext
4813 LIBS=$ac_func_search_save_LIBS
4814 fi
4815 -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
4816 -echo "${ECHO_T}$ac_cv_search_opendir" >&6
4817 -if test "$ac_cv_search_opendir" != no; then
4818 - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
4819 +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
4820 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
4821 +ac_res=$ac_cv_search_opendir
4822 +if test "$ac_res" != no; then
4823 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
4824
4825 fi
4826
4827 else
4828 - echo "$as_me:$LINENO: checking for library containing opendir" >&5
4829 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
4830 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5
4831 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
4832 if test "${ac_cv_search_opendir+set}" = set; then
4833 echo $ECHO_N "(cached) $ECHO_C" >&6
4834 else
4835 ac_func_search_save_LIBS=$LIBS
4836 -ac_cv_search_opendir=no
4837 cat >conftest.$ac_ext <<_ACEOF
4838 /* confdefs.h. */
4839 _ACEOF
4840 @@ -3958,113 +4529,73 @@
4841 cat >>conftest.$ac_ext <<_ACEOF
4842 /* end confdefs.h. */
4843
4844 -/* Override any gcc2 internal prototype to avoid an error. */
4845 +/* Override any GCC internal prototype to avoid an error.
4846 + Use char because int might match the return type of a GCC
4847 + builtin and then its argument prototype would still apply. */
4848 #ifdef __cplusplus
4849 extern "C"
4850 #endif
4851 -/* We use char because int might match the return type of a gcc2
4852 - builtin and then its argument prototype would still apply. */
4853 char opendir ();
4854 int
4855 main ()
4856 {
4857 -opendir ();
4858 +return opendir ();
4859 ;
4860 return 0;
4861 }
4862 _ACEOF
4863 -rm -f conftest.$ac_objext conftest$ac_exeext
4864 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4865 - (eval $ac_link) 2>conftest.er1
4866 +for ac_lib in '' x; do
4867 + if test -z "$ac_lib"; then
4868 + ac_res="none required"
4869 + else
4870 + ac_res=-l$ac_lib
4871 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4872 + fi
4873 + rm -f conftest.$ac_objext conftest$ac_exeext
4874 +if { (ac_try="$ac_link"
4875 +case "(($ac_try" in
4876 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4877 + *) ac_try_echo=$ac_try;;
4878 +esac
4879 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4880 + (eval "$ac_link") 2>conftest.er1
4881 ac_status=$?
4882 grep -v '^ *+' conftest.er1 >conftest.err
4883 rm -f conftest.er1
4884 cat conftest.err >&5
4885 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4886 - (exit $ac_status); } &&
4887 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4888 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4889 - (eval $ac_try) 2>&5
4890 - ac_status=$?
4891 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4892 - (exit $ac_status); }; } &&
4893 - { ac_try='test -s conftest$ac_exeext'
4894 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4895 - (eval $ac_try) 2>&5
4896 - ac_status=$?
4897 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4898 - (exit $ac_status); }; }; then
4899 - ac_cv_search_opendir="none required"
4900 + (exit $ac_status); } && {
4901 + test -z "$ac_c_werror_flag" ||
4902 + test ! -s conftest.err
4903 + } && test -s conftest$ac_exeext &&
4904 + $as_test_x conftest$ac_exeext; then
4905 + ac_cv_search_opendir=$ac_res
4906 else
4907 echo "$as_me: failed program was:" >&5
4908 sed 's/^/| /' conftest.$ac_ext >&5
4909
4910 +
4911 fi
4912 -rm -f conftest.err conftest.$ac_objext \
4913 - conftest$ac_exeext conftest.$ac_ext
4914 -if test "$ac_cv_search_opendir" = no; then
4915 - for ac_lib in x; do
4916 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4917 - cat >conftest.$ac_ext <<_ACEOF
4918 -/* confdefs.h. */
4919 -_ACEOF
4920 -cat confdefs.h >>conftest.$ac_ext
4921 -cat >>conftest.$ac_ext <<_ACEOF
4922 -/* end confdefs.h. */
4923 -
4924 -/* Override any gcc2 internal prototype to avoid an error. */
4925 -#ifdef __cplusplus
4926 -extern "C"
4927 -#endif
4928 -/* We use char because int might match the return type of a gcc2
4929 - builtin and then its argument prototype would still apply. */
4930 -char opendir ();
4931 -int
4932 -main ()
4933 -{
4934 -opendir ();
4935 - ;
4936 - return 0;
4937 -}
4938 -_ACEOF
4939 -rm -f conftest.$ac_objext conftest$ac_exeext
4940 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4941 - (eval $ac_link) 2>conftest.er1
4942 - ac_status=$?
4943 - grep -v '^ *+' conftest.er1 >conftest.err
4944 - rm -f conftest.er1
4945 - cat conftest.err >&5
4946 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4947 - (exit $ac_status); } &&
4948 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4949 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4950 - (eval $ac_try) 2>&5
4951 - ac_status=$?
4952 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4953 - (exit $ac_status); }; } &&
4954 - { ac_try='test -s conftest$ac_exeext'
4955 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4956 - (eval $ac_try) 2>&5
4957 - ac_status=$?
4958 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4959 - (exit $ac_status); }; }; then
4960 - ac_cv_search_opendir="-l$ac_lib"
4961 -break
4962 -else
4963 - echo "$as_me: failed program was:" >&5
4964 -sed 's/^/| /' conftest.$ac_ext >&5
4965
4966 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4967 + conftest$ac_exeext
4968 + if test "${ac_cv_search_opendir+set}" = set; then
4969 + break
4970 fi
4971 -rm -f conftest.err conftest.$ac_objext \
4972 - conftest$ac_exeext conftest.$ac_ext
4973 - done
4974 +done
4975 +if test "${ac_cv_search_opendir+set}" = set; then
4976 + :
4977 +else
4978 + ac_cv_search_opendir=no
4979 fi
4980 +rm conftest.$ac_ext
4981 LIBS=$ac_func_search_save_LIBS
4982 fi
4983 -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
4984 -echo "${ECHO_T}$ac_cv_search_opendir" >&6
4985 -if test "$ac_cv_search_opendir" != no; then
4986 - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
4987 +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
4988 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
4989 +ac_res=$ac_cv_search_opendir
4990 +if test "$ac_res" != no; then
4991 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
4992
4993 fi
4994
4995 @@ -4084,9 +4615,9 @@
4996 inttypes.h stdint.h unistd.h
4997 do
4998 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
4999 -echo "$as_me:$LINENO: checking for $ac_header" >&5
5000 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5001 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
5002 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
5003 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
5004 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5005 echo $ECHO_N "(cached) $ECHO_C" >&6
5006 else
5007 cat >conftest.$ac_ext <<_ACEOF
5008 @@ -4100,37 +4631,35 @@
5009 #include <$ac_header>
5010 _ACEOF
5011 rm -f conftest.$ac_objext
5012 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5013 - (eval $ac_compile) 2>conftest.er1
5014 +if { (ac_try="$ac_compile"
5015 +case "(($ac_try" in
5016 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5017 + *) ac_try_echo=$ac_try;;
5018 +esac
5019 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5020 + (eval "$ac_compile") 2>conftest.er1
5021 ac_status=$?
5022 grep -v '^ *+' conftest.er1 >conftest.err
5023 rm -f conftest.er1
5024 cat conftest.err >&5
5025 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5026 - (exit $ac_status); } &&
5027 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5028 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5029 - (eval $ac_try) 2>&5
5030 - ac_status=$?
5031 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5032 - (exit $ac_status); }; } &&
5033 - { ac_try='test -s conftest.$ac_objext'
5034 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5035 - (eval $ac_try) 2>&5
5036 - ac_status=$?
5037 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5038 - (exit $ac_status); }; }; then
5039 + (exit $ac_status); } && {
5040 + test -z "$ac_c_werror_flag" ||
5041 + test ! -s conftest.err
5042 + } && test -s conftest.$ac_objext; then
5043 eval "$as_ac_Header=yes"
5044 else
5045 echo "$as_me: failed program was:" >&5
5046 sed 's/^/| /' conftest.$ac_ext >&5
5047
5048 -eval "$as_ac_Header=no"
5049 + eval "$as_ac_Header=no"
5050 fi
5051 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5052 +
5053 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5054 fi
5055 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
5056 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5057 +ac_res=`eval echo '${'$as_ac_Header'}'`
5058 + { echo "$as_me:$LINENO: result: $ac_res" >&5
5059 +echo "${ECHO_T}$ac_res" >&6; }
5060 if test `eval echo '${'$as_ac_Header'}'` = yes; then
5061 cat >>confdefs.h <<_ACEOF
5062 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
5063 @@ -4145,18 +4674,19 @@
5064 for ac_header in dlfcn.h
5065 do
5066 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
5067 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
5068 - echo "$as_me:$LINENO: checking for $ac_header" >&5
5069 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5070 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
5071 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5072 + { echo "$as_me:$LINENO: checking for $ac_header" >&5
5073 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
5074 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5075 echo $ECHO_N "(cached) $ECHO_C" >&6
5076 fi
5077 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
5078 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5079 +ac_res=`eval echo '${'$as_ac_Header'}'`
5080 + { echo "$as_me:$LINENO: result: $ac_res" >&5
5081 +echo "${ECHO_T}$ac_res" >&6; }
5082 else
5083 # Is the header compilable?
5084 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
5085 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
5086 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
5087 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
5088 cat >conftest.$ac_ext <<_ACEOF
5089 /* confdefs.h. */
5090 _ACEOF
5091 @@ -4167,40 +4697,37 @@
5092 #include <$ac_header>
5093 _ACEOF
5094 rm -f conftest.$ac_objext
5095 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5096 - (eval $ac_compile) 2>conftest.er1
5097 +if { (ac_try="$ac_compile"
5098 +case "(($ac_try" in
5099 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5100 + *) ac_try_echo=$ac_try;;
5101 +esac
5102 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5103 + (eval "$ac_compile") 2>conftest.er1
5104 ac_status=$?
5105 grep -v '^ *+' conftest.er1 >conftest.err
5106 rm -f conftest.er1
5107 cat conftest.err >&5
5108 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5109 - (exit $ac_status); } &&
5110 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5111 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5112 - (eval $ac_try) 2>&5
5113 - ac_status=$?
5114 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5115 - (exit $ac_status); }; } &&
5116 - { ac_try='test -s conftest.$ac_objext'
5117 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5118 - (eval $ac_try) 2>&5
5119 - ac_status=$?
5120 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5121 - (exit $ac_status); }; }; then
5122 + (exit $ac_status); } && {
5123 + test -z "$ac_c_werror_flag" ||
5124 + test ! -s conftest.err
5125 + } && test -s conftest.$ac_objext; then
5126 ac_header_compiler=yes
5127 else
5128 echo "$as_me: failed program was:" >&5
5129 sed 's/^/| /' conftest.$ac_ext >&5
5130
5131 -ac_header_compiler=no
5132 + ac_header_compiler=no
5133 fi
5134 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5135 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
5136 -echo "${ECHO_T}$ac_header_compiler" >&6
5137 +
5138 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5139 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
5140 +echo "${ECHO_T}$ac_header_compiler" >&6; }
5141
5142 # Is the header present?
5143 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
5144 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
5145 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
5146 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
5147 cat >conftest.$ac_ext <<_ACEOF
5148 /* confdefs.h. */
5149 _ACEOF
5150 @@ -4209,24 +4736,22 @@
5151 /* end confdefs.h. */
5152 #include <$ac_header>
5153 _ACEOF
5154 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
5155 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5156 +if { (ac_try="$ac_cpp conftest.$ac_ext"
5157 +case "(($ac_try" in
5158 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5159 + *) ac_try_echo=$ac_try;;
5160 +esac
5161 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5162 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5163 ac_status=$?
5164 grep -v '^ *+' conftest.er1 >conftest.err
5165 rm -f conftest.er1
5166 cat conftest.err >&5
5167 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5168 - (exit $ac_status); } >/dev/null; then
5169 - if test -s conftest.err; then
5170 - ac_cpp_err=$ac_c_preproc_warn_flag
5171 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
5172 - else
5173 - ac_cpp_err=
5174 - fi
5175 -else
5176 - ac_cpp_err=yes
5177 -fi
5178 -if test -z "$ac_cpp_err"; then
5179 + (exit $ac_status); } >/dev/null && {
5180 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5181 + test ! -s conftest.err
5182 + }; then
5183 ac_header_preproc=yes
5184 else
5185 echo "$as_me: failed program was:" >&5
5186 @@ -4234,9 +4759,10 @@
5187
5188 ac_header_preproc=no
5189 fi
5190 +
5191 rm -f conftest.err conftest.$ac_ext
5192 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
5193 -echo "${ECHO_T}$ac_header_preproc" >&6
5194 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
5195 +echo "${ECHO_T}$ac_header_preproc" >&6; }
5196
5197 # So? What about this header?
5198 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
5199 @@ -4260,25 +4786,24 @@
5200 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
5201 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
5202 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
5203 - (
5204 - cat <<\_ASBOX
5205 + ( cat <<\_ASBOX
5206 ## ------------------------------------------------- ##
5207 ## Report this to gphoto-devel@lists.sourceforge.net ##
5208 ## ------------------------------------------------- ##
5209 _ASBOX
5210 - ) |
5211 - sed "s/^/$as_me: WARNING: /" >&2
5212 + ) | sed "s/^/$as_me: WARNING: /" >&2
5213 ;;
5214 esac
5215 -echo "$as_me:$LINENO: checking for $ac_header" >&5
5216 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5217 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
5218 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
5219 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
5220 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5221 echo $ECHO_N "(cached) $ECHO_C" >&6
5222 else
5223 eval "$as_ac_Header=\$ac_header_preproc"
5224 fi
5225 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
5226 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5227 +ac_res=`eval echo '${'$as_ac_Header'}'`
5228 + { echo "$as_me:$LINENO: result: $ac_res" >&5
5229 +echo "${ECHO_T}$ac_res" >&6; }
5230
5231 fi
5232 if test `eval echo '${'$as_ac_Header'}'` = yes; then
5233 @@ -4290,11 +4815,11 @@
5234
5235 done
5236
5237 -# Check whether --enable-ltdl-install or --disable-ltdl-install was given.
5238 +# Check whether --enable-ltdl-install was given.
5239 if test "${enable_ltdl_install+set}" = set; then
5240 - enableval="$enable_ltdl_install"
5241 + enableval=$enable_ltdl_install;
5242 +fi
5243
5244 -fi;
5245
5246
5247
5248 @@ -4317,8 +4842,8 @@
5249 fi
5250
5251
5252 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
5253 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
5254 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
5255 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
5256 library_names_spec=
5257 libname_spec='lib$name'
5258 soname_spec=
5259 @@ -4917,8 +5442,8 @@
5260 dynamic_linker=no
5261 ;;
5262 esac
5263 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
5264 -echo "${ECHO_T}$dynamic_linker" >&6
5265 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
5266 +echo "${ECHO_T}$dynamic_linker" >&6; }
5267 test "$dynamic_linker" = no && can_build_shared=no
5268
5269 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
5270 @@ -4927,8 +5452,8 @@
5271 fi
5272
5273
5274 -echo "$as_me:$LINENO: checking which extension is used for loadable modules" >&5
5275 -echo $ECHO_N "checking which extension is used for loadable modules... $ECHO_C" >&6
5276 +{ echo "$as_me:$LINENO: checking which extension is used for loadable modules" >&5
5277 +echo $ECHO_N "checking which extension is used for loadable modules... $ECHO_C" >&6; }
5278 if test "${libltdl_cv_shlibext+set}" = set; then
5279 echo $ECHO_N "(cached) $ECHO_C" >&6
5280 else
5281 @@ -4937,8 +5462,8 @@
5282 eval libltdl_cv_shlibext=$shrext_cmds
5283
5284 fi
5285 -echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
5286 -echo "${ECHO_T}$libltdl_cv_shlibext" >&6
5287 +{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
5288 +echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
5289 if test -n "$libltdl_cv_shlibext"; then
5290
5291 cat >>confdefs.h <<_ACEOF
5292 @@ -4948,15 +5473,15 @@
5293 fi
5294
5295
5296 -echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
5297 -echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6
5298 +{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
5299 +echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
5300 if test "${libltdl_cv_shlibpath_var+set}" = set; then
5301 echo $ECHO_N "(cached) $ECHO_C" >&6
5302 else
5303 libltdl_cv_shlibpath_var="$shlibpath_var"
5304 fi
5305 -echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
5306 -echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6
5307 +{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
5308 +echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
5309 if test -n "$libltdl_cv_shlibpath_var"; then
5310
5311 cat >>confdefs.h <<_ACEOF
5312 @@ -4966,15 +5491,15 @@
5313 fi
5314
5315
5316 -echo "$as_me:$LINENO: checking for the default library search path" >&5
5317 -echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6
5318 +{ echo "$as_me:$LINENO: checking for the default library search path" >&5
5319 +echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
5320 if test "${libltdl_cv_sys_search_path+set}" = set; then
5321 echo $ECHO_N "(cached) $ECHO_C" >&6
5322 else
5323 libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"
5324 fi
5325 -echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
5326 -echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6
5327 +{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
5328 +echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6; }
5329 if test -n "$libltdl_cv_sys_search_path"; then
5330 sys_search_path=
5331 for dir in $libltdl_cv_sys_search_path; do
5332 @@ -4991,8 +5516,8 @@
5333
5334 fi
5335
5336 -echo "$as_me:$LINENO: checking for objdir" >&5
5337 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6
5338 +{ echo "$as_me:$LINENO: checking for objdir" >&5
5339 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
5340 if test "${libltdl_cv_objdir+set}" = set; then
5341 echo $ECHO_N "(cached) $ECHO_C" >&6
5342 else
5343 @@ -5012,8 +5537,8 @@
5344 fi
5345
5346 fi
5347 -echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
5348 -echo "${ECHO_T}$libltdl_cv_objdir" >&6
5349 +{ echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
5350 +echo "${ECHO_T}$libltdl_cv_objdir" >&6; }
5351
5352 cat >>confdefs.h <<_ACEOF
5353 #define LTDL_OBJDIR "$libltdl_cv_objdir/"
5354 @@ -5021,61 +5546,90 @@
5355
5356
5357 # Make sure we can run config.sub.
5358 -$ac_config_sub sun4 >/dev/null 2>&1 ||
5359 - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
5360 -echo "$as_me: error: cannot run $ac_config_sub" >&2;}
5361 +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
5362 + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
5363 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
5364 { (exit 1); exit 1; }; }
5365
5366 -echo "$as_me:$LINENO: checking build system type" >&5
5367 -echo $ECHO_N "checking build system type... $ECHO_C" >&6
5368 +{ echo "$as_me:$LINENO: checking build system type" >&5
5369 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
5370 if test "${ac_cv_build+set}" = set; then
5371 echo $ECHO_N "(cached) $ECHO_C" >&6
5372 else
5373 - ac_cv_build_alias=$build_alias
5374 -test -z "$ac_cv_build_alias" &&
5375 - ac_cv_build_alias=`$ac_config_guess`
5376 -test -z "$ac_cv_build_alias" &&
5377 + ac_build_alias=$build_alias
5378 +test "x$ac_build_alias" = x &&
5379 + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
5380 +test "x$ac_build_alias" = x &&
5381 { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
5382 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
5383 { (exit 1); exit 1; }; }
5384 -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
5385 - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
5386 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
5387 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
5388 + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
5389 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
5390 { (exit 1); exit 1; }; }
5391
5392 fi
5393 -echo "$as_me:$LINENO: result: $ac_cv_build" >&5
5394 -echo "${ECHO_T}$ac_cv_build" >&6
5395 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
5396 +echo "${ECHO_T}$ac_cv_build" >&6; }
5397 +case $ac_cv_build in
5398 +*-*-*) ;;
5399 +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
5400 +echo "$as_me: error: invalid value of canonical build" >&2;}
5401 + { (exit 1); exit 1; }; };;
5402 +esac
5403 build=$ac_cv_build
5404 -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
5405 -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
5406 -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
5407 +ac_save_IFS=$IFS; IFS='-'
5408 +set x $ac_cv_build
5409 +shift
5410 +build_cpu=$1
5411 +build_vendor=$2
5412 +shift; shift
5413 +# Remember, the first character of IFS is used to create $*,
5414 +# except with old shells:
5415 +build_os=$*
5416 +IFS=$ac_save_IFS
5417 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
5418
5419
5420 -echo "$as_me:$LINENO: checking host system type" >&5
5421 -echo $ECHO_N "checking host system type... $ECHO_C" >&6
5422 +{ echo "$as_me:$LINENO: checking host system type" >&5
5423 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
5424 if test "${ac_cv_host+set}" = set; then
5425 echo $ECHO_N "(cached) $ECHO_C" >&6
5426 else
5427 - ac_cv_host_alias=$host_alias
5428 -test -z "$ac_cv_host_alias" &&
5429 - ac_cv_host_alias=$ac_cv_build_alias
5430 -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
5431 - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
5432 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
5433 + if test "x$host_alias" = x; then
5434 + ac_cv_host=$ac_cv_build
5435 +else
5436 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
5437 + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
5438 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
5439 { (exit 1); exit 1; }; }
5440 +fi
5441
5442 fi
5443 -echo "$as_me:$LINENO: result: $ac_cv_host" >&5
5444 -echo "${ECHO_T}$ac_cv_host" >&6
5445 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
5446 +echo "${ECHO_T}$ac_cv_host" >&6; }
5447 +case $ac_cv_host in
5448 +*-*-*) ;;
5449 +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
5450 +echo "$as_me: error: invalid value of canonical host" >&2;}
5451 + { (exit 1); exit 1; }; };;
5452 +esac
5453 host=$ac_cv_host
5454 -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
5455 -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
5456 -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
5457 +ac_save_IFS=$IFS; IFS='-'
5458 +set x $ac_cv_host
5459 +shift
5460 +host_cpu=$1
5461 +host_vendor=$2
5462 +shift; shift
5463 +# Remember, the first character of IFS is used to create $*,
5464 +# except with old shells:
5465 +host_os=$*
5466 +IFS=$ac_save_IFS
5467 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
5468
5469
5470 -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
5471 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
5472 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
5473 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
5474 if test "${lt_cv_path_NM+set}" = set; then
5475 echo $ECHO_N "(cached) $ECHO_C" >&6
5476 else
5477 @@ -5123,8 +5677,8 @@
5478 test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
5479 fi
5480 fi
5481 -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
5482 -echo "${ECHO_T}$lt_cv_path_NM" >&6
5483 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
5484 +echo "${ECHO_T}$lt_cv_path_NM" >&6; }
5485 NM="$lt_cv_path_NM"
5486
5487
5488 @@ -5132,8 +5686,8 @@
5489
5490
5491 # Check for command to grab the raw symbol name followed by C symbol from nm.
5492 -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
5493 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
5494 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
5495 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
5496 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
5497 echo $ECHO_N "(cached) $ECHO_C" >&6
5498 else
5499 @@ -5337,16 +5891,16 @@
5500 lt_cv_sys_global_symbol_to_cdecl=
5501 fi
5502 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
5503 - echo "$as_me:$LINENO: result: failed" >&5
5504 -echo "${ECHO_T}failed" >&6
5505 + { echo "$as_me:$LINENO: result: failed" >&5
5506 +echo "${ECHO_T}failed" >&6; }
5507 else
5508 - echo "$as_me:$LINENO: result: ok" >&5
5509 -echo "${ECHO_T}ok" >&6
5510 + { echo "$as_me:$LINENO: result: ok" >&5
5511 +echo "${ECHO_T}ok" >&6; }
5512 fi
5513
5514
5515 -echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
5516 -echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6
5517 +{ echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
5518 +echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
5519 if test "${libltdl_cv_preloaded_symbols+set}" = set; then
5520 echo $ECHO_N "(cached) $ECHO_C" >&6
5521 else
5522 @@ -5357,8 +5911,8 @@
5523 fi
5524
5525 fi
5526 -echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
5527 -echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6
5528 +{ echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
5529 +echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
5530 if test x"$libltdl_cv_preloaded_symbols" = xyes; then
5531
5532 cat >>confdefs.h <<\_ACEOF
5533 @@ -5376,8 +5930,8 @@
5534 ac_compiler_gnu=$ac_cv_c_compiler_gnu
5535
5536
5537 -echo "$as_me:$LINENO: checking for shl_load" >&5
5538 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
5539 +{ echo "$as_me:$LINENO: checking for shl_load" >&5
5540 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
5541 if test "${ac_cv_func_shl_load+set}" = set; then
5542 echo $ECHO_N "(cached) $ECHO_C" >&6
5543 else
5544 @@ -5404,67 +5958,59 @@
5545
5546 #undef shl_load
5547
5548 -/* Override any gcc2 internal prototype to avoid an error. */
5549 +/* Override any GCC internal prototype to avoid an error.
5550 + Use char because int might match the return type of a GCC
5551 + builtin and then its argument prototype would still apply. */
5552 #ifdef __cplusplus
5553 extern "C"
5554 -{
5555 #endif
5556 -/* We use char because int might match the return type of a gcc2
5557 - builtin and then its argument prototype would still apply. */
5558 char shl_load ();
5559 /* The GNU C library defines this for functions which it implements
5560 to always fail with ENOSYS. Some functions are actually named
5561 something starting with __ and the normal name is an alias. */
5562 -#if defined (__stub_shl_load) || defined (__stub___shl_load)
5563 +#if defined __stub_shl_load || defined __stub___shl_load
5564 choke me
5565 -#else
5566 -char (*f) () = shl_load;
5567 -#endif
5568 -#ifdef __cplusplus
5569 -}
5570 #endif
5571
5572 int
5573 main ()
5574 {
5575 -return f != shl_load;
5576 +return shl_load ();
5577 ;
5578 return 0;
5579 }
5580 _ACEOF
5581 rm -f conftest.$ac_objext conftest$ac_exeext
5582 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5583 - (eval $ac_link) 2>conftest.er1
5584 +if { (ac_try="$ac_link"
5585 +case "(($ac_try" in
5586 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5587 + *) ac_try_echo=$ac_try;;
5588 +esac
5589 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5590 + (eval "$ac_link") 2>conftest.er1
5591 ac_status=$?
5592 grep -v '^ *+' conftest.er1 >conftest.err
5593 rm -f conftest.er1
5594 cat conftest.err >&5
5595 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5596 - (exit $ac_status); } &&
5597 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5598 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5599 - (eval $ac_try) 2>&5
5600 - ac_status=$?
5601 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5602 - (exit $ac_status); }; } &&
5603 - { ac_try='test -s conftest$ac_exeext'
5604 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5605 - (eval $ac_try) 2>&5
5606 - ac_status=$?
5607 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5608 - (exit $ac_status); }; }; then
5609 + (exit $ac_status); } && {
5610 + test -z "$ac_c_werror_flag" ||
5611 + test ! -s conftest.err
5612 + } && test -s conftest$ac_exeext &&
5613 + $as_test_x conftest$ac_exeext; then
5614 ac_cv_func_shl_load=yes
5615 else
5616 echo "$as_me: failed program was:" >&5
5617 sed 's/^/| /' conftest.$ac_ext >&5
5618
5619 -ac_cv_func_shl_load=no
5620 + ac_cv_func_shl_load=no
5621 fi
5622 -rm -f conftest.err conftest.$ac_objext \
5623 +
5624 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5625 conftest$ac_exeext conftest.$ac_ext
5626 fi
5627 -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
5628 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6
5629 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
5630 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
5631 if test $ac_cv_func_shl_load = yes; then
5632
5633 cat >>confdefs.h <<\_ACEOF
5634 @@ -5472,8 +6018,8 @@
5635 _ACEOF
5636
5637 else
5638 - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
5639 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
5640 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
5641 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
5642 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
5643 echo $ECHO_N "(cached) $ECHO_C" >&6
5644 else
5645 @@ -5486,55 +6032,53 @@
5646 cat >>conftest.$ac_ext <<_ACEOF
5647 /* end confdefs.h. */
5648
5649 -/* Override any gcc2 internal prototype to avoid an error. */
5650 +/* Override any GCC internal prototype to avoid an error.
5651 + Use char because int might match the return type of a GCC
5652 + builtin and then its argument prototype would still apply. */
5653 #ifdef __cplusplus
5654 extern "C"
5655 #endif
5656 -/* We use char because int might match the return type of a gcc2
5657 - builtin and then its argument prototype would still apply. */
5658 char shl_load ();
5659 int
5660 main ()
5661 {
5662 -shl_load ();
5663 +return shl_load ();
5664 ;
5665 return 0;
5666 }
5667 _ACEOF
5668 rm -f conftest.$ac_objext conftest$ac_exeext
5669 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5670 - (eval $ac_link) 2>conftest.er1
5671 +if { (ac_try="$ac_link"
5672 +case "(($ac_try" in
5673 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5674 + *) ac_try_echo=$ac_try;;
5675 +esac
5676 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5677 + (eval "$ac_link") 2>conftest.er1
5678 ac_status=$?
5679 grep -v '^ *+' conftest.er1 >conftest.err
5680 rm -f conftest.er1
5681 cat conftest.err >&5
5682 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5683 - (exit $ac_status); } &&
5684 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5685 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5686 - (eval $ac_try) 2>&5
5687 - ac_status=$?
5688 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5689 - (exit $ac_status); }; } &&
5690 - { ac_try='test -s conftest$ac_exeext'
5691 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5692 - (eval $ac_try) 2>&5
5693 - ac_status=$?
5694 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5695 - (exit $ac_status); }; }; then
5696 + (exit $ac_status); } && {
5697 + test -z "$ac_c_werror_flag" ||
5698 + test ! -s conftest.err
5699 + } && test -s conftest$ac_exeext &&
5700 + $as_test_x conftest$ac_exeext; then
5701 ac_cv_lib_dld_shl_load=yes
5702 else
5703 echo "$as_me: failed program was:" >&5
5704 sed 's/^/| /' conftest.$ac_ext >&5
5705
5706 -ac_cv_lib_dld_shl_load=no
5707 + ac_cv_lib_dld_shl_load=no
5708 fi
5709 -rm -f conftest.err conftest.$ac_objext \
5710 +
5711 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5712 conftest$ac_exeext conftest.$ac_ext
5713 LIBS=$ac_check_lib_save_LIBS
5714 fi
5715 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
5716 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
5717 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
5718 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
5719 if test $ac_cv_lib_dld_shl_load = yes; then
5720
5721 cat >>confdefs.h <<\_ACEOF
5722 @@ -5543,8 +6087,8 @@
5723
5724 LIBADD_DL="$LIBADD_DL -ldld"
5725 else
5726 - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
5727 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
5728 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
5729 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
5730 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
5731 echo $ECHO_N "(cached) $ECHO_C" >&6
5732 else
5733 @@ -5557,55 +6101,53 @@
5734 cat >>conftest.$ac_ext <<_ACEOF
5735 /* end confdefs.h. */
5736
5737 -/* Override any gcc2 internal prototype to avoid an error. */
5738 +/* Override any GCC internal prototype to avoid an error.
5739 + Use char because int might match the return type of a GCC
5740 + builtin and then its argument prototype would still apply. */
5741 #ifdef __cplusplus
5742 extern "C"
5743 #endif
5744 -/* We use char because int might match the return type of a gcc2
5745 - builtin and then its argument prototype would still apply. */
5746 char dlopen ();
5747 int
5748 main ()
5749 {
5750 -dlopen ();
5751 +return dlopen ();
5752 ;
5753 return 0;
5754 }
5755 _ACEOF
5756 rm -f conftest.$ac_objext conftest$ac_exeext
5757 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5758 - (eval $ac_link) 2>conftest.er1
5759 +if { (ac_try="$ac_link"
5760 +case "(($ac_try" in
5761 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5762 + *) ac_try_echo=$ac_try;;
5763 +esac
5764 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5765 + (eval "$ac_link") 2>conftest.er1
5766 ac_status=$?
5767 grep -v '^ *+' conftest.er1 >conftest.err
5768 rm -f conftest.er1
5769 cat conftest.err >&5
5770 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5771 - (exit $ac_status); } &&
5772 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5773 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5774 - (eval $ac_try) 2>&5
5775 - ac_status=$?
5776 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5777 - (exit $ac_status); }; } &&
5778 - { ac_try='test -s conftest$ac_exeext'
5779 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5780 - (eval $ac_try) 2>&5
5781 - ac_status=$?
5782 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5783 - (exit $ac_status); }; }; then
5784 + (exit $ac_status); } && {
5785 + test -z "$ac_c_werror_flag" ||
5786 + test ! -s conftest.err
5787 + } && test -s conftest$ac_exeext &&
5788 + $as_test_x conftest$ac_exeext; then
5789 ac_cv_lib_dl_dlopen=yes
5790 else
5791 echo "$as_me: failed program was:" >&5
5792 sed 's/^/| /' conftest.$ac_ext >&5
5793
5794 -ac_cv_lib_dl_dlopen=no
5795 + ac_cv_lib_dl_dlopen=no
5796 fi
5797 -rm -f conftest.err conftest.$ac_objext \
5798 +
5799 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5800 conftest$ac_exeext conftest.$ac_ext
5801 LIBS=$ac_check_lib_save_LIBS
5802 fi
5803 -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
5804 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
5805 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
5806 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
5807 if test $ac_cv_lib_dl_dlopen = yes; then
5808
5809 cat >>confdefs.h <<\_ACEOF
5810 @@ -5633,26 +6175,23 @@
5811 }
5812 _ACEOF
5813 rm -f conftest.$ac_objext conftest$ac_exeext
5814 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5815 - (eval $ac_link) 2>conftest.er1
5816 +if { (ac_try="$ac_link"
5817 +case "(($ac_try" in
5818 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5819 + *) ac_try_echo=$ac_try;;
5820 +esac
5821 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5822 + (eval "$ac_link") 2>conftest.er1
5823 ac_status=$?
5824 grep -v '^ *+' conftest.er1 >conftest.err
5825 rm -f conftest.er1
5826 cat conftest.err >&5
5827 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5828 - (exit $ac_status); } &&
5829 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5830 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5831 - (eval $ac_try) 2>&5
5832 - ac_status=$?
5833 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5834 - (exit $ac_status); }; } &&
5835 - { ac_try='test -s conftest$ac_exeext'
5836 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5837 - (eval $ac_try) 2>&5
5838 - ac_status=$?
5839 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5840 - (exit $ac_status); }; }; then
5841 + (exit $ac_status); } && {
5842 + test -z "$ac_c_werror_flag" ||
5843 + test ! -s conftest.err
5844 + } && test -s conftest$ac_exeext &&
5845 + $as_test_x conftest$ac_exeext; then
5846
5847 cat >>confdefs.h <<\_ACEOF
5848 #define HAVE_LIBDL 1
5849 @@ -5662,8 +6201,8 @@
5850 echo "$as_me: failed program was:" >&5
5851 sed 's/^/| /' conftest.$ac_ext >&5
5852
5853 -echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
5854 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
5855 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
5856 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
5857 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
5858 echo $ECHO_N "(cached) $ECHO_C" >&6
5859 else
5860 @@ -5676,55 +6215,53 @@
5861 cat >>conftest.$ac_ext <<_ACEOF
5862 /* end confdefs.h. */
5863
5864 -/* Override any gcc2 internal prototype to avoid an error. */
5865 +/* Override any GCC internal prototype to avoid an error.
5866 + Use char because int might match the return type of a GCC
5867 + builtin and then its argument prototype would still apply. */
5868 #ifdef __cplusplus
5869 extern "C"
5870 #endif
5871 -/* We use char because int might match the return type of a gcc2
5872 - builtin and then its argument prototype would still apply. */
5873 char dlopen ();
5874 int
5875 main ()
5876 {
5877 -dlopen ();
5878 +return dlopen ();
5879 ;
5880 return 0;
5881 }
5882 _ACEOF
5883 rm -f conftest.$ac_objext conftest$ac_exeext
5884 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5885 - (eval $ac_link) 2>conftest.er1
5886 +if { (ac_try="$ac_link"
5887 +case "(($ac_try" in
5888 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5889 + *) ac_try_echo=$ac_try;;
5890 +esac
5891 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5892 + (eval "$ac_link") 2>conftest.er1
5893 ac_status=$?
5894 grep -v '^ *+' conftest.er1 >conftest.err
5895 rm -f conftest.er1
5896 cat conftest.err >&5
5897 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5898 - (exit $ac_status); } &&
5899 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5900 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5901 - (eval $ac_try) 2>&5
5902 - ac_status=$?
5903 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5904 - (exit $ac_status); }; } &&
5905 - { ac_try='test -s conftest$ac_exeext'
5906 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5907 - (eval $ac_try) 2>&5
5908 - ac_status=$?
5909 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5910 - (exit $ac_status); }; }; then
5911 + (exit $ac_status); } && {
5912 + test -z "$ac_c_werror_flag" ||
5913 + test ! -s conftest.err
5914 + } && test -s conftest$ac_exeext &&
5915 + $as_test_x conftest$ac_exeext; then
5916 ac_cv_lib_svld_dlopen=yes
5917 else
5918 echo "$as_me: failed program was:" >&5
5919 sed 's/^/| /' conftest.$ac_ext >&5
5920
5921 -ac_cv_lib_svld_dlopen=no
5922 + ac_cv_lib_svld_dlopen=no
5923 fi
5924 -rm -f conftest.err conftest.$ac_objext \
5925 +
5926 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5927 conftest$ac_exeext conftest.$ac_ext
5928 LIBS=$ac_check_lib_save_LIBS
5929 fi
5930 -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
5931 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
5932 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
5933 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
5934 if test $ac_cv_lib_svld_dlopen = yes; then
5935
5936 cat >>confdefs.h <<\_ACEOF
5937 @@ -5733,8 +6270,8 @@
5938
5939 LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes"
5940 else
5941 - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
5942 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
5943 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
5944 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
5945 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
5946 echo $ECHO_N "(cached) $ECHO_C" >&6
5947 else
5948 @@ -5747,55 +6284,53 @@
5949 cat >>conftest.$ac_ext <<_ACEOF
5950 /* end confdefs.h. */
5951
5952 -/* Override any gcc2 internal prototype to avoid an error. */
5953 +/* Override any GCC internal prototype to avoid an error.
5954 + Use char because int might match the return type of a GCC
5955 + builtin and then its argument prototype would still apply. */
5956 #ifdef __cplusplus
5957 extern "C"
5958 #endif
5959 -/* We use char because int might match the return type of a gcc2
5960 - builtin and then its argument prototype would still apply. */
5961 char dld_link ();
5962 int
5963 main ()
5964 {
5965 -dld_link ();
5966 +return dld_link ();
5967 ;
5968 return 0;
5969 }
5970 _ACEOF
5971 rm -f conftest.$ac_objext conftest$ac_exeext
5972 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5973 - (eval $ac_link) 2>conftest.er1
5974 +if { (ac_try="$ac_link"
5975 +case "(($ac_try" in
5976 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5977 + *) ac_try_echo=$ac_try;;
5978 +esac
5979 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5980 + (eval "$ac_link") 2>conftest.er1
5981 ac_status=$?
5982 grep -v '^ *+' conftest.er1 >conftest.err
5983 rm -f conftest.er1
5984 cat conftest.err >&5
5985 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5986 - (exit $ac_status); } &&
5987 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5988 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5989 - (eval $ac_try) 2>&5
5990 - ac_status=$?
5991 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5992 - (exit $ac_status); }; } &&
5993 - { ac_try='test -s conftest$ac_exeext'
5994 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5995 - (eval $ac_try) 2>&5
5996 - ac_status=$?
5997 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5998 - (exit $ac_status); }; }; then
5999 + (exit $ac_status); } && {
6000 + test -z "$ac_c_werror_flag" ||
6001 + test ! -s conftest.err
6002 + } && test -s conftest$ac_exeext &&
6003 + $as_test_x conftest$ac_exeext; then
6004 ac_cv_lib_dld_dld_link=yes
6005 else
6006 echo "$as_me: failed program was:" >&5
6007 sed 's/^/| /' conftest.$ac_ext >&5
6008
6009 -ac_cv_lib_dld_dld_link=no
6010 + ac_cv_lib_dld_dld_link=no
6011 fi
6012 -rm -f conftest.err conftest.$ac_objext \
6013 +
6014 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6015 conftest$ac_exeext conftest.$ac_ext
6016 LIBS=$ac_check_lib_save_LIBS
6017 fi
6018 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
6019 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
6020 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
6021 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
6022 if test $ac_cv_lib_dld_dld_link = yes; then
6023
6024 cat >>confdefs.h <<\_ACEOF
6025 @@ -5804,8 +6339,8 @@
6026
6027 LIBADD_DL="$LIBADD_DL -ldld"
6028 else
6029 - echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
6030 -echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6
6031 + { echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
6032 +echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6; }
6033 if test "${ac_cv_func__dyld_func_lookup+set}" = set; then
6034 echo $ECHO_N "(cached) $ECHO_C" >&6
6035 else
6036 @@ -5832,67 +6367,59 @@
6037
6038 #undef _dyld_func_lookup
6039
6040 -/* Override any gcc2 internal prototype to avoid an error. */
6041 +/* Override any GCC internal prototype to avoid an error.
6042 + Use char because int might match the return type of a GCC
6043 + builtin and then its argument prototype would still apply. */
6044 #ifdef __cplusplus
6045 extern "C"
6046 -{
6047 #endif
6048 -/* We use char because int might match the return type of a gcc2
6049 - builtin and then its argument prototype would still apply. */
6050 char _dyld_func_lookup ();
6051 /* The GNU C library defines this for functions which it implements
6052 to always fail with ENOSYS. Some functions are actually named
6053 something starting with __ and the normal name is an alias. */
6054 -#if defined (__stub__dyld_func_lookup) || defined (__stub____dyld_func_lookup)
6055 +#if defined __stub__dyld_func_lookup || defined __stub____dyld_func_lookup
6056 choke me
6057 -#else
6058 -char (*f) () = _dyld_func_lookup;
6059 -#endif
6060 -#ifdef __cplusplus
6061 -}
6062 #endif
6063
6064 int
6065 main ()
6066 {
6067 -return f != _dyld_func_lookup;
6068 +return _dyld_func_lookup ();
6069 ;
6070 return 0;
6071 }
6072 _ACEOF
6073 rm -f conftest.$ac_objext conftest$ac_exeext
6074 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6075 - (eval $ac_link) 2>conftest.er1
6076 +if { (ac_try="$ac_link"
6077 +case "(($ac_try" in
6078 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6079 + *) ac_try_echo=$ac_try;;
6080 +esac
6081 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6082 + (eval "$ac_link") 2>conftest.er1
6083 ac_status=$?
6084 grep -v '^ *+' conftest.er1 >conftest.err
6085 rm -f conftest.er1
6086 cat conftest.err >&5
6087 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6088 - (exit $ac_status); } &&
6089 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6090 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6091 - (eval $ac_try) 2>&5
6092 - ac_status=$?
6093 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6094 - (exit $ac_status); }; } &&
6095 - { ac_try='test -s conftest$ac_exeext'
6096 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6097 - (eval $ac_try) 2>&5
6098 - ac_status=$?
6099 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6100 - (exit $ac_status); }; }; then
6101 + (exit $ac_status); } && {
6102 + test -z "$ac_c_werror_flag" ||
6103 + test ! -s conftest.err
6104 + } && test -s conftest$ac_exeext &&
6105 + $as_test_x conftest$ac_exeext; then
6106 ac_cv_func__dyld_func_lookup=yes
6107 else
6108 echo "$as_me: failed program was:" >&5
6109 sed 's/^/| /' conftest.$ac_ext >&5
6110
6111 -ac_cv_func__dyld_func_lookup=no
6112 + ac_cv_func__dyld_func_lookup=no
6113 fi
6114 -rm -f conftest.err conftest.$ac_objext \
6115 +
6116 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6117 conftest$ac_exeext conftest.$ac_ext
6118 fi
6119 -echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
6120 -echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6
6121 +{ echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
6122 +echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6; }
6123 if test $ac_cv_func__dyld_func_lookup = yes; then
6124
6125 cat >>confdefs.h <<\_ACEOF
6126 @@ -5909,7 +6436,8 @@
6127
6128
6129 fi
6130 -rm -f conftest.err conftest.$ac_objext \
6131 +
6132 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6133 conftest$ac_exeext conftest.$ac_ext
6134
6135 fi
6136 @@ -5929,9 +6457,9 @@
6137 for ac_func in dlerror
6138 do
6139 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
6140 -echo "$as_me:$LINENO: checking for $ac_func" >&5
6141 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
6142 -if eval "test \"\${$as_ac_var+set}\" = set"; then
6143 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
6144 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
6145 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
6146 echo $ECHO_N "(cached) $ECHO_C" >&6
6147 else
6148 cat >conftest.$ac_ext <<_ACEOF
6149 @@ -5957,67 +6485,60 @@
6150
6151 #undef $ac_func
6152
6153 -/* Override any gcc2 internal prototype to avoid an error. */
6154 +/* Override any GCC internal prototype to avoid an error.
6155 + Use char because int might match the return type of a GCC
6156 + builtin and then its argument prototype would still apply. */
6157 #ifdef __cplusplus
6158 extern "C"
6159 -{
6160 #endif
6161 -/* We use char because int might match the return type of a gcc2
6162 - builtin and then its argument prototype would still apply. */
6163 char $ac_func ();
6164 /* The GNU C library defines this for functions which it implements
6165 to always fail with ENOSYS. Some functions are actually named
6166 something starting with __ and the normal name is an alias. */
6167 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
6168 +#if defined __stub_$ac_func || defined __stub___$ac_func
6169 choke me
6170 -#else
6171 -char (*f) () = $ac_func;
6172 -#endif
6173 -#ifdef __cplusplus
6174 -}
6175 #endif
6176
6177 int
6178 main ()
6179 {
6180 -return f != $ac_func;
6181 +return $ac_func ();
6182 ;
6183 return 0;
6184 }
6185 _ACEOF
6186 rm -f conftest.$ac_objext conftest$ac_exeext
6187 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6188 - (eval $ac_link) 2>conftest.er1
6189 +if { (ac_try="$ac_link"
6190 +case "(($ac_try" in
6191 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6192 + *) ac_try_echo=$ac_try;;
6193 +esac
6194 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6195 + (eval "$ac_link") 2>conftest.er1
6196 ac_status=$?
6197 grep -v '^ *+' conftest.er1 >conftest.err
6198 rm -f conftest.er1
6199 cat conftest.err >&5
6200 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6201 - (exit $ac_status); } &&
6202 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6203 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6204 - (eval $ac_try) 2>&5
6205 - ac_status=$?
6206 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6207 - (exit $ac_status); }; } &&
6208 - { ac_try='test -s conftest$ac_exeext'
6209 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6210 - (eval $ac_try) 2>&5
6211 - ac_status=$?
6212 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6213 - (exit $ac_status); }; }; then
6214 + (exit $ac_status); } && {
6215 + test -z "$ac_c_werror_flag" ||
6216 + test ! -s conftest.err
6217 + } && test -s conftest$ac_exeext &&
6218 + $as_test_x conftest$ac_exeext; then
6219 eval "$as_ac_var=yes"
6220 else
6221 echo "$as_me: failed program was:" >&5
6222 sed 's/^/| /' conftest.$ac_ext >&5
6223
6224 -eval "$as_ac_var=no"
6225 + eval "$as_ac_var=no"
6226 fi
6227 -rm -f conftest.err conftest.$ac_objext \
6228 +
6229 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6230 conftest$ac_exeext conftest.$ac_ext
6231 fi
6232 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
6233 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
6234 +ac_res=`eval echo '${'$as_ac_var'}'`
6235 + { echo "$as_me:$LINENO: result: $ac_res" >&5
6236 +echo "${ECHO_T}$ac_res" >&6; }
6237 if test `eval echo '${'$as_ac_var'}'` = yes; then
6238 cat >>confdefs.h <<_ACEOF
6239 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
6240 @@ -6036,8 +6557,8 @@
6241
6242
6243
6244 -echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
6245 -echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6
6246 +{ echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
6247 +echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
6248 if test "${ac_cv_sys_symbol_underscore+set}" = set; then
6249 echo $ECHO_N "(cached) $ECHO_C" >&6
6250 else
6251 @@ -6078,15 +6599,15 @@
6252 rm -rf conftest*
6253
6254 fi
6255 -echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
6256 -echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6
6257 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
6258 +echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6; }
6259
6260
6261 if test x"$ac_cv_sys_symbol_underscore" = xyes; then
6262 if test x"$libltdl_cv_func_dlopen" = xyes ||
6263 test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
6264 - echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
6265 -echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6
6266 + { echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
6267 +echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
6268 if test "${libltdl_cv_need_uscore+set}" = set; then
6269 echo $ECHO_N "(cached) $ECHO_C" >&6
6270 else
6271 @@ -6099,7 +6620,7 @@
6272 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
6273 lt_status=$lt_dlunknown
6274 cat > conftest.$ac_ext <<EOF
6275 -#line 6102 "configure"
6276 +#line 6623 "configure"
6277 #include "confdefs.h"
6278
6279 #if HAVE_DLFCN_H
6280 @@ -6184,8 +6705,8 @@
6281 LIBS="$save_LIBS"
6282
6283 fi
6284 -echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
6285 -echo "${ECHO_T}$libltdl_cv_need_uscore" >&6
6286 +{ echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
6287 +echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
6288 fi
6289 fi
6290
6291 @@ -6198,8 +6719,8 @@
6292 fi
6293
6294
6295 -echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
6296 -echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6
6297 +{ echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
6298 +echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
6299 if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then
6300 echo $ECHO_N "(cached) $ECHO_C" >&6
6301 else
6302 @@ -6279,8 +6800,8 @@
6303 esac
6304
6305 fi
6306 -echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
6307 -echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6
6308 +{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
6309 +echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6; }
6310 if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
6311
6312 cat >>confdefs.h <<\_ACEOF
6313 @@ -6293,18 +6814,19 @@
6314 for ac_header in argz.h
6315 do
6316 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6317 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6318 - echo "$as_me:$LINENO: checking for $ac_header" >&5
6319 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6320 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6321 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6322 + { echo "$as_me:$LINENO: checking for $ac_header" >&5
6323 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
6324 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6325 echo $ECHO_N "(cached) $ECHO_C" >&6
6326 fi
6327 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6328 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6329 +ac_res=`eval echo '${'$as_ac_Header'}'`
6330 + { echo "$as_me:$LINENO: result: $ac_res" >&5
6331 +echo "${ECHO_T}$ac_res" >&6; }
6332 else
6333 # Is the header compilable?
6334 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
6335 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
6336 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
6337 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
6338 cat >conftest.$ac_ext <<_ACEOF
6339 /* confdefs.h. */
6340 _ACEOF
6341 @@ -6315,40 +6837,37 @@
6342 #include <$ac_header>
6343 _ACEOF
6344 rm -f conftest.$ac_objext
6345 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6346 - (eval $ac_compile) 2>conftest.er1
6347 +if { (ac_try="$ac_compile"
6348 +case "(($ac_try" in
6349 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6350 + *) ac_try_echo=$ac_try;;
6351 +esac
6352 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6353 + (eval "$ac_compile") 2>conftest.er1
6354 ac_status=$?
6355 grep -v '^ *+' conftest.er1 >conftest.err
6356 rm -f conftest.er1
6357 cat conftest.err >&5
6358 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6359 - (exit $ac_status); } &&
6360 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6361 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6362 - (eval $ac_try) 2>&5
6363 - ac_status=$?
6364 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6365 - (exit $ac_status); }; } &&
6366 - { ac_try='test -s conftest.$ac_objext'
6367 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6368 - (eval $ac_try) 2>&5
6369 - ac_status=$?
6370 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6371 - (exit $ac_status); }; }; then
6372 + (exit $ac_status); } && {
6373 + test -z "$ac_c_werror_flag" ||
6374 + test ! -s conftest.err
6375 + } && test -s conftest.$ac_objext; then
6376 ac_header_compiler=yes
6377 else
6378 echo "$as_me: failed program was:" >&5
6379 sed 's/^/| /' conftest.$ac_ext >&5
6380
6381 -ac_header_compiler=no
6382 + ac_header_compiler=no
6383 fi
6384 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6385 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6386 -echo "${ECHO_T}$ac_header_compiler" >&6
6387 +
6388 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6389 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6390 +echo "${ECHO_T}$ac_header_compiler" >&6; }
6391
6392 # Is the header present?
6393 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
6394 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
6395 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
6396 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
6397 cat >conftest.$ac_ext <<_ACEOF
6398 /* confdefs.h. */
6399 _ACEOF
6400 @@ -6357,24 +6876,22 @@
6401 /* end confdefs.h. */
6402 #include <$ac_header>
6403 _ACEOF
6404 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6405 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6406 +if { (ac_try="$ac_cpp conftest.$ac_ext"
6407 +case "(($ac_try" in
6408 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6409 + *) ac_try_echo=$ac_try;;
6410 +esac
6411 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6412 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
6413 ac_status=$?
6414 grep -v '^ *+' conftest.er1 >conftest.err
6415 rm -f conftest.er1
6416 cat conftest.err >&5
6417 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6418 - (exit $ac_status); } >/dev/null; then
6419 - if test -s conftest.err; then
6420 - ac_cpp_err=$ac_c_preproc_warn_flag
6421 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6422 - else
6423 - ac_cpp_err=
6424 - fi
6425 -else
6426 - ac_cpp_err=yes
6427 -fi
6428 -if test -z "$ac_cpp_err"; then
6429 + (exit $ac_status); } >/dev/null && {
6430 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
6431 + test ! -s conftest.err
6432 + }; then
6433 ac_header_preproc=yes
6434 else
6435 echo "$as_me: failed program was:" >&5
6436 @@ -6382,9 +6899,10 @@
6437
6438 ac_header_preproc=no
6439 fi
6440 +
6441 rm -f conftest.err conftest.$ac_ext
6442 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6443 -echo "${ECHO_T}$ac_header_preproc" >&6
6444 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6445 +echo "${ECHO_T}$ac_header_preproc" >&6; }
6446
6447 # So? What about this header?
6448 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
6449 @@ -6408,25 +6926,24 @@
6450 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
6451 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
6452 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
6453 - (
6454 - cat <<\_ASBOX
6455 + ( cat <<\_ASBOX
6456 ## ------------------------------------------------- ##
6457 ## Report this to gphoto-devel@lists.sourceforge.net ##
6458 ## ------------------------------------------------- ##
6459 _ASBOX
6460 - ) |
6461 - sed "s/^/$as_me: WARNING: /" >&2
6462 + ) | sed "s/^/$as_me: WARNING: /" >&2
6463 ;;
6464 esac
6465 -echo "$as_me:$LINENO: checking for $ac_header" >&5
6466 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6467 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6468 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
6469 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
6470 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6471 echo $ECHO_N "(cached) $ECHO_C" >&6
6472 else
6473 eval "$as_ac_Header=\$ac_header_preproc"
6474 fi
6475 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6476 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6477 +ac_res=`eval echo '${'$as_ac_Header'}'`
6478 + { echo "$as_me:$LINENO: result: $ac_res" >&5
6479 +echo "${ECHO_T}$ac_res" >&6; }
6480
6481 fi
6482 if test `eval echo '${'$as_ac_Header'}'` = yes; then
6483 @@ -6439,8 +6956,8 @@
6484 done
6485
6486
6487 -echo "$as_me:$LINENO: checking for error_t" >&5
6488 -echo $ECHO_N "checking for error_t... $ECHO_C" >&6
6489 +{ echo "$as_me:$LINENO: checking for error_t" >&5
6490 +echo $ECHO_N "checking for error_t... $ECHO_C" >&6; }
6491 if test "${ac_cv_type_error_t+set}" = set; then
6492 echo $ECHO_N "(cached) $ECHO_C" >&6
6493 else
6494 @@ -6454,49 +6971,47 @@
6495 # include <argz.h>
6496 #endif
6497
6498 +typedef error_t ac__type_new_;
6499 int
6500 main ()
6501 {
6502 -if ((error_t *) 0)
6503 +if ((ac__type_new_ *) 0)
6504 return 0;
6505 -if (sizeof (error_t))
6506 +if (sizeof (ac__type_new_))
6507 return 0;
6508 ;
6509 return 0;
6510 }
6511 _ACEOF
6512 rm -f conftest.$ac_objext
6513 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6514 - (eval $ac_compile) 2>conftest.er1
6515 +if { (ac_try="$ac_compile"
6516 +case "(($ac_try" in
6517 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6518 + *) ac_try_echo=$ac_try;;
6519 +esac
6520 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6521 + (eval "$ac_compile") 2>conftest.er1
6522 ac_status=$?
6523 grep -v '^ *+' conftest.er1 >conftest.err
6524 rm -f conftest.er1
6525 cat conftest.err >&5
6526 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6527 - (exit $ac_status); } &&
6528 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6529 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6530 - (eval $ac_try) 2>&5
6531 - ac_status=$?
6532 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6533 - (exit $ac_status); }; } &&
6534 - { ac_try='test -s conftest.$ac_objext'
6535 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6536 - (eval $ac_try) 2>&5
6537 - ac_status=$?
6538 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6539 - (exit $ac_status); }; }; then
6540 + (exit $ac_status); } && {
6541 + test -z "$ac_c_werror_flag" ||
6542 + test ! -s conftest.err
6543 + } && test -s conftest.$ac_objext; then
6544 ac_cv_type_error_t=yes
6545 else
6546 echo "$as_me: failed program was:" >&5
6547 sed 's/^/| /' conftest.$ac_ext >&5
6548
6549 -ac_cv_type_error_t=no
6550 + ac_cv_type_error_t=no
6551 fi
6552 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6553 +
6554 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6555 fi
6556 -echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
6557 -echo "${ECHO_T}$ac_cv_type_error_t" >&6
6558 +{ echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
6559 +echo "${ECHO_T}$ac_cv_type_error_t" >&6; }
6560 if test $ac_cv_type_error_t = yes; then
6561
6562 cat >>confdefs.h <<_ACEOF
6563 @@ -6521,9 +7036,9 @@
6564 for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify
6565 do
6566 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
6567 -echo "$as_me:$LINENO: checking for $ac_func" >&5
6568 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
6569 -if eval "test \"\${$as_ac_var+set}\" = set"; then
6570 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
6571 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
6572 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
6573 echo $ECHO_N "(cached) $ECHO_C" >&6
6574 else
6575 cat >conftest.$ac_ext <<_ACEOF
6576 @@ -6549,67 +7064,60 @@
6577
6578 #undef $ac_func
6579
6580 -/* Override any gcc2 internal prototype to avoid an error. */
6581 +/* Override any GCC internal prototype to avoid an error.
6582 + Use char because int might match the return type of a GCC
6583 + builtin and then its argument prototype would still apply. */
6584 #ifdef __cplusplus
6585 extern "C"
6586 -{
6587 #endif
6588 -/* We use char because int might match the return type of a gcc2
6589 - builtin and then its argument prototype would still apply. */
6590 char $ac_func ();
6591 /* The GNU C library defines this for functions which it implements
6592 to always fail with ENOSYS. Some functions are actually named
6593 something starting with __ and the normal name is an alias. */
6594 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
6595 +#if defined __stub_$ac_func || defined __stub___$ac_func
6596 choke me
6597 -#else
6598 -char (*f) () = $ac_func;
6599 -#endif
6600 -#ifdef __cplusplus
6601 -}
6602 #endif
6603
6604 int
6605 main ()
6606 {
6607 -return f != $ac_func;
6608 +return $ac_func ();
6609 ;
6610 return 0;
6611 }
6612 _ACEOF
6613 rm -f conftest.$ac_objext conftest$ac_exeext
6614 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6615 - (eval $ac_link) 2>conftest.er1
6616 +if { (ac_try="$ac_link"
6617 +case "(($ac_try" in
6618 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6619 + *) ac_try_echo=$ac_try;;
6620 +esac
6621 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6622 + (eval "$ac_link") 2>conftest.er1
6623 ac_status=$?
6624 grep -v '^ *+' conftest.er1 >conftest.err
6625 rm -f conftest.er1
6626 cat conftest.err >&5
6627 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6628 - (exit $ac_status); } &&
6629 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6630 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6631 - (eval $ac_try) 2>&5
6632 - ac_status=$?
6633 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6634 - (exit $ac_status); }; } &&
6635 - { ac_try='test -s conftest$ac_exeext'
6636 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6637 - (eval $ac_try) 2>&5
6638 - ac_status=$?
6639 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6640 - (exit $ac_status); }; }; then
6641 + (exit $ac_status); } && {
6642 + test -z "$ac_c_werror_flag" ||
6643 + test ! -s conftest.err
6644 + } && test -s conftest$ac_exeext &&
6645 + $as_test_x conftest$ac_exeext; then
6646 eval "$as_ac_var=yes"
6647 else
6648 echo "$as_me: failed program was:" >&5
6649 sed 's/^/| /' conftest.$ac_ext >&5
6650
6651 -eval "$as_ac_var=no"
6652 + eval "$as_ac_var=no"
6653 fi
6654 -rm -f conftest.err conftest.$ac_objext \
6655 +
6656 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6657 conftest$ac_exeext conftest.$ac_ext
6658 fi
6659 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
6660 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
6661 +ac_res=`eval echo '${'$as_ac_var'}'`
6662 + { echo "$as_me:$LINENO: result: $ac_res" >&5
6663 +echo "${ECHO_T}$ac_res" >&6; }
6664 if test `eval echo '${'$as_ac_var'}'` = yes; then
6665 cat >>confdefs.h <<_ACEOF
6666 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
6667 @@ -6649,18 +7157,19 @@
6668 stdio.h unistd.h
6669 do
6670 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6671 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6672 - echo "$as_me:$LINENO: checking for $ac_header" >&5
6673 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6674 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6675 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6676 + { echo "$as_me:$LINENO: checking for $ac_header" >&5
6677 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
6678 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6679 echo $ECHO_N "(cached) $ECHO_C" >&6
6680 fi
6681 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6682 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6683 +ac_res=`eval echo '${'$as_ac_Header'}'`
6684 + { echo "$as_me:$LINENO: result: $ac_res" >&5
6685 +echo "${ECHO_T}$ac_res" >&6; }
6686 else
6687 # Is the header compilable?
6688 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
6689 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
6690 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
6691 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
6692 cat >conftest.$ac_ext <<_ACEOF
6693 /* confdefs.h. */
6694 _ACEOF
6695 @@ -6671,40 +7180,37 @@
6696 #include <$ac_header>
6697 _ACEOF
6698 rm -f conftest.$ac_objext
6699 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6700 - (eval $ac_compile) 2>conftest.er1
6701 +if { (ac_try="$ac_compile"
6702 +case "(($ac_try" in
6703 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6704 + *) ac_try_echo=$ac_try;;
6705 +esac
6706 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6707 + (eval "$ac_compile") 2>conftest.er1
6708 ac_status=$?
6709 grep -v '^ *+' conftest.er1 >conftest.err
6710 rm -f conftest.er1
6711 cat conftest.err >&5
6712 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6713 - (exit $ac_status); } &&
6714 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6715 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6716 - (eval $ac_try) 2>&5
6717 - ac_status=$?
6718 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6719 - (exit $ac_status); }; } &&
6720 - { ac_try='test -s conftest.$ac_objext'
6721 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6722 - (eval $ac_try) 2>&5
6723 - ac_status=$?
6724 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6725 - (exit $ac_status); }; }; then
6726 + (exit $ac_status); } && {
6727 + test -z "$ac_c_werror_flag" ||
6728 + test ! -s conftest.err
6729 + } && test -s conftest.$ac_objext; then
6730 ac_header_compiler=yes
6731 else
6732 echo "$as_me: failed program was:" >&5
6733 sed 's/^/| /' conftest.$ac_ext >&5
6734
6735 -ac_header_compiler=no
6736 + ac_header_compiler=no
6737 fi
6738 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6739 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6740 -echo "${ECHO_T}$ac_header_compiler" >&6
6741 +
6742 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6743 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6744 +echo "${ECHO_T}$ac_header_compiler" >&6; }
6745
6746 # Is the header present?
6747 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
6748 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
6749 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
6750 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
6751 cat >conftest.$ac_ext <<_ACEOF
6752 /* confdefs.h. */
6753 _ACEOF
6754 @@ -6713,24 +7219,22 @@
6755 /* end confdefs.h. */
6756 #include <$ac_header>
6757 _ACEOF
6758 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6759 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6760 +if { (ac_try="$ac_cpp conftest.$ac_ext"
6761 +case "(($ac_try" in
6762 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6763 + *) ac_try_echo=$ac_try;;
6764 +esac
6765 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6766 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
6767 ac_status=$?
6768 grep -v '^ *+' conftest.er1 >conftest.err
6769 rm -f conftest.er1
6770 cat conftest.err >&5
6771 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6772 - (exit $ac_status); } >/dev/null; then
6773 - if test -s conftest.err; then
6774 - ac_cpp_err=$ac_c_preproc_warn_flag
6775 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6776 - else
6777 - ac_cpp_err=
6778 - fi
6779 -else
6780 - ac_cpp_err=yes
6781 -fi
6782 -if test -z "$ac_cpp_err"; then
6783 + (exit $ac_status); } >/dev/null && {
6784 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
6785 + test ! -s conftest.err
6786 + }; then
6787 ac_header_preproc=yes
6788 else
6789 echo "$as_me: failed program was:" >&5
6790 @@ -6738,9 +7242,10 @@
6791
6792 ac_header_preproc=no
6793 fi
6794 +
6795 rm -f conftest.err conftest.$ac_ext
6796 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6797 -echo "${ECHO_T}$ac_header_preproc" >&6
6798 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6799 +echo "${ECHO_T}$ac_header_preproc" >&6; }
6800
6801 # So? What about this header?
6802 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
6803 @@ -6764,25 +7269,24 @@
6804 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
6805 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
6806 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
6807 - (
6808 - cat <<\_ASBOX
6809 + ( cat <<\_ASBOX
6810 ## ------------------------------------------------- ##
6811 ## Report this to gphoto-devel@lists.sourceforge.net ##
6812 ## ------------------------------------------------- ##
6813 _ASBOX
6814 - ) |
6815 - sed "s/^/$as_me: WARNING: /" >&2
6816 + ) | sed "s/^/$as_me: WARNING: /" >&2
6817 ;;
6818 esac
6819 -echo "$as_me:$LINENO: checking for $ac_header" >&5
6820 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6821 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6822 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
6823 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
6824 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6825 echo $ECHO_N "(cached) $ECHO_C" >&6
6826 else
6827 eval "$as_ac_Header=\$ac_header_preproc"
6828 fi
6829 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6830 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6831 +ac_res=`eval echo '${'$as_ac_Header'}'`
6832 + { echo "$as_me:$LINENO: result: $ac_res" >&5
6833 +echo "${ECHO_T}$ac_res" >&6; }
6834
6835 fi
6836 if test `eval echo '${'$as_ac_Header'}'` = yes; then
6837 @@ -6801,18 +7305,19 @@
6838 for ac_header in dl.h sys/dl.h dld.h mach-o/dyld.h
6839 do
6840 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6841 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6842 - echo "$as_me:$LINENO: checking for $ac_header" >&5
6843 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6844 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6845 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6846 + { echo "$as_me:$LINENO: checking for $ac_header" >&5
6847 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
6848 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6849 echo $ECHO_N "(cached) $ECHO_C" >&6
6850 fi
6851 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
6852 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6853 +ac_res=`eval echo '${'$as_ac_Header'}'`
6854 + { echo "$as_me:$LINENO: result: $ac_res" >&5
6855 +echo "${ECHO_T}$ac_res" >&6; }
6856 else
6857 # Is the header compilable?
6858 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
6859 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
6860 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
6861 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
6862 cat >conftest.$ac_ext <<_ACEOF
6863 /* confdefs.h. */
6864 _ACEOF
6865 @@ -6823,40 +7328,37 @@
6866 #include <$ac_header>
6867 _ACEOF
6868 rm -f conftest.$ac_objext
6869 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6870 - (eval $ac_compile) 2>conftest.er1
6871 +if { (ac_try="$ac_compile"
6872 +case "(($ac_try" in
6873 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6874 + *) ac_try_echo=$ac_try;;
6875 +esac
6876 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6877 + (eval "$ac_compile") 2>conftest.er1
6878 ac_status=$?
6879 grep -v '^ *+' conftest.er1 >conftest.err
6880 rm -f conftest.er1
6881 cat conftest.err >&5
6882 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6883 - (exit $ac_status); } &&
6884 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6885 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6886 - (eval $ac_try) 2>&5
6887 - ac_status=$?
6888 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6889 - (exit $ac_status); }; } &&
6890 - { ac_try='test -s conftest.$ac_objext'
6891 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6892 - (eval $ac_try) 2>&5
6893 - ac_status=$?
6894 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
6895 - (exit $ac_status); }; }; then
6896 + (exit $ac_status); } && {
6897 + test -z "$ac_c_werror_flag" ||
6898 + test ! -s conftest.err
6899 + } && test -s conftest.$ac_objext; then
6900 ac_header_compiler=yes
6901 else
6902 echo "$as_me: failed program was:" >&5
6903 sed 's/^/| /' conftest.$ac_ext >&5
6904
6905 -ac_header_compiler=no
6906 + ac_header_compiler=no
6907 fi
6908 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6909 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6910 -echo "${ECHO_T}$ac_header_compiler" >&6
6911 +
6912 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6913 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6914 +echo "${ECHO_T}$ac_header_compiler" >&6; }
6915
6916 # Is the header present?
6917 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
6918 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
6919 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
6920 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
6921 cat >conftest.$ac_ext <<_ACEOF
6922 /* confdefs.h. */
6923 _ACEOF
6924 @@ -6865,24 +7367,22 @@
6925 /* end confdefs.h. */
6926 #include <$ac_header>
6927 _ACEOF
6928 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6929 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6930 +if { (ac_try="$ac_cpp conftest.$ac_ext"
6931 +case "(($ac_try" in
6932 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6933 + *) ac_try_echo=$ac_try;;
6934 +esac
6935 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6936 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
6937 ac_status=$?
6938 grep -v '^ *+' conftest.er1 >conftest.err
6939 rm -f conftest.er1
6940 cat conftest.err >&5
6941 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6942 - (exit $ac_status); } >/dev/null; then
6943 - if test -s conftest.err; then
6944 - ac_cpp_err=$ac_c_preproc_warn_flag
6945 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6946 - else
6947 - ac_cpp_err=
6948 - fi
6949 -else
6950 - ac_cpp_err=yes
6951 -fi
6952 -if test -z "$ac_cpp_err"; then
6953 + (exit $ac_status); } >/dev/null && {
6954 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
6955 + test ! -s conftest.err
6956 + }; then
6957 ac_header_preproc=yes
6958 else
6959 echo "$as_me: failed program was:" >&5
6960 @@ -6890,9 +7390,10 @@
6961
6962 ac_header_preproc=no
6963 fi
6964 +
6965 rm -f conftest.err conftest.$ac_ext
6966 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6967 -echo "${ECHO_T}$ac_header_preproc" >&6
6968 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6969 +echo "${ECHO_T}$ac_header_preproc" >&6; }
6970
6971 # So? What about this header?
6972 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
6973 @@ -6916,25 +7417,24 @@
6974 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
6975 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
6976 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
6977 - (
6978 - cat <<\_ASBOX
6979 + ( cat <<\_ASBOX
6980 ## ------------------------------------------------- ##
6981 ## Report this to gphoto-devel@lists.sourceforge.net ##
6982 ## ------------------------------------------------- ##
6983 _ASBOX
6984 - ) |
6985 - sed "s/^/$as_me: WARNING: /" >&2
6986 + ) | sed "s/^/$as_me: WARNING: /" >&2
6987 ;;
6988 esac
6989 -echo "$as_me:$LINENO: checking for $ac_header" >&5
6990 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6991 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
6992 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
6993 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
6994 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
6995 echo $ECHO_N "(cached) $ECHO_C" >&6
6996 else
6997 eval "$as_ac_Header=\$ac_header_preproc"
6998 fi
6999 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
7000 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
7001 +ac_res=`eval echo '${'$as_ac_Header'}'`
7002 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7003 +echo "${ECHO_T}$ac_res" >&6; }
7004
7005 fi
7006 if test `eval echo '${'$as_ac_Header'}'` = yes; then
7007 @@ -6951,18 +7451,19 @@
7008 for ac_header in string.h strings.h
7009 do
7010 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
7011 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
7012 - echo "$as_me:$LINENO: checking for $ac_header" >&5
7013 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
7014 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
7015 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7016 + { echo "$as_me:$LINENO: checking for $ac_header" >&5
7017 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
7018 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7019 echo $ECHO_N "(cached) $ECHO_C" >&6
7020 fi
7021 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
7022 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
7023 +ac_res=`eval echo '${'$as_ac_Header'}'`
7024 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7025 +echo "${ECHO_T}$ac_res" >&6; }
7026 else
7027 # Is the header compilable?
7028 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
7029 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
7030 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
7031 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
7032 cat >conftest.$ac_ext <<_ACEOF
7033 /* confdefs.h. */
7034 _ACEOF
7035 @@ -6973,40 +7474,37 @@
7036 #include <$ac_header>
7037 _ACEOF
7038 rm -f conftest.$ac_objext
7039 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7040 - (eval $ac_compile) 2>conftest.er1
7041 +if { (ac_try="$ac_compile"
7042 +case "(($ac_try" in
7043 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7044 + *) ac_try_echo=$ac_try;;
7045 +esac
7046 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7047 + (eval "$ac_compile") 2>conftest.er1
7048 ac_status=$?
7049 grep -v '^ *+' conftest.er1 >conftest.err
7050 rm -f conftest.er1
7051 cat conftest.err >&5
7052 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7053 - (exit $ac_status); } &&
7054 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7055 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7056 - (eval $ac_try) 2>&5
7057 - ac_status=$?
7058 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7059 - (exit $ac_status); }; } &&
7060 - { ac_try='test -s conftest.$ac_objext'
7061 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7062 - (eval $ac_try) 2>&5
7063 - ac_status=$?
7064 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7065 - (exit $ac_status); }; }; then
7066 + (exit $ac_status); } && {
7067 + test -z "$ac_c_werror_flag" ||
7068 + test ! -s conftest.err
7069 + } && test -s conftest.$ac_objext; then
7070 ac_header_compiler=yes
7071 else
7072 echo "$as_me: failed program was:" >&5
7073 sed 's/^/| /' conftest.$ac_ext >&5
7074
7075 -ac_header_compiler=no
7076 + ac_header_compiler=no
7077 fi
7078 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7079 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7080 -echo "${ECHO_T}$ac_header_compiler" >&6
7081 +
7082 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7083 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7084 +echo "${ECHO_T}$ac_header_compiler" >&6; }
7085
7086 # Is the header present?
7087 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
7088 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
7089 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
7090 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
7091 cat >conftest.$ac_ext <<_ACEOF
7092 /* confdefs.h. */
7093 _ACEOF
7094 @@ -7015,24 +7513,22 @@
7095 /* end confdefs.h. */
7096 #include <$ac_header>
7097 _ACEOF
7098 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7099 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7100 +if { (ac_try="$ac_cpp conftest.$ac_ext"
7101 +case "(($ac_try" in
7102 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7103 + *) ac_try_echo=$ac_try;;
7104 +esac
7105 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7106 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
7107 ac_status=$?
7108 grep -v '^ *+' conftest.er1 >conftest.err
7109 rm -f conftest.er1
7110 cat conftest.err >&5
7111 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7112 - (exit $ac_status); } >/dev/null; then
7113 - if test -s conftest.err; then
7114 - ac_cpp_err=$ac_c_preproc_warn_flag
7115 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
7116 - else
7117 - ac_cpp_err=
7118 - fi
7119 -else
7120 - ac_cpp_err=yes
7121 -fi
7122 -if test -z "$ac_cpp_err"; then
7123 + (exit $ac_status); } >/dev/null && {
7124 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
7125 + test ! -s conftest.err
7126 + }; then
7127 ac_header_preproc=yes
7128 else
7129 echo "$as_me: failed program was:" >&5
7130 @@ -7040,9 +7536,10 @@
7131
7132 ac_header_preproc=no
7133 fi
7134 +
7135 rm -f conftest.err conftest.$ac_ext
7136 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7137 -echo "${ECHO_T}$ac_header_preproc" >&6
7138 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7139 +echo "${ECHO_T}$ac_header_preproc" >&6; }
7140
7141 # So? What about this header?
7142 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7143 @@ -7066,25 +7563,24 @@
7144 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
7145 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
7146 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
7147 - (
7148 - cat <<\_ASBOX
7149 + ( cat <<\_ASBOX
7150 ## ------------------------------------------------- ##
7151 ## Report this to gphoto-devel@lists.sourceforge.net ##
7152 ## ------------------------------------------------- ##
7153 _ASBOX
7154 - ) |
7155 - sed "s/^/$as_me: WARNING: /" >&2
7156 + ) | sed "s/^/$as_me: WARNING: /" >&2
7157 ;;
7158 esac
7159 -echo "$as_me:$LINENO: checking for $ac_header" >&5
7160 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
7161 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
7162 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
7163 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
7164 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7165 echo $ECHO_N "(cached) $ECHO_C" >&6
7166 else
7167 eval "$as_ac_Header=\$ac_header_preproc"
7168 fi
7169 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
7170 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
7171 +ac_res=`eval echo '${'$as_ac_Header'}'`
7172 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7173 +echo "${ECHO_T}$ac_res" >&6; }
7174
7175 fi
7176 if test `eval echo '${'$as_ac_Header'}'` = yes; then
7177 @@ -7102,9 +7598,9 @@
7178 for ac_func in strchr index
7179 do
7180 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
7181 -echo "$as_me:$LINENO: checking for $ac_func" >&5
7182 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
7183 -if eval "test \"\${$as_ac_var+set}\" = set"; then
7184 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
7185 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
7186 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
7187 echo $ECHO_N "(cached) $ECHO_C" >&6
7188 else
7189 cat >conftest.$ac_ext <<_ACEOF
7190 @@ -7130,67 +7626,60 @@
7191
7192 #undef $ac_func
7193
7194 -/* Override any gcc2 internal prototype to avoid an error. */
7195 +/* Override any GCC internal prototype to avoid an error.
7196 + Use char because int might match the return type of a GCC
7197 + builtin and then its argument prototype would still apply. */
7198 #ifdef __cplusplus
7199 extern "C"
7200 -{
7201 #endif
7202 -/* We use char because int might match the return type of a gcc2
7203 - builtin and then its argument prototype would still apply. */
7204 char $ac_func ();
7205 /* The GNU C library defines this for functions which it implements
7206 to always fail with ENOSYS. Some functions are actually named
7207 something starting with __ and the normal name is an alias. */
7208 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
7209 +#if defined __stub_$ac_func || defined __stub___$ac_func
7210 choke me
7211 -#else
7212 -char (*f) () = $ac_func;
7213 -#endif
7214 -#ifdef __cplusplus
7215 -}
7216 #endif
7217
7218 int
7219 main ()
7220 {
7221 -return f != $ac_func;
7222 +return $ac_func ();
7223 ;
7224 return 0;
7225 }
7226 _ACEOF
7227 rm -f conftest.$ac_objext conftest$ac_exeext
7228 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7229 - (eval $ac_link) 2>conftest.er1
7230 +if { (ac_try="$ac_link"
7231 +case "(($ac_try" in
7232 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7233 + *) ac_try_echo=$ac_try;;
7234 +esac
7235 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7236 + (eval "$ac_link") 2>conftest.er1
7237 ac_status=$?
7238 grep -v '^ *+' conftest.er1 >conftest.err
7239 rm -f conftest.er1
7240 cat conftest.err >&5
7241 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7242 - (exit $ac_status); } &&
7243 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7244 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7245 - (eval $ac_try) 2>&5
7246 - ac_status=$?
7247 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7248 - (exit $ac_status); }; } &&
7249 - { ac_try='test -s conftest$ac_exeext'
7250 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7251 - (eval $ac_try) 2>&5
7252 - ac_status=$?
7253 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7254 - (exit $ac_status); }; }; then
7255 + (exit $ac_status); } && {
7256 + test -z "$ac_c_werror_flag" ||
7257 + test ! -s conftest.err
7258 + } && test -s conftest$ac_exeext &&
7259 + $as_test_x conftest$ac_exeext; then
7260 eval "$as_ac_var=yes"
7261 else
7262 echo "$as_me: failed program was:" >&5
7263 sed 's/^/| /' conftest.$ac_ext >&5
7264
7265 -eval "$as_ac_var=no"
7266 + eval "$as_ac_var=no"
7267 fi
7268 -rm -f conftest.err conftest.$ac_objext \
7269 +
7270 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7271 conftest$ac_exeext conftest.$ac_ext
7272 fi
7273 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
7274 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
7275 +ac_res=`eval echo '${'$as_ac_var'}'`
7276 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7277 +echo "${ECHO_T}$ac_res" >&6; }
7278 if test `eval echo '${'$as_ac_var'}'` = yes; then
7279 cat >>confdefs.h <<_ACEOF
7280 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
7281 @@ -7204,9 +7693,9 @@
7282 for ac_func in strrchr rindex
7283 do
7284 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
7285 -echo "$as_me:$LINENO: checking for $ac_func" >&5
7286 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
7287 -if eval "test \"\${$as_ac_var+set}\" = set"; then
7288 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
7289 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
7290 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
7291 echo $ECHO_N "(cached) $ECHO_C" >&6
7292 else
7293 cat >conftest.$ac_ext <<_ACEOF
7294 @@ -7232,67 +7721,60 @@
7295
7296 #undef $ac_func
7297
7298 -/* Override any gcc2 internal prototype to avoid an error. */
7299 +/* Override any GCC internal prototype to avoid an error.
7300 + Use char because int might match the return type of a GCC
7301 + builtin and then its argument prototype would still apply. */
7302 #ifdef __cplusplus
7303 extern "C"
7304 -{
7305 #endif
7306 -/* We use char because int might match the return type of a gcc2
7307 - builtin and then its argument prototype would still apply. */
7308 char $ac_func ();
7309 /* The GNU C library defines this for functions which it implements
7310 to always fail with ENOSYS. Some functions are actually named
7311 something starting with __ and the normal name is an alias. */
7312 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
7313 +#if defined __stub_$ac_func || defined __stub___$ac_func
7314 choke me
7315 -#else
7316 -char (*f) () = $ac_func;
7317 -#endif
7318 -#ifdef __cplusplus
7319 -}
7320 #endif
7321
7322 int
7323 main ()
7324 {
7325 -return f != $ac_func;
7326 +return $ac_func ();
7327 ;
7328 return 0;
7329 }
7330 _ACEOF
7331 rm -f conftest.$ac_objext conftest$ac_exeext
7332 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7333 - (eval $ac_link) 2>conftest.er1
7334 +if { (ac_try="$ac_link"
7335 +case "(($ac_try" in
7336 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7337 + *) ac_try_echo=$ac_try;;
7338 +esac
7339 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7340 + (eval "$ac_link") 2>conftest.er1
7341 ac_status=$?
7342 grep -v '^ *+' conftest.er1 >conftest.err
7343 rm -f conftest.er1
7344 cat conftest.err >&5
7345 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7346 - (exit $ac_status); } &&
7347 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7348 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7349 - (eval $ac_try) 2>&5
7350 - ac_status=$?
7351 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7352 - (exit $ac_status); }; } &&
7353 - { ac_try='test -s conftest$ac_exeext'
7354 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7355 - (eval $ac_try) 2>&5
7356 - ac_status=$?
7357 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7358 - (exit $ac_status); }; }; then
7359 + (exit $ac_status); } && {
7360 + test -z "$ac_c_werror_flag" ||
7361 + test ! -s conftest.err
7362 + } && test -s conftest$ac_exeext &&
7363 + $as_test_x conftest$ac_exeext; then
7364 eval "$as_ac_var=yes"
7365 else
7366 echo "$as_me: failed program was:" >&5
7367 sed 's/^/| /' conftest.$ac_ext >&5
7368
7369 -eval "$as_ac_var=no"
7370 + eval "$as_ac_var=no"
7371 fi
7372 -rm -f conftest.err conftest.$ac_objext \
7373 +
7374 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7375 conftest$ac_exeext conftest.$ac_ext
7376 fi
7377 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
7378 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
7379 +ac_res=`eval echo '${'$as_ac_var'}'`
7380 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7381 +echo "${ECHO_T}$ac_res" >&6; }
7382 if test `eval echo '${'$as_ac_var'}'` = yes; then
7383 cat >>confdefs.h <<_ACEOF
7384 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
7385 @@ -7306,9 +7788,9 @@
7386 for ac_func in memcpy bcopy
7387 do
7388 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
7389 -echo "$as_me:$LINENO: checking for $ac_func" >&5
7390 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
7391 -if eval "test \"\${$as_ac_var+set}\" = set"; then
7392 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
7393 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
7394 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
7395 echo $ECHO_N "(cached) $ECHO_C" >&6
7396 else
7397 cat >conftest.$ac_ext <<_ACEOF
7398 @@ -7334,67 +7816,60 @@
7399
7400 #undef $ac_func
7401
7402 -/* Override any gcc2 internal prototype to avoid an error. */
7403 +/* Override any GCC internal prototype to avoid an error.
7404 + Use char because int might match the return type of a GCC
7405 + builtin and then its argument prototype would still apply. */
7406 #ifdef __cplusplus
7407 extern "C"
7408 -{
7409 #endif
7410 -/* We use char because int might match the return type of a gcc2
7411 - builtin and then its argument prototype would still apply. */
7412 char $ac_func ();
7413 /* The GNU C library defines this for functions which it implements
7414 to always fail with ENOSYS. Some functions are actually named
7415 something starting with __ and the normal name is an alias. */
7416 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
7417 +#if defined __stub_$ac_func || defined __stub___$ac_func
7418 choke me
7419 -#else
7420 -char (*f) () = $ac_func;
7421 -#endif
7422 -#ifdef __cplusplus
7423 -}
7424 #endif
7425
7426 int
7427 main ()
7428 {
7429 -return f != $ac_func;
7430 +return $ac_func ();
7431 ;
7432 return 0;
7433 }
7434 _ACEOF
7435 rm -f conftest.$ac_objext conftest$ac_exeext
7436 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7437 - (eval $ac_link) 2>conftest.er1
7438 +if { (ac_try="$ac_link"
7439 +case "(($ac_try" in
7440 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7441 + *) ac_try_echo=$ac_try;;
7442 +esac
7443 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7444 + (eval "$ac_link") 2>conftest.er1
7445 ac_status=$?
7446 grep -v '^ *+' conftest.er1 >conftest.err
7447 rm -f conftest.er1
7448 cat conftest.err >&5
7449 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7450 - (exit $ac_status); } &&
7451 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7452 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7453 - (eval $ac_try) 2>&5
7454 - ac_status=$?
7455 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7456 - (exit $ac_status); }; } &&
7457 - { ac_try='test -s conftest$ac_exeext'
7458 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7459 - (eval $ac_try) 2>&5
7460 - ac_status=$?
7461 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7462 - (exit $ac_status); }; }; then
7463 + (exit $ac_status); } && {
7464 + test -z "$ac_c_werror_flag" ||
7465 + test ! -s conftest.err
7466 + } && test -s conftest$ac_exeext &&
7467 + $as_test_x conftest$ac_exeext; then
7468 eval "$as_ac_var=yes"
7469 else
7470 echo "$as_me: failed program was:" >&5
7471 sed 's/^/| /' conftest.$ac_ext >&5
7472
7473 -eval "$as_ac_var=no"
7474 + eval "$as_ac_var=no"
7475 fi
7476 -rm -f conftest.err conftest.$ac_objext \
7477 +
7478 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7479 conftest$ac_exeext conftest.$ac_ext
7480 fi
7481 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
7482 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
7483 +ac_res=`eval echo '${'$as_ac_var'}'`
7484 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7485 +echo "${ECHO_T}$ac_res" >&6; }
7486 if test `eval echo '${'$as_ac_var'}'` = yes; then
7487 cat >>confdefs.h <<_ACEOF
7488 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
7489 @@ -7408,9 +7883,9 @@
7490 for ac_func in memmove strcmp
7491 do
7492 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
7493 -echo "$as_me:$LINENO: checking for $ac_func" >&5
7494 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
7495 -if eval "test \"\${$as_ac_var+set}\" = set"; then
7496 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
7497 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
7498 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
7499 echo $ECHO_N "(cached) $ECHO_C" >&6
7500 else
7501 cat >conftest.$ac_ext <<_ACEOF
7502 @@ -7436,67 +7911,60 @@
7503
7504 #undef $ac_func
7505
7506 -/* Override any gcc2 internal prototype to avoid an error. */
7507 +/* Override any GCC internal prototype to avoid an error.
7508 + Use char because int might match the return type of a GCC
7509 + builtin and then its argument prototype would still apply. */
7510 #ifdef __cplusplus
7511 extern "C"
7512 -{
7513 #endif
7514 -/* We use char because int might match the return type of a gcc2
7515 - builtin and then its argument prototype would still apply. */
7516 char $ac_func ();
7517 /* The GNU C library defines this for functions which it implements
7518 to always fail with ENOSYS. Some functions are actually named
7519 something starting with __ and the normal name is an alias. */
7520 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
7521 +#if defined __stub_$ac_func || defined __stub___$ac_func
7522 choke me
7523 -#else
7524 -char (*f) () = $ac_func;
7525 -#endif
7526 -#ifdef __cplusplus
7527 -}
7528 #endif
7529
7530 int
7531 main ()
7532 {
7533 -return f != $ac_func;
7534 +return $ac_func ();
7535 ;
7536 return 0;
7537 }
7538 _ACEOF
7539 rm -f conftest.$ac_objext conftest$ac_exeext
7540 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7541 - (eval $ac_link) 2>conftest.er1
7542 +if { (ac_try="$ac_link"
7543 +case "(($ac_try" in
7544 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7545 + *) ac_try_echo=$ac_try;;
7546 +esac
7547 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7548 + (eval "$ac_link") 2>conftest.er1
7549 ac_status=$?
7550 grep -v '^ *+' conftest.er1 >conftest.err
7551 rm -f conftest.er1
7552 cat conftest.err >&5
7553 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7554 - (exit $ac_status); } &&
7555 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7556 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7557 - (eval $ac_try) 2>&5
7558 - ac_status=$?
7559 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7560 - (exit $ac_status); }; } &&
7561 - { ac_try='test -s conftest$ac_exeext'
7562 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7563 - (eval $ac_try) 2>&5
7564 - ac_status=$?
7565 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7566 - (exit $ac_status); }; }; then
7567 + (exit $ac_status); } && {
7568 + test -z "$ac_c_werror_flag" ||
7569 + test ! -s conftest.err
7570 + } && test -s conftest$ac_exeext &&
7571 + $as_test_x conftest$ac_exeext; then
7572 eval "$as_ac_var=yes"
7573 else
7574 echo "$as_me: failed program was:" >&5
7575 sed 's/^/| /' conftest.$ac_ext >&5
7576
7577 -eval "$as_ac_var=no"
7578 + eval "$as_ac_var=no"
7579 fi
7580 -rm -f conftest.err conftest.$ac_objext \
7581 +
7582 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7583 conftest$ac_exeext conftest.$ac_ext
7584 fi
7585 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
7586 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
7587 +ac_res=`eval echo '${'$as_ac_var'}'`
7588 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7589 +echo "${ECHO_T}$ac_res" >&6; }
7590 if test `eval echo '${'$as_ac_var'}'` = yes; then
7591 cat >>confdefs.h <<_ACEOF
7592 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
7593 @@ -7511,9 +7979,9 @@
7594 for ac_func in closedir opendir readdir
7595 do
7596 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
7597 -echo "$as_me:$LINENO: checking for $ac_func" >&5
7598 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
7599 -if eval "test \"\${$as_ac_var+set}\" = set"; then
7600 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
7601 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
7602 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
7603 echo $ECHO_N "(cached) $ECHO_C" >&6
7604 else
7605 cat >conftest.$ac_ext <<_ACEOF
7606 @@ -7539,67 +8007,60 @@
7607
7608 #undef $ac_func
7609
7610 -/* Override any gcc2 internal prototype to avoid an error. */
7611 +/* Override any GCC internal prototype to avoid an error.
7612 + Use char because int might match the return type of a GCC
7613 + builtin and then its argument prototype would still apply. */
7614 #ifdef __cplusplus
7615 extern "C"
7616 -{
7617 #endif
7618 -/* We use char because int might match the return type of a gcc2
7619 - builtin and then its argument prototype would still apply. */
7620 char $ac_func ();
7621 /* The GNU C library defines this for functions which it implements
7622 to always fail with ENOSYS. Some functions are actually named
7623 something starting with __ and the normal name is an alias. */
7624 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
7625 +#if defined __stub_$ac_func || defined __stub___$ac_func
7626 choke me
7627 -#else
7628 -char (*f) () = $ac_func;
7629 -#endif
7630 -#ifdef __cplusplus
7631 -}
7632 #endif
7633
7634 int
7635 main ()
7636 {
7637 -return f != $ac_func;
7638 +return $ac_func ();
7639 ;
7640 return 0;
7641 }
7642 _ACEOF
7643 rm -f conftest.$ac_objext conftest$ac_exeext
7644 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7645 - (eval $ac_link) 2>conftest.er1
7646 +if { (ac_try="$ac_link"
7647 +case "(($ac_try" in
7648 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7649 + *) ac_try_echo=$ac_try;;
7650 +esac
7651 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7652 + (eval "$ac_link") 2>conftest.er1
7653 ac_status=$?
7654 grep -v '^ *+' conftest.er1 >conftest.err
7655 rm -f conftest.er1
7656 cat conftest.err >&5
7657 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7658 - (exit $ac_status); } &&
7659 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7660 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7661 - (eval $ac_try) 2>&5
7662 - ac_status=$?
7663 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7664 - (exit $ac_status); }; } &&
7665 - { ac_try='test -s conftest$ac_exeext'
7666 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7667 - (eval $ac_try) 2>&5
7668 - ac_status=$?
7669 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7670 - (exit $ac_status); }; }; then
7671 + (exit $ac_status); } && {
7672 + test -z "$ac_c_werror_flag" ||
7673 + test ! -s conftest.err
7674 + } && test -s conftest$ac_exeext &&
7675 + $as_test_x conftest$ac_exeext; then
7676 eval "$as_ac_var=yes"
7677 else
7678 echo "$as_me: failed program was:" >&5
7679 sed 's/^/| /' conftest.$ac_ext >&5
7680
7681 -eval "$as_ac_var=no"
7682 + eval "$as_ac_var=no"
7683 fi
7684 -rm -f conftest.err conftest.$ac_objext \
7685 +
7686 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7687 conftest$ac_exeext conftest.$ac_ext
7688 fi
7689 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
7690 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
7691 +ac_res=`eval echo '${'$as_ac_var'}'`
7692 + { echo "$as_me:$LINENO: result: $ac_res" >&5
7693 +echo "${ECHO_T}$ac_res" >&6; }
7694 if test `eval echo '${'$as_ac_var'}'` = yes; then
7695 cat >>confdefs.h <<_ACEOF
7696 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
7697 @@ -7617,27 +8078,27 @@
7698 use_installed_libltdl=no
7699
7700
7701 -# Check whether --with-included_ltdl or --without-included_ltdl was given.
7702 +# Check whether --with-included_ltdl was given.
7703 if test "${with_included_ltdl+set}" = set; then
7704 - withval="$with_included_ltdl"
7705 + withval=$with_included_ltdl;
7706 +fi
7707
7708 -fi;
7709
7710 if test "x$with_included_ltdl" != xyes; then
7711 # We are not being forced to use the included libltdl sources, so
7712 # decide whether there is a useful installed version we can use.
7713 if test "${ac_cv_header_ltdl_h+set}" = set; then
7714 - echo "$as_me:$LINENO: checking for ltdl.h" >&5
7715 -echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6
7716 + { echo "$as_me:$LINENO: checking for ltdl.h" >&5
7717 +echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
7718 if test "${ac_cv_header_ltdl_h+set}" = set; then
7719 echo $ECHO_N "(cached) $ECHO_C" >&6
7720 fi
7721 -echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
7722 -echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6
7723 +{ echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
7724 +echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; }
7725 else
7726 # Is the header compilable?
7727 -echo "$as_me:$LINENO: checking ltdl.h usability" >&5
7728 -echo $ECHO_N "checking ltdl.h usability... $ECHO_C" >&6
7729 +{ echo "$as_me:$LINENO: checking ltdl.h usability" >&5
7730 +echo $ECHO_N "checking ltdl.h usability... $ECHO_C" >&6; }
7731 cat >conftest.$ac_ext <<_ACEOF
7732 /* confdefs.h. */
7733 _ACEOF
7734 @@ -7648,40 +8109,37 @@
7735 #include <ltdl.h>
7736 _ACEOF
7737 rm -f conftest.$ac_objext
7738 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7739 - (eval $ac_compile) 2>conftest.er1
7740 +if { (ac_try="$ac_compile"
7741 +case "(($ac_try" in
7742 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7743 + *) ac_try_echo=$ac_try;;
7744 +esac
7745 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7746 + (eval "$ac_compile") 2>conftest.er1
7747 ac_status=$?
7748 grep -v '^ *+' conftest.er1 >conftest.err
7749 rm -f conftest.er1
7750 cat conftest.err >&5
7751 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7752 - (exit $ac_status); } &&
7753 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7754 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7755 - (eval $ac_try) 2>&5
7756 - ac_status=$?
7757 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7758 - (exit $ac_status); }; } &&
7759 - { ac_try='test -s conftest.$ac_objext'
7760 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7761 - (eval $ac_try) 2>&5
7762 - ac_status=$?
7763 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7764 - (exit $ac_status); }; }; then
7765 + (exit $ac_status); } && {
7766 + test -z "$ac_c_werror_flag" ||
7767 + test ! -s conftest.err
7768 + } && test -s conftest.$ac_objext; then
7769 ac_header_compiler=yes
7770 else
7771 echo "$as_me: failed program was:" >&5
7772 sed 's/^/| /' conftest.$ac_ext >&5
7773
7774 -ac_header_compiler=no
7775 + ac_header_compiler=no
7776 fi
7777 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7778 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7779 -echo "${ECHO_T}$ac_header_compiler" >&6
7780 +
7781 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7782 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7783 +echo "${ECHO_T}$ac_header_compiler" >&6; }
7784
7785 # Is the header present?
7786 -echo "$as_me:$LINENO: checking ltdl.h presence" >&5
7787 -echo $ECHO_N "checking ltdl.h presence... $ECHO_C" >&6
7788 +{ echo "$as_me:$LINENO: checking ltdl.h presence" >&5
7789 +echo $ECHO_N "checking ltdl.h presence... $ECHO_C" >&6; }
7790 cat >conftest.$ac_ext <<_ACEOF
7791 /* confdefs.h. */
7792 _ACEOF
7793 @@ -7690,24 +8148,22 @@
7794 /* end confdefs.h. */
7795 #include <ltdl.h>
7796 _ACEOF
7797 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7798 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7799 +if { (ac_try="$ac_cpp conftest.$ac_ext"
7800 +case "(($ac_try" in
7801 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7802 + *) ac_try_echo=$ac_try;;
7803 +esac
7804 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7805 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
7806 ac_status=$?
7807 grep -v '^ *+' conftest.er1 >conftest.err
7808 rm -f conftest.er1
7809 cat conftest.err >&5
7810 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7811 - (exit $ac_status); } >/dev/null; then
7812 - if test -s conftest.err; then
7813 - ac_cpp_err=$ac_c_preproc_warn_flag
7814 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
7815 - else
7816 - ac_cpp_err=
7817 - fi
7818 -else
7819 - ac_cpp_err=yes
7820 -fi
7821 -if test -z "$ac_cpp_err"; then
7822 + (exit $ac_status); } >/dev/null && {
7823 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
7824 + test ! -s conftest.err
7825 + }; then
7826 ac_header_preproc=yes
7827 else
7828 echo "$as_me: failed program was:" >&5
7829 @@ -7715,9 +8171,10 @@
7830
7831 ac_header_preproc=no
7832 fi
7833 +
7834 rm -f conftest.err conftest.$ac_ext
7835 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7836 -echo "${ECHO_T}$ac_header_preproc" >&6
7837 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7838 +echo "${ECHO_T}$ac_header_preproc" >&6; }
7839
7840 # So? What about this header?
7841 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7842 @@ -7741,30 +8198,28 @@
7843 echo "$as_me: WARNING: ltdl.h: proceeding with the preprocessor's result" >&2;}
7844 { echo "$as_me:$LINENO: WARNING: ltdl.h: in the future, the compiler will take precedence" >&5
7845 echo "$as_me: WARNING: ltdl.h: in the future, the compiler will take precedence" >&2;}
7846 - (
7847 - cat <<\_ASBOX
7848 + ( cat <<\_ASBOX
7849 ## ------------------------------------------------- ##
7850 ## Report this to gphoto-devel@lists.sourceforge.net ##
7851 ## ------------------------------------------------- ##
7852 _ASBOX
7853 - ) |
7854 - sed "s/^/$as_me: WARNING: /" >&2
7855 + ) | sed "s/^/$as_me: WARNING: /" >&2
7856 ;;
7857 esac
7858 -echo "$as_me:$LINENO: checking for ltdl.h" >&5
7859 -echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6
7860 +{ echo "$as_me:$LINENO: checking for ltdl.h" >&5
7861 +echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
7862 if test "${ac_cv_header_ltdl_h+set}" = set; then
7863 echo $ECHO_N "(cached) $ECHO_C" >&6
7864 else
7865 ac_cv_header_ltdl_h=$ac_header_preproc
7866 fi
7867 -echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
7868 -echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6
7869 +{ echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
7870 +echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; }
7871
7872 fi
7873 if test $ac_cv_header_ltdl_h = yes; then
7874 - echo "$as_me:$LINENO: checking for lt_dlcaller_register in -lltdl" >&5
7875 -echo $ECHO_N "checking for lt_dlcaller_register in -lltdl... $ECHO_C" >&6
7876 + { echo "$as_me:$LINENO: checking for lt_dlcaller_register in -lltdl" >&5
7877 +echo $ECHO_N "checking for lt_dlcaller_register in -lltdl... $ECHO_C" >&6; }
7878 if test "${ac_cv_lib_ltdl_lt_dlcaller_register+set}" = set; then
7879 echo $ECHO_N "(cached) $ECHO_C" >&6
7880 else
7881 @@ -7777,55 +8232,53 @@
7882 cat >>conftest.$ac_ext <<_ACEOF
7883 /* end confdefs.h. */
7884
7885 -/* Override any gcc2 internal prototype to avoid an error. */
7886 +/* Override any GCC internal prototype to avoid an error.
7887 + Use char because int might match the return type of a GCC
7888 + builtin and then its argument prototype would still apply. */
7889 #ifdef __cplusplus
7890 extern "C"
7891 #endif
7892 -/* We use char because int might match the return type of a gcc2
7893 - builtin and then its argument prototype would still apply. */
7894 char lt_dlcaller_register ();
7895 int
7896 main ()
7897 {
7898 -lt_dlcaller_register ();
7899 +return lt_dlcaller_register ();
7900 ;
7901 return 0;
7902 }
7903 _ACEOF
7904 rm -f conftest.$ac_objext conftest$ac_exeext
7905 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7906 - (eval $ac_link) 2>conftest.er1
7907 +if { (ac_try="$ac_link"
7908 +case "(($ac_try" in
7909 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7910 + *) ac_try_echo=$ac_try;;
7911 +esac
7912 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7913 + (eval "$ac_link") 2>conftest.er1
7914 ac_status=$?
7915 grep -v '^ *+' conftest.er1 >conftest.err
7916 rm -f conftest.er1
7917 cat conftest.err >&5
7918 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7919 - (exit $ac_status); } &&
7920 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7921 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7922 - (eval $ac_try) 2>&5
7923 - ac_status=$?
7924 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7925 - (exit $ac_status); }; } &&
7926 - { ac_try='test -s conftest$ac_exeext'
7927 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7928 - (eval $ac_try) 2>&5
7929 - ac_status=$?
7930 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7931 - (exit $ac_status); }; }; then
7932 + (exit $ac_status); } && {
7933 + test -z "$ac_c_werror_flag" ||
7934 + test ! -s conftest.err
7935 + } && test -s conftest$ac_exeext &&
7936 + $as_test_x conftest$ac_exeext; then
7937 ac_cv_lib_ltdl_lt_dlcaller_register=yes
7938 else
7939 echo "$as_me: failed program was:" >&5
7940 sed 's/^/| /' conftest.$ac_ext >&5
7941
7942 -ac_cv_lib_ltdl_lt_dlcaller_register=no
7943 + ac_cv_lib_ltdl_lt_dlcaller_register=no
7944 fi
7945 -rm -f conftest.err conftest.$ac_objext \
7946 +
7947 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7948 conftest$ac_exeext conftest.$ac_ext
7949 LIBS=$ac_check_lib_save_LIBS
7950 fi
7951 -echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlcaller_register" >&5
7952 -echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlcaller_register" >&6
7953 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlcaller_register" >&5
7954 +echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlcaller_register" >&6; }
7955 if test $ac_cv_lib_ltdl_lt_dlcaller_register = yes; then
7956 with_included_ltdl=no
7957 else
7958 @@ -7867,12 +8320,10 @@
7959 fi
7960
7961 # Report our decision...
7962 -echo "$as_me:$LINENO: checking whether to use included libltdl" >&5
7963 -echo $ECHO_N "checking whether to use included libltdl... $ECHO_C" >&6
7964 -echo "$as_me:$LINENO: result: $with_included_ltdl" >&5
7965 -echo "${ECHO_T}$with_included_ltdl" >&6
7966 -
7967 -
7968 +{ echo "$as_me:$LINENO: checking whether to use included libltdl" >&5
7969 +echo $ECHO_N "checking whether to use included libltdl... $ECHO_C" >&6; }
7970 +{ echo "$as_me:$LINENO: result: $with_included_ltdl" >&5
7971 +echo "${ECHO_T}$with_included_ltdl" >&6; }
7972
7973 subdirs="$subdirs libltdl"
7974
7975 @@ -7881,10 +8332,9 @@
7976
7977
7978
7979 -# Check whether --enable-shared or --disable-shared was given.
7980 +# Check whether --enable-shared was given.
7981 if test "${enable_shared+set}" = set; then
7982 - enableval="$enable_shared"
7983 - p=${PACKAGE-default}
7984 + enableval=$enable_shared; p=${PACKAGE-default}
7985 case $enableval in
7986 yes) enable_shared=yes ;;
7987 no) enable_shared=no ;;
7988 @@ -7903,12 +8353,12 @@
7989 esac
7990 else
7991 enable_shared=yes
7992 -fi;
7993 +fi
7994 +
7995
7996 -# Check whether --enable-static or --disable-static was given.
7997 +# Check whether --enable-static was given.
7998 if test "${enable_static+set}" = set; then
7999 - enableval="$enable_static"
8000 - p=${PACKAGE-default}
8001 + enableval=$enable_static; p=${PACKAGE-default}
8002 case $enableval in
8003 yes) enable_static=yes ;;
8004 no) enable_static=no ;;
8005 @@ -7927,12 +8377,12 @@
8006 esac
8007 else
8008 enable_static=yes
8009 -fi;
8010 +fi
8011 +
8012
8013 -# Check whether --enable-fast-install or --disable-fast-install was given.
8014 +# Check whether --enable-fast-install was given.
8015 if test "${enable_fast_install+set}" = set; then
8016 - enableval="$enable_fast_install"
8017 - p=${PACKAGE-default}
8018 + enableval=$enable_fast_install; p=${PACKAGE-default}
8019 case $enableval in
8020 yes) enable_fast_install=yes ;;
8021 no) enable_fast_install=no ;;
8022 @@ -7951,10 +8401,11 @@
8023 esac
8024 else
8025 enable_fast_install=yes
8026 -fi;
8027 +fi
8028 +
8029
8030 -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
8031 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
8032 +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
8033 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
8034 if test "${lt_cv_path_SED+set}" = set; then
8035 echo $ECHO_N "(cached) $ECHO_C" >&6
8036 else
8037 @@ -8007,22 +8458,22 @@
8038 fi
8039
8040 SED=$lt_cv_path_SED
8041 -echo "$as_me:$LINENO: result: $SED" >&5
8042 -echo "${ECHO_T}$SED" >&6
8043 +{ echo "$as_me:$LINENO: result: $SED" >&5
8044 +echo "${ECHO_T}$SED" >&6; }
8045
8046
8047 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
8048 +# Check whether --with-gnu-ld was given.
8049 if test "${with_gnu_ld+set}" = set; then
8050 - withval="$with_gnu_ld"
8051 - test "$withval" = no || with_gnu_ld=yes
8052 + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
8053 else
8054 with_gnu_ld=no
8055 -fi;
8056 +fi
8057 +
8058 ac_prog=ld
8059 if test "$GCC" = yes; then
8060 # Check if gcc -print-prog-name=ld gives a path.
8061 - echo "$as_me:$LINENO: checking for ld used by $CC" >&5
8062 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
8063 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
8064 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
8065 case $host in
8066 *-*-mingw*)
8067 # gcc leaves a trailing carriage return which upsets mingw
8068 @@ -8051,11 +8502,11 @@
8069 ;;
8070 esac
8071 elif test "$with_gnu_ld" = yes; then
8072 - echo "$as_me:$LINENO: checking for GNU ld" >&5
8073 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
8074 + { echo "$as_me:$LINENO: checking for GNU ld" >&5
8075 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
8076 else
8077 - echo "$as_me:$LINENO: checking for non-GNU ld" >&5
8078 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
8079 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
8080 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
8081 fi
8082 if test "${lt_cv_path_LD+set}" = set; then
8083 echo $ECHO_N "(cached) $ECHO_C" >&6
8084 @@ -8088,17 +8539,17 @@
8085
8086 LD="$lt_cv_path_LD"
8087 if test -n "$LD"; then
8088 - echo "$as_me:$LINENO: result: $LD" >&5
8089 -echo "${ECHO_T}$LD" >&6
8090 + { echo "$as_me:$LINENO: result: $LD" >&5
8091 +echo "${ECHO_T}$LD" >&6; }
8092 else
8093 - echo "$as_me:$LINENO: result: no" >&5
8094 -echo "${ECHO_T}no" >&6
8095 + { echo "$as_me:$LINENO: result: no" >&5
8096 +echo "${ECHO_T}no" >&6; }
8097 fi
8098 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
8099 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
8100 { (exit 1); exit 1; }; }
8101 -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
8102 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
8103 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
8104 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
8105 if test "${lt_cv_prog_gnu_ld+set}" = set; then
8106 echo $ECHO_N "(cached) $ECHO_C" >&6
8107 else
8108 @@ -8112,20 +8563,20 @@
8109 ;;
8110 esac
8111 fi
8112 -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
8113 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
8114 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
8115 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
8116 with_gnu_ld=$lt_cv_prog_gnu_ld
8117
8118
8119 -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
8120 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
8121 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
8122 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
8123 if test "${lt_cv_ld_reload_flag+set}" = set; then
8124 echo $ECHO_N "(cached) $ECHO_C" >&6
8125 else
8126 lt_cv_ld_reload_flag='-r'
8127 fi
8128 -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
8129 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
8130 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
8131 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
8132 reload_flag=$lt_cv_ld_reload_flag
8133 case $reload_flag in
8134 "" | " "*) ;;
8135 @@ -8142,19 +8593,19 @@
8136 ;;
8137 esac
8138
8139 -echo "$as_me:$LINENO: checking whether ln -s works" >&5
8140 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
8141 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
8142 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
8143 LN_S=$as_ln_s
8144 if test "$LN_S" = "ln -s"; then
8145 - echo "$as_me:$LINENO: result: yes" >&5
8146 -echo "${ECHO_T}yes" >&6
8147 + { echo "$as_me:$LINENO: result: yes" >&5
8148 +echo "${ECHO_T}yes" >&6; }
8149 else
8150 - echo "$as_me:$LINENO: result: no, using $LN_S" >&5
8151 -echo "${ECHO_T}no, using $LN_S" >&6
8152 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
8153 +echo "${ECHO_T}no, using $LN_S" >&6; }
8154 fi
8155
8156 -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
8157 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
8158 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
8159 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
8160 if test "${lt_cv_deplibs_check_method+set}" = set; then
8161 echo $ECHO_N "(cached) $ECHO_C" >&6
8162 else
8163 @@ -8329,8 +8780,8 @@
8164 esac
8165
8166 fi
8167 -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
8168 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
8169 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
8170 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
8171 file_magic_cmd=$lt_cv_file_magic_cmd
8172 deplibs_check_method=$lt_cv_deplibs_check_method
8173 test -z "$deplibs_check_method" && deplibs_check_method=unknown
8174 @@ -8346,11 +8797,11 @@
8175 # Allow CC to be a program name with arguments.
8176 compiler=$CC
8177
8178 -# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
8179 +# Check whether --enable-libtool-lock was given.
8180 if test "${enable_libtool_lock+set}" = set; then
8181 - enableval="$enable_libtool_lock"
8182 + enableval=$enable_libtool_lock;
8183 +fi
8184
8185 -fi;
8186 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
8187
8188 # Some flags need to be propagated to the compiler or linker for good
8189 @@ -8377,7 +8828,7 @@
8190 ;;
8191 *-*-irix6*)
8192 # Find out which ABI we are using.
8193 - echo '#line 8380 "configure"' > conftest.$ac_ext
8194 + echo '#line 8831 "configure"' > conftest.$ac_ext
8195 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8196 (eval $ac_compile) 2>&5
8197 ac_status=$?
8198 @@ -8462,8 +8913,8 @@
8199 # On SCO OpenServer 5, we need -belf to get full-featured binaries.
8200 SAVE_CFLAGS="$CFLAGS"
8201 CFLAGS="$CFLAGS -belf"
8202 - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
8203 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
8204 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
8205 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
8206 if test "${lt_cv_cc_needs_belf+set}" = set; then
8207 echo $ECHO_N "(cached) $ECHO_C" >&6
8208 else
8209 @@ -8489,34 +8940,32 @@
8210 }
8211 _ACEOF
8212 rm -f conftest.$ac_objext conftest$ac_exeext
8213 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8214 - (eval $ac_link) 2>conftest.er1
8215 +if { (ac_try="$ac_link"
8216 +case "(($ac_try" in
8217 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8218 + *) ac_try_echo=$ac_try;;
8219 +esac
8220 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8221 + (eval "$ac_link") 2>conftest.er1
8222 ac_status=$?
8223 grep -v '^ *+' conftest.er1 >conftest.err
8224 rm -f conftest.er1
8225 cat conftest.err >&5
8226 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8227 - (exit $ac_status); } &&
8228 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8229 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8230 - (eval $ac_try) 2>&5
8231 - ac_status=$?
8232 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8233 - (exit $ac_status); }; } &&
8234 - { ac_try='test -s conftest$ac_exeext'
8235 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8236 - (eval $ac_try) 2>&5
8237 - ac_status=$?
8238 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8239 - (exit $ac_status); }; }; then
8240 + (exit $ac_status); } && {
8241 + test -z "$ac_c_werror_flag" ||
8242 + test ! -s conftest.err
8243 + } && test -s conftest$ac_exeext &&
8244 + $as_test_x conftest$ac_exeext; then
8245 lt_cv_cc_needs_belf=yes
8246 else
8247 echo "$as_me: failed program was:" >&5
8248 sed 's/^/| /' conftest.$ac_ext >&5
8249
8250 -lt_cv_cc_needs_belf=no
8251 + lt_cv_cc_needs_belf=no
8252 fi
8253 -rm -f conftest.err conftest.$ac_objext \
8254 +
8255 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8256 conftest$ac_exeext conftest.$ac_ext
8257 ac_ext=c
8258 ac_cpp='$CPP $CPPFLAGS'
8259 @@ -8525,8 +8974,8 @@
8260 ac_compiler_gnu=$ac_cv_c_compiler_gnu
8261
8262 fi
8263 -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
8264 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
8265 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
8266 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
8267 if test x"$lt_cv_cc_needs_belf" != x"yes"; then
8268 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
8269 CFLAGS="$SAVE_CFLAGS"
8270 @@ -8556,8 +9005,8 @@
8271 if test -n "$ac_tool_prefix"; then
8272 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
8273 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
8274 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8275 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8276 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8277 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8278 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
8279 echo $ECHO_N "(cached) $ECHO_C" >&6
8280 else
8281 @@ -8570,32 +9019,34 @@
8282 IFS=$as_save_IFS
8283 test -z "$as_dir" && as_dir=.
8284 for ac_exec_ext in '' $ac_executable_extensions; do
8285 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8286 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8287 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
8288 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8289 break 2
8290 fi
8291 done
8292 done
8293 +IFS=$as_save_IFS
8294
8295 fi
8296 fi
8297 DLLTOOL=$ac_cv_prog_DLLTOOL
8298 if test -n "$DLLTOOL"; then
8299 - echo "$as_me:$LINENO: result: $DLLTOOL" >&5
8300 -echo "${ECHO_T}$DLLTOOL" >&6
8301 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
8302 +echo "${ECHO_T}$DLLTOOL" >&6; }
8303 else
8304 - echo "$as_me:$LINENO: result: no" >&5
8305 -echo "${ECHO_T}no" >&6
8306 + { echo "$as_me:$LINENO: result: no" >&5
8307 +echo "${ECHO_T}no" >&6; }
8308 fi
8309
8310 +
8311 fi
8312 if test -z "$ac_cv_prog_DLLTOOL"; then
8313 ac_ct_DLLTOOL=$DLLTOOL
8314 # Extract the first word of "dlltool", so it can be a program name with args.
8315 set dummy dlltool; ac_word=$2
8316 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8317 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8318 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8319 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8320 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
8321 echo $ECHO_N "(cached) $ECHO_C" >&6
8322 else
8323 @@ -8608,27 +9059,41 @@
8324 IFS=$as_save_IFS
8325 test -z "$as_dir" && as_dir=.
8326 for ac_exec_ext in '' $ac_executable_extensions; do
8327 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8328 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8329 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
8330 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8331 break 2
8332 fi
8333 done
8334 done
8335 +IFS=$as_save_IFS
8336
8337 - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
8338 fi
8339 fi
8340 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
8341 if test -n "$ac_ct_DLLTOOL"; then
8342 - echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
8343 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
8344 + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
8345 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
8346 else
8347 - echo "$as_me:$LINENO: result: no" >&5
8348 -echo "${ECHO_T}no" >&6
8349 + { echo "$as_me:$LINENO: result: no" >&5
8350 +echo "${ECHO_T}no" >&6; }
8351 fi
8352
8353 - DLLTOOL=$ac_ct_DLLTOOL
8354 + if test "x$ac_ct_DLLTOOL" = x; then
8355 + DLLTOOL="false"
8356 + else
8357 + case $cross_compiling:$ac_tool_warned in
8358 +yes:)
8359 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
8360 +whose name does not start with the host triplet. If you think this
8361 +configuration is useful to you, please write to autoconf@gnu.org." >&5
8362 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
8363 +whose name does not start with the host triplet. If you think this
8364 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
8365 +ac_tool_warned=yes ;;
8366 +esac
8367 + DLLTOOL=$ac_ct_DLLTOOL
8368 + fi
8369 else
8370 DLLTOOL="$ac_cv_prog_DLLTOOL"
8371 fi
8372 @@ -8636,8 +9101,8 @@
8373 if test -n "$ac_tool_prefix"; then
8374 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
8375 set dummy ${ac_tool_prefix}as; ac_word=$2
8376 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8377 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8378 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8379 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8380 if test "${ac_cv_prog_AS+set}" = set; then
8381 echo $ECHO_N "(cached) $ECHO_C" >&6
8382 else
8383 @@ -8650,32 +9115,34 @@
8384 IFS=$as_save_IFS
8385 test -z "$as_dir" && as_dir=.
8386 for ac_exec_ext in '' $ac_executable_extensions; do
8387 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8388 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8389 ac_cv_prog_AS="${ac_tool_prefix}as"
8390 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8391 break 2
8392 fi
8393 done
8394 done
8395 +IFS=$as_save_IFS
8396
8397 fi
8398 fi
8399 AS=$ac_cv_prog_AS
8400 if test -n "$AS"; then
8401 - echo "$as_me:$LINENO: result: $AS" >&5
8402 -echo "${ECHO_T}$AS" >&6
8403 + { echo "$as_me:$LINENO: result: $AS" >&5
8404 +echo "${ECHO_T}$AS" >&6; }
8405 else
8406 - echo "$as_me:$LINENO: result: no" >&5
8407 -echo "${ECHO_T}no" >&6
8408 + { echo "$as_me:$LINENO: result: no" >&5
8409 +echo "${ECHO_T}no" >&6; }
8410 fi
8411
8412 +
8413 fi
8414 if test -z "$ac_cv_prog_AS"; then
8415 ac_ct_AS=$AS
8416 # Extract the first word of "as", so it can be a program name with args.
8417 set dummy as; ac_word=$2
8418 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8419 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8420 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8421 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8422 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
8423 echo $ECHO_N "(cached) $ECHO_C" >&6
8424 else
8425 @@ -8688,27 +9155,41 @@
8426 IFS=$as_save_IFS
8427 test -z "$as_dir" && as_dir=.
8428 for ac_exec_ext in '' $ac_executable_extensions; do
8429 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8430 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8431 ac_cv_prog_ac_ct_AS="as"
8432 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8433 break 2
8434 fi
8435 done
8436 done
8437 +IFS=$as_save_IFS
8438
8439 - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
8440 fi
8441 fi
8442 ac_ct_AS=$ac_cv_prog_ac_ct_AS
8443 if test -n "$ac_ct_AS"; then
8444 - echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
8445 -echo "${ECHO_T}$ac_ct_AS" >&6
8446 + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
8447 +echo "${ECHO_T}$ac_ct_AS" >&6; }
8448 else
8449 - echo "$as_me:$LINENO: result: no" >&5
8450 -echo "${ECHO_T}no" >&6
8451 + { echo "$as_me:$LINENO: result: no" >&5
8452 +echo "${ECHO_T}no" >&6; }
8453 fi
8454
8455 - AS=$ac_ct_AS
8456 + if test "x$ac_ct_AS" = x; then
8457 + AS="false"
8458 + else
8459 + case $cross_compiling:$ac_tool_warned in
8460 +yes:)
8461 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
8462 +whose name does not start with the host triplet. If you think this
8463 +configuration is useful to you, please write to autoconf@gnu.org." >&5
8464 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
8465 +whose name does not start with the host triplet. If you think this
8466 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
8467 +ac_tool_warned=yes ;;
8468 +esac
8469 + AS=$ac_ct_AS
8470 + fi
8471 else
8472 AS="$ac_cv_prog_AS"
8473 fi
8474 @@ -8716,8 +9197,8 @@
8475 if test -n "$ac_tool_prefix"; then
8476 # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
8477 set dummy ${ac_tool_prefix}objdump; ac_word=$2
8478 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8479 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8480 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8481 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8482 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
8483 echo $ECHO_N "(cached) $ECHO_C" >&6
8484 else
8485 @@ -8730,32 +9211,34 @@
8486 IFS=$as_save_IFS
8487 test -z "$as_dir" && as_dir=.
8488 for ac_exec_ext in '' $ac_executable_extensions; do
8489 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8490 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8491 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
8492 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8493 break 2
8494 fi
8495 done
8496 done
8497 +IFS=$as_save_IFS
8498
8499 fi
8500 fi
8501 OBJDUMP=$ac_cv_prog_OBJDUMP
8502 if test -n "$OBJDUMP"; then
8503 - echo "$as_me:$LINENO: result: $OBJDUMP" >&5
8504 -echo "${ECHO_T}$OBJDUMP" >&6
8505 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
8506 +echo "${ECHO_T}$OBJDUMP" >&6; }
8507 else
8508 - echo "$as_me:$LINENO: result: no" >&5
8509 -echo "${ECHO_T}no" >&6
8510 + { echo "$as_me:$LINENO: result: no" >&5
8511 +echo "${ECHO_T}no" >&6; }
8512 fi
8513
8514 +
8515 fi
8516 if test -z "$ac_cv_prog_OBJDUMP"; then
8517 ac_ct_OBJDUMP=$OBJDUMP
8518 # Extract the first word of "objdump", so it can be a program name with args.
8519 set dummy objdump; ac_word=$2
8520 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8521 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8522 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8523 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8524 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
8525 echo $ECHO_N "(cached) $ECHO_C" >&6
8526 else
8527 @@ -8768,27 +9251,41 @@
8528 IFS=$as_save_IFS
8529 test -z "$as_dir" && as_dir=.
8530 for ac_exec_ext in '' $ac_executable_extensions; do
8531 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8532 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8533 ac_cv_prog_ac_ct_OBJDUMP="objdump"
8534 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8535 break 2
8536 fi
8537 done
8538 done
8539 +IFS=$as_save_IFS
8540
8541 - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
8542 fi
8543 fi
8544 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
8545 if test -n "$ac_ct_OBJDUMP"; then
8546 - echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
8547 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
8548 + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
8549 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
8550 else
8551 - echo "$as_me:$LINENO: result: no" >&5
8552 -echo "${ECHO_T}no" >&6
8553 + { echo "$as_me:$LINENO: result: no" >&5
8554 +echo "${ECHO_T}no" >&6; }
8555 fi
8556
8557 - OBJDUMP=$ac_ct_OBJDUMP
8558 + if test "x$ac_ct_OBJDUMP" = x; then
8559 + OBJDUMP="false"
8560 + else
8561 + case $cross_compiling:$ac_tool_warned in
8562 +yes:)
8563 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
8564 +whose name does not start with the host triplet. If you think this
8565 +configuration is useful to you, please write to autoconf@gnu.org." >&5
8566 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
8567 +whose name does not start with the host triplet. If you think this
8568 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
8569 +ac_tool_warned=yes ;;
8570 +esac
8571 + OBJDUMP=$ac_ct_OBJDUMP
8572 + fi
8573 else
8574 OBJDUMP="$ac_cv_prog_OBJDUMP"
8575 fi
8576 @@ -8800,18 +9297,22 @@
8577 need_locks="$enable_libtool_lock"
8578
8579
8580 -ac_ext=cc
8581 +ac_ext=cpp
8582 ac_cpp='$CXXCPP $CPPFLAGS'
8583 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8584 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8585 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
8586 -if test -n "$ac_tool_prefix"; then
8587 - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
8588 +if test -z "$CXX"; then
8589 + if test -n "$CCC"; then
8590 + CXX=$CCC
8591 + else
8592 + if test -n "$ac_tool_prefix"; then
8593 + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
8594 do
8595 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8596 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8597 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8598 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8599 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8600 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8601 if test "${ac_cv_prog_CXX+set}" = set; then
8602 echo $ECHO_N "(cached) $ECHO_C" >&6
8603 else
8604 @@ -8824,36 +9325,38 @@
8605 IFS=$as_save_IFS
8606 test -z "$as_dir" && as_dir=.
8607 for ac_exec_ext in '' $ac_executable_extensions; do
8608 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8609 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8610 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
8611 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8612 break 2
8613 fi
8614 done
8615 done
8616 +IFS=$as_save_IFS
8617
8618 fi
8619 fi
8620 CXX=$ac_cv_prog_CXX
8621 if test -n "$CXX"; then
8622 - echo "$as_me:$LINENO: result: $CXX" >&5
8623 -echo "${ECHO_T}$CXX" >&6
8624 + { echo "$as_me:$LINENO: result: $CXX" >&5
8625 +echo "${ECHO_T}$CXX" >&6; }
8626 else
8627 - echo "$as_me:$LINENO: result: no" >&5
8628 -echo "${ECHO_T}no" >&6
8629 + { echo "$as_me:$LINENO: result: no" >&5
8630 +echo "${ECHO_T}no" >&6; }
8631 fi
8632
8633 +
8634 test -n "$CXX" && break
8635 done
8636 fi
8637 if test -z "$CXX"; then
8638 ac_ct_CXX=$CXX
8639 - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
8640 + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
8641 do
8642 # Extract the first word of "$ac_prog", so it can be a program name with args.
8643 set dummy $ac_prog; ac_word=$2
8644 -echo "$as_me:$LINENO: checking for $ac_word" >&5
8645 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8646 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
8647 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
8648 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
8649 echo $ECHO_N "(cached) $ECHO_C" >&6
8650 else
8651 @@ -8866,55 +9369,85 @@
8652 IFS=$as_save_IFS
8653 test -z "$as_dir" && as_dir=.
8654 for ac_exec_ext in '' $ac_executable_extensions; do
8655 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8656 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8657 ac_cv_prog_ac_ct_CXX="$ac_prog"
8658 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8659 break 2
8660 fi
8661 done
8662 done
8663 +IFS=$as_save_IFS
8664
8665 fi
8666 fi
8667 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
8668 if test -n "$ac_ct_CXX"; then
8669 - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
8670 -echo "${ECHO_T}$ac_ct_CXX" >&6
8671 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
8672 +echo "${ECHO_T}$ac_ct_CXX" >&6; }
8673 else
8674 - echo "$as_me:$LINENO: result: no" >&5
8675 -echo "${ECHO_T}no" >&6
8676 + { echo "$as_me:$LINENO: result: no" >&5
8677 +echo "${ECHO_T}no" >&6; }
8678 fi
8679
8680 +
8681 test -n "$ac_ct_CXX" && break
8682 done
8683 -test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
8684
8685 - CXX=$ac_ct_CXX
8686 + if test "x$ac_ct_CXX" = x; then
8687 + CXX="g++"
8688 + else
8689 + case $cross_compiling:$ac_tool_warned in
8690 +yes:)
8691 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
8692 +whose name does not start with the host triplet. If you think this
8693 +configuration is useful to you, please write to autoconf@gnu.org." >&5
8694 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
8695 +whose name does not start with the host triplet. If you think this
8696 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
8697 +ac_tool_warned=yes ;;
8698 +esac
8699 + CXX=$ac_ct_CXX
8700 + fi
8701 fi
8702
8703 -
8704 + fi
8705 +fi
8706 # Provide some information about the compiler.
8707 -echo "$as_me:$LINENO:" \
8708 - "checking for C++ compiler version" >&5
8709 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5
8710 ac_compiler=`set X $ac_compile; echo $2`
8711 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
8712 - (eval $ac_compiler --version </dev/null >&5) 2>&5
8713 +{ (ac_try="$ac_compiler --version >&5"
8714 +case "(($ac_try" in
8715 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8716 + *) ac_try_echo=$ac_try;;
8717 +esac
8718 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8719 + (eval "$ac_compiler --version >&5") 2>&5
8720 ac_status=$?
8721 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8722 (exit $ac_status); }
8723 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
8724 - (eval $ac_compiler -v </dev/null >&5) 2>&5
8725 +{ (ac_try="$ac_compiler -v >&5"
8726 +case "(($ac_try" in
8727 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8728 + *) ac_try_echo=$ac_try;;
8729 +esac
8730 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8731 + (eval "$ac_compiler -v >&5") 2>&5
8732 ac_status=$?
8733 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8734 (exit $ac_status); }
8735 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
8736 - (eval $ac_compiler -V </dev/null >&5) 2>&5
8737 +{ (ac_try="$ac_compiler -V >&5"
8738 +case "(($ac_try" in
8739 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8740 + *) ac_try_echo=$ac_try;;
8741 +esac
8742 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8743 + (eval "$ac_compiler -V >&5") 2>&5
8744 ac_status=$?
8745 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8746 (exit $ac_status); }
8747
8748 -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
8749 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
8750 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
8751 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
8752 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
8753 echo $ECHO_N "(cached) $ECHO_C" >&6
8754 else
8755 @@ -8937,49 +9470,49 @@
8756 }
8757 _ACEOF
8758 rm -f conftest.$ac_objext
8759 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8760 - (eval $ac_compile) 2>conftest.er1
8761 +if { (ac_try="$ac_compile"
8762 +case "(($ac_try" in
8763 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8764 + *) ac_try_echo=$ac_try;;
8765 +esac
8766 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8767 + (eval "$ac_compile") 2>conftest.er1
8768 ac_status=$?
8769 grep -v '^ *+' conftest.er1 >conftest.err
8770 rm -f conftest.er1
8771 cat conftest.err >&5
8772 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8773 - (exit $ac_status); } &&
8774 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
8775 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8776 - (eval $ac_try) 2>&5
8777 - ac_status=$?
8778 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8779 - (exit $ac_status); }; } &&
8780 - { ac_try='test -s conftest.$ac_objext'
8781 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8782 - (eval $ac_try) 2>&5
8783 - ac_status=$?
8784 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8785 - (exit $ac_status); }; }; then
8786 + (exit $ac_status); } && {
8787 + test -z "$ac_cxx_werror_flag" ||
8788 + test ! -s conftest.err
8789 + } && test -s conftest.$ac_objext; then
8790 ac_compiler_gnu=yes
8791 else
8792 echo "$as_me: failed program was:" >&5
8793 sed 's/^/| /' conftest.$ac_ext >&5
8794
8795 -ac_compiler_gnu=no
8796 + ac_compiler_gnu=no
8797 fi
8798 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8799 +
8800 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8801 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
8802
8803 fi
8804 -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
8805 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
8806 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
8807 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
8808 GXX=`test $ac_compiler_gnu = yes && echo yes`
8809 ac_test_CXXFLAGS=${CXXFLAGS+set}
8810 ac_save_CXXFLAGS=$CXXFLAGS
8811 -CXXFLAGS="-g"
8812 -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
8813 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
8814 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
8815 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
8816 if test "${ac_cv_prog_cxx_g+set}" = set; then
8817 echo $ECHO_N "(cached) $ECHO_C" >&6
8818 else
8819 - cat >conftest.$ac_ext <<_ACEOF
8820 + ac_save_cxx_werror_flag=$ac_cxx_werror_flag
8821 + ac_cxx_werror_flag=yes
8822 + ac_cv_prog_cxx_g=no
8823 + CXXFLAGS="-g"
8824 + cat >conftest.$ac_ext <<_ACEOF
8825 /* confdefs.h. */
8826 _ACEOF
8827 cat confdefs.h >>conftest.$ac_ext
8828 @@ -8995,157 +9528,134 @@
8829 }
8830 _ACEOF
8831 rm -f conftest.$ac_objext
8832 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8833 - (eval $ac_compile) 2>conftest.er1
8834 +if { (ac_try="$ac_compile"
8835 +case "(($ac_try" in
8836 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8837 + *) ac_try_echo=$ac_try;;
8838 +esac
8839 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8840 + (eval "$ac_compile") 2>conftest.er1
8841 ac_status=$?
8842 grep -v '^ *+' conftest.er1 >conftest.err
8843 rm -f conftest.er1
8844 cat conftest.err >&5
8845 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8846 - (exit $ac_status); } &&
8847 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
8848 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8849 - (eval $ac_try) 2>&5
8850 - ac_status=$?
8851 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8852 - (exit $ac_status); }; } &&
8853 - { ac_try='test -s conftest.$ac_objext'
8854 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8855 - (eval $ac_try) 2>&5
8856 - ac_status=$?
8857 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8858 - (exit $ac_status); }; }; then
8859 + (exit $ac_status); } && {
8860 + test -z "$ac_cxx_werror_flag" ||
8861 + test ! -s conftest.err
8862 + } && test -s conftest.$ac_objext; then
8863 ac_cv_prog_cxx_g=yes
8864 else
8865 echo "$as_me: failed program was:" >&5
8866 sed 's/^/| /' conftest.$ac_ext >&5
8867
8868 -ac_cv_prog_cxx_g=no
8869 -fi
8870 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8871 -fi
8872 -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
8873 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
8874 -if test "$ac_test_CXXFLAGS" = set; then
8875 - CXXFLAGS=$ac_save_CXXFLAGS
8876 -elif test $ac_cv_prog_cxx_g = yes; then
8877 - if test "$GXX" = yes; then
8878 - CXXFLAGS="-g -O2"
8879 - else
8880 - CXXFLAGS="-g"
8881 - fi
8882 -else
8883 - if test "$GXX" = yes; then
8884 - CXXFLAGS="-O2"
8885 - else
8886 - CXXFLAGS=
8887 - fi
8888 -fi
8889 -for ac_declaration in \
8890 - '' \
8891 - 'extern "C" void std::exit (int) throw (); using std::exit;' \
8892 - 'extern "C" void std::exit (int); using std::exit;' \
8893 - 'extern "C" void exit (int) throw ();' \
8894 - 'extern "C" void exit (int);' \
8895 - 'void exit (int);'
8896 -do
8897 - cat >conftest.$ac_ext <<_ACEOF
8898 + CXXFLAGS=""
8899 + cat >conftest.$ac_ext <<_ACEOF
8900 /* confdefs.h. */
8901 _ACEOF
8902 cat confdefs.h >>conftest.$ac_ext
8903 cat >>conftest.$ac_ext <<_ACEOF
8904 /* end confdefs.h. */
8905 -$ac_declaration
8906 -#include <stdlib.h>
8907 +
8908 int
8909 main ()
8910 {
8911 -exit (42);
8912 +
8913 ;
8914 return 0;
8915 }
8916 _ACEOF
8917 rm -f conftest.$ac_objext
8918 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8919 - (eval $ac_compile) 2>conftest.er1
8920 +if { (ac_try="$ac_compile"
8921 +case "(($ac_try" in
8922 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8923 + *) ac_try_echo=$ac_try;;
8924 +esac
8925 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8926 + (eval "$ac_compile") 2>conftest.er1
8927 ac_status=$?
8928 grep -v '^ *+' conftest.er1 >conftest.err
8929 rm -f conftest.er1
8930 cat conftest.err >&5
8931 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8932 - (exit $ac_status); } &&
8933 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
8934 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8935 - (eval $ac_try) 2>&5
8936 - ac_status=$?
8937 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8938 - (exit $ac_status); }; } &&
8939 - { ac_try='test -s conftest.$ac_objext'
8940 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8941 - (eval $ac_try) 2>&5
8942 - ac_status=$?
8943 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8944 - (exit $ac_status); }; }; then
8945 + (exit $ac_status); } && {
8946 + test -z "$ac_cxx_werror_flag" ||
8947 + test ! -s conftest.err
8948 + } && test -s conftest.$ac_objext; then
8949 :
8950 else
8951 echo "$as_me: failed program was:" >&5
8952 sed 's/^/| /' conftest.$ac_ext >&5
8953
8954 -continue
8955 -fi
8956 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8957 - cat >conftest.$ac_ext <<_ACEOF
8958 + ac_cxx_werror_flag=$ac_save_cxx_werror_flag
8959 + CXXFLAGS="-g"
8960 + cat >conftest.$ac_ext <<_ACEOF
8961 /* confdefs.h. */
8962 _ACEOF
8963 cat confdefs.h >>conftest.$ac_ext
8964 cat >>conftest.$ac_ext <<_ACEOF
8965 /* end confdefs.h. */
8966 -$ac_declaration
8967 +
8968 int
8969 main ()
8970 {
8971 -exit (42);
8972 +
8973 ;
8974 return 0;
8975 }
8976 _ACEOF
8977 rm -f conftest.$ac_objext
8978 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8979 - (eval $ac_compile) 2>conftest.er1
8980 +if { (ac_try="$ac_compile"
8981 +case "(($ac_try" in
8982 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8983 + *) ac_try_echo=$ac_try;;
8984 +esac
8985 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8986 + (eval "$ac_compile") 2>conftest.er1
8987 ac_status=$?
8988 grep -v '^ *+' conftest.er1 >conftest.err
8989 rm -f conftest.er1
8990 cat conftest.err >&5
8991 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8992 - (exit $ac_status); } &&
8993 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
8994 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8995 - (eval $ac_try) 2>&5
8996 - ac_status=$?
8997 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8998 - (exit $ac_status); }; } &&
8999 - { ac_try='test -s conftest.$ac_objext'
9000 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9001 - (eval $ac_try) 2>&5
9002 - ac_status=$?
9003 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9004 - (exit $ac_status); }; }; then
9005 - break
9006 + (exit $ac_status); } && {
9007 + test -z "$ac_cxx_werror_flag" ||
9008 + test ! -s conftest.err
9009 + } && test -s conftest.$ac_objext; then
9010 + ac_cv_prog_cxx_g=yes
9011 else
9012 echo "$as_me: failed program was:" >&5
9013 sed 's/^/| /' conftest.$ac_ext >&5
9014
9015 +
9016 fi
9017 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9018 -done
9019 -rm -f conftest*
9020 -if test -n "$ac_declaration"; then
9021 - echo '#ifdef __cplusplus' >>confdefs.h
9022 - echo $ac_declaration >>confdefs.h
9023 - echo '#endif' >>confdefs.h
9024 +
9025 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9026 +fi
9027 +
9028 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9029 fi
9030
9031 -ac_ext=cc
9032 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9033 + ac_cxx_werror_flag=$ac_save_cxx_werror_flag
9034 +fi
9035 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
9036 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
9037 +if test "$ac_test_CXXFLAGS" = set; then
9038 + CXXFLAGS=$ac_save_CXXFLAGS
9039 +elif test $ac_cv_prog_cxx_g = yes; then
9040 + if test "$GXX" = yes; then
9041 + CXXFLAGS="-g -O2"
9042 + else
9043 + CXXFLAGS="-g"
9044 + fi
9045 +else
9046 + if test "$GXX" = yes; then
9047 + CXXFLAGS="-O2"
9048 + else
9049 + CXXFLAGS=
9050 + fi
9051 +fi
9052 +ac_ext=cpp
9053 ac_cpp='$CXXCPP $CPPFLAGS'
9054 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9055 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9056 @@ -9153,8 +9663,8 @@
9057
9058 depcc="$CXX" am_compiler_list=
9059
9060 -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
9061 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
9062 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
9063 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
9064 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
9065 echo $ECHO_N "(cached) $ECHO_C" >&6
9066 else
9067 @@ -9243,8 +9753,8 @@
9068 fi
9069
9070 fi
9071 -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
9072 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
9073 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
9074 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
9075 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
9076
9077
9078 @@ -9265,13 +9775,13 @@
9079 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
9080 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
9081 (test "X$CXX" != "Xg++"))) ; then
9082 - ac_ext=cc
9083 + ac_ext=cpp
9084 ac_cpp='$CXXCPP $CPPFLAGS'
9085 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9086 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9087 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9088 -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
9089 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
9090 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
9091 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
9092 if test -z "$CXXCPP"; then
9093 if test "${ac_cv_prog_CXXCPP+set}" = set; then
9094 echo $ECHO_N "(cached) $ECHO_C" >&6
9095 @@ -9301,24 +9811,22 @@
9096 #endif
9097 Syntax error
9098 _ACEOF
9099 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
9100 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9101 +if { (ac_try="$ac_cpp conftest.$ac_ext"
9102 +case "(($ac_try" in
9103 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9104 + *) ac_try_echo=$ac_try;;
9105 +esac
9106 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9107 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
9108 ac_status=$?
9109 grep -v '^ *+' conftest.er1 >conftest.err
9110 rm -f conftest.er1
9111 cat conftest.err >&5
9112 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9113 - (exit $ac_status); } >/dev/null; then
9114 - if test -s conftest.err; then
9115 - ac_cpp_err=$ac_cxx_preproc_warn_flag
9116 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
9117 - else
9118 - ac_cpp_err=
9119 - fi
9120 -else
9121 - ac_cpp_err=yes
9122 -fi
9123 -if test -z "$ac_cpp_err"; then
9124 + (exit $ac_status); } >/dev/null && {
9125 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
9126 + test ! -s conftest.err
9127 + }; then
9128 :
9129 else
9130 echo "$as_me: failed program was:" >&5
9131 @@ -9327,9 +9835,10 @@
9132 # Broken: fails on valid input.
9133 continue
9134 fi
9135 +
9136 rm -f conftest.err conftest.$ac_ext
9137
9138 - # OK, works on sane cases. Now check whether non-existent headers
9139 + # OK, works on sane cases. Now check whether nonexistent headers
9140 # can be detected and how.
9141 cat >conftest.$ac_ext <<_ACEOF
9142 /* confdefs.h. */
9143 @@ -9339,24 +9848,22 @@
9144 /* end confdefs.h. */
9145 #include <ac_nonexistent.h>
9146 _ACEOF
9147 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
9148 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9149 +if { (ac_try="$ac_cpp conftest.$ac_ext"
9150 +case "(($ac_try" in
9151 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9152 + *) ac_try_echo=$ac_try;;
9153 +esac
9154 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9155 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
9156 ac_status=$?
9157 grep -v '^ *+' conftest.er1 >conftest.err
9158 rm -f conftest.er1
9159 cat conftest.err >&5
9160 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9161 - (exit $ac_status); } >/dev/null; then
9162 - if test -s conftest.err; then
9163 - ac_cpp_err=$ac_cxx_preproc_warn_flag
9164 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
9165 - else
9166 - ac_cpp_err=
9167 - fi
9168 -else
9169 - ac_cpp_err=yes
9170 -fi
9171 -if test -z "$ac_cpp_err"; then
9172 + (exit $ac_status); } >/dev/null && {
9173 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
9174 + test ! -s conftest.err
9175 + }; then
9176 # Broken: success on invalid input.
9177 continue
9178 else
9179 @@ -9367,6 +9874,7 @@
9180 ac_preproc_ok=:
9181 break
9182 fi
9183 +
9184 rm -f conftest.err conftest.$ac_ext
9185
9186 done
9187 @@ -9384,8 +9892,8 @@
9188 else
9189 ac_cv_prog_CXXCPP=$CXXCPP
9190 fi
9191 -echo "$as_me:$LINENO: result: $CXXCPP" >&5
9192 -echo "${ECHO_T}$CXXCPP" >&6
9193 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
9194 +echo "${ECHO_T}$CXXCPP" >&6; }
9195 ac_preproc_ok=false
9196 for ac_cxx_preproc_warn_flag in '' yes
9197 do
9198 @@ -9408,24 +9916,22 @@
9199 #endif
9200 Syntax error
9201 _ACEOF
9202 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
9203 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9204 +if { (ac_try="$ac_cpp conftest.$ac_ext"
9205 +case "(($ac_try" in
9206 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9207 + *) ac_try_echo=$ac_try;;
9208 +esac
9209 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9210 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
9211 ac_status=$?
9212 grep -v '^ *+' conftest.er1 >conftest.err
9213 rm -f conftest.er1
9214 cat conftest.err >&5
9215 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9216 - (exit $ac_status); } >/dev/null; then
9217 - if test -s conftest.err; then
9218 - ac_cpp_err=$ac_cxx_preproc_warn_flag
9219 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
9220 - else
9221 - ac_cpp_err=
9222 - fi
9223 -else
9224 - ac_cpp_err=yes
9225 -fi
9226 -if test -z "$ac_cpp_err"; then
9227 + (exit $ac_status); } >/dev/null && {
9228 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
9229 + test ! -s conftest.err
9230 + }; then
9231 :
9232 else
9233 echo "$as_me: failed program was:" >&5
9234 @@ -9434,9 +9940,10 @@
9235 # Broken: fails on valid input.
9236 continue
9237 fi
9238 +
9239 rm -f conftest.err conftest.$ac_ext
9240
9241 - # OK, works on sane cases. Now check whether non-existent headers
9242 + # OK, works on sane cases. Now check whether nonexistent headers
9243 # can be detected and how.
9244 cat >conftest.$ac_ext <<_ACEOF
9245 /* confdefs.h. */
9246 @@ -9446,24 +9953,22 @@
9247 /* end confdefs.h. */
9248 #include <ac_nonexistent.h>
9249 _ACEOF
9250 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
9251 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9252 +if { (ac_try="$ac_cpp conftest.$ac_ext"
9253 +case "(($ac_try" in
9254 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9255 + *) ac_try_echo=$ac_try;;
9256 +esac
9257 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9258 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
9259 ac_status=$?
9260 grep -v '^ *+' conftest.er1 >conftest.err
9261 rm -f conftest.er1
9262 cat conftest.err >&5
9263 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9264 - (exit $ac_status); } >/dev/null; then
9265 - if test -s conftest.err; then
9266 - ac_cpp_err=$ac_cxx_preproc_warn_flag
9267 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
9268 - else
9269 - ac_cpp_err=
9270 - fi
9271 -else
9272 - ac_cpp_err=yes
9273 -fi
9274 -if test -z "$ac_cpp_err"; then
9275 + (exit $ac_status); } >/dev/null && {
9276 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
9277 + test ! -s conftest.err
9278 + }; then
9279 # Broken: success on invalid input.
9280 continue
9281 else
9282 @@ -9474,6 +9979,7 @@
9283 ac_preproc_ok=:
9284 break
9285 fi
9286 +
9287 rm -f conftest.err conftest.$ac_ext
9288
9289 done
9290 @@ -9489,7 +9995,7 @@
9291 { (exit 1); exit 1; }; }
9292 fi
9293
9294 -ac_ext=cc
9295 +ac_ext=cpp
9296 ac_cpp='$CXXCPP $CPPFLAGS'
9297 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9298 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9299 @@ -9503,12 +10009,12 @@
9300 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9301 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
9302 if test -n "$ac_tool_prefix"; then
9303 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
9304 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
9305 do
9306 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9307 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9308 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9309 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9310 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9311 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9312 if test "${ac_cv_prog_F77+set}" = set; then
9313 echo $ECHO_N "(cached) $ECHO_C" >&6
9314 else
9315 @@ -9521,36 +10027,38 @@
9316 IFS=$as_save_IFS
9317 test -z "$as_dir" && as_dir=.
9318 for ac_exec_ext in '' $ac_executable_extensions; do
9319 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9320 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9321 ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
9322 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9323 break 2
9324 fi
9325 done
9326 done
9327 +IFS=$as_save_IFS
9328
9329 fi
9330 fi
9331 F77=$ac_cv_prog_F77
9332 if test -n "$F77"; then
9333 - echo "$as_me:$LINENO: result: $F77" >&5
9334 -echo "${ECHO_T}$F77" >&6
9335 + { echo "$as_me:$LINENO: result: $F77" >&5
9336 +echo "${ECHO_T}$F77" >&6; }
9337 else
9338 - echo "$as_me:$LINENO: result: no" >&5
9339 -echo "${ECHO_T}no" >&6
9340 + { echo "$as_me:$LINENO: result: no" >&5
9341 +echo "${ECHO_T}no" >&6; }
9342 fi
9343
9344 +
9345 test -n "$F77" && break
9346 done
9347 fi
9348 if test -z "$F77"; then
9349 ac_ct_F77=$F77
9350 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
9351 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
9352 do
9353 # Extract the first word of "$ac_prog", so it can be a program name with args.
9354 set dummy $ac_prog; ac_word=$2
9355 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9356 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9357 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9358 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9359 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
9360 echo $ECHO_N "(cached) $ECHO_C" >&6
9361 else
9362 @@ -9563,48 +10071,78 @@
9363 IFS=$as_save_IFS
9364 test -z "$as_dir" && as_dir=.
9365 for ac_exec_ext in '' $ac_executable_extensions; do
9366 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9367 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9368 ac_cv_prog_ac_ct_F77="$ac_prog"
9369 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9370 break 2
9371 fi
9372 done
9373 done
9374 +IFS=$as_save_IFS
9375
9376 fi
9377 fi
9378 ac_ct_F77=$ac_cv_prog_ac_ct_F77
9379 if test -n "$ac_ct_F77"; then
9380 - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
9381 -echo "${ECHO_T}$ac_ct_F77" >&6
9382 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
9383 +echo "${ECHO_T}$ac_ct_F77" >&6; }
9384 else
9385 - echo "$as_me:$LINENO: result: no" >&5
9386 -echo "${ECHO_T}no" >&6
9387 + { echo "$as_me:$LINENO: result: no" >&5
9388 +echo "${ECHO_T}no" >&6; }
9389 fi
9390
9391 +
9392 test -n "$ac_ct_F77" && break
9393 done
9394
9395 - F77=$ac_ct_F77
9396 + if test "x$ac_ct_F77" = x; then
9397 + F77=""
9398 + else
9399 + case $cross_compiling:$ac_tool_warned in
9400 +yes:)
9401 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
9402 +whose name does not start with the host triplet. If you think this
9403 +configuration is useful to you, please write to autoconf@gnu.org." >&5
9404 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
9405 +whose name does not start with the host triplet. If you think this
9406 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
9407 +ac_tool_warned=yes ;;
9408 +esac
9409 + F77=$ac_ct_F77
9410 + fi
9411 fi
9412
9413
9414 # Provide some information about the compiler.
9415 -echo "$as_me:9593:" \
9416 - "checking for Fortran 77 compiler version" >&5
9417 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
9418 ac_compiler=`set X $ac_compile; echo $2`
9419 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
9420 - (eval $ac_compiler --version </dev/null >&5) 2>&5
9421 +{ (ac_try="$ac_compiler --version >&5"
9422 +case "(($ac_try" in
9423 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9424 + *) ac_try_echo=$ac_try;;
9425 +esac
9426 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9427 + (eval "$ac_compiler --version >&5") 2>&5
9428 ac_status=$?
9429 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9430 (exit $ac_status); }
9431 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
9432 - (eval $ac_compiler -v </dev/null >&5) 2>&5
9433 +{ (ac_try="$ac_compiler -v >&5"
9434 +case "(($ac_try" in
9435 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9436 + *) ac_try_echo=$ac_try;;
9437 +esac
9438 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9439 + (eval "$ac_compiler -v >&5") 2>&5
9440 ac_status=$?
9441 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9442 (exit $ac_status); }
9443 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
9444 - (eval $ac_compiler -V </dev/null >&5) 2>&5
9445 +{ (ac_try="$ac_compiler -V >&5"
9446 +case "(($ac_try" in
9447 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9448 + *) ac_try_echo=$ac_try;;
9449 +esac
9450 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9451 + (eval "$ac_compiler -V >&5") 2>&5
9452 ac_status=$?
9453 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9454 (exit $ac_status); }
9455 @@ -9614,8 +10152,8 @@
9456 # input file. (Note that this only needs to work for GNU compilers.)
9457 ac_save_ext=$ac_ext
9458 ac_ext=F
9459 -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
9460 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
9461 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
9462 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
9463 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
9464 echo $ECHO_N "(cached) $ECHO_C" >&6
9465 else
9466 @@ -9628,45 +10166,42 @@
9467 end
9468 _ACEOF
9469 rm -f conftest.$ac_objext
9470 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9471 - (eval $ac_compile) 2>conftest.er1
9472 +if { (ac_try="$ac_compile"
9473 +case "(($ac_try" in
9474 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9475 + *) ac_try_echo=$ac_try;;
9476 +esac
9477 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9478 + (eval "$ac_compile") 2>conftest.er1
9479 ac_status=$?
9480 grep -v '^ *+' conftest.er1 >conftest.err
9481 rm -f conftest.er1
9482 cat conftest.err >&5
9483 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9484 - (exit $ac_status); } &&
9485 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
9486 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9487 - (eval $ac_try) 2>&5
9488 - ac_status=$?
9489 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9490 - (exit $ac_status); }; } &&
9491 - { ac_try='test -s conftest.$ac_objext'
9492 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9493 - (eval $ac_try) 2>&5
9494 - ac_status=$?
9495 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9496 - (exit $ac_status); }; }; then
9497 + (exit $ac_status); } && {
9498 + test -z "$ac_f77_werror_flag" ||
9499 + test ! -s conftest.err
9500 + } && test -s conftest.$ac_objext; then
9501 ac_compiler_gnu=yes
9502 else
9503 echo "$as_me: failed program was:" >&5
9504 sed 's/^/| /' conftest.$ac_ext >&5
9505
9506 -ac_compiler_gnu=no
9507 + ac_compiler_gnu=no
9508 fi
9509 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9510 +
9511 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9512 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
9513
9514 fi
9515 -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
9516 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
9517 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
9518 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
9519 ac_ext=$ac_save_ext
9520 ac_test_FFLAGS=${FFLAGS+set}
9521 ac_save_FFLAGS=$FFLAGS
9522 FFLAGS=
9523 -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
9524 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
9525 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
9526 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
9527 if test "${ac_cv_prog_f77_g+set}" = set; then
9528 echo $ECHO_N "(cached) $ECHO_C" >&6
9529 else
9530 @@ -9677,38 +10212,35 @@
9531 end
9532 _ACEOF
9533 rm -f conftest.$ac_objext
9534 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9535 - (eval $ac_compile) 2>conftest.er1
9536 +if { (ac_try="$ac_compile"
9537 +case "(($ac_try" in
9538 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9539 + *) ac_try_echo=$ac_try;;
9540 +esac
9541 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9542 + (eval "$ac_compile") 2>conftest.er1
9543 ac_status=$?
9544 grep -v '^ *+' conftest.er1 >conftest.err
9545 rm -f conftest.er1
9546 cat conftest.err >&5
9547 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9548 - (exit $ac_status); } &&
9549 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
9550 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9551 - (eval $ac_try) 2>&5
9552 - ac_status=$?
9553 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9554 - (exit $ac_status); }; } &&
9555 - { ac_try='test -s conftest.$ac_objext'
9556 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9557 - (eval $ac_try) 2>&5
9558 - ac_status=$?
9559 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9560 - (exit $ac_status); }; }; then
9561 + (exit $ac_status); } && {
9562 + test -z "$ac_f77_werror_flag" ||
9563 + test ! -s conftest.err
9564 + } && test -s conftest.$ac_objext; then
9565 ac_cv_prog_f77_g=yes
9566 else
9567 echo "$as_me: failed program was:" >&5
9568 sed 's/^/| /' conftest.$ac_ext >&5
9569
9570 -ac_cv_prog_f77_g=no
9571 + ac_cv_prog_f77_g=no
9572 fi
9573 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9574 +
9575 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9576
9577 fi
9578 -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
9579 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
9580 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
9581 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
9582 if test "$ac_test_FFLAGS" = set; then
9583 FFLAGS=$ac_save_FFLAGS
9584 elif test $ac_cv_prog_f77_g = yes; then
9585 @@ -9737,8 +10269,8 @@
9586 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
9587
9588 # find the maximum length of command line arguments
9589 -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
9590 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
9591 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
9592 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
9593 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
9594 echo $ECHO_N "(cached) $ECHO_C" >&6
9595 else
9596 @@ -9846,19 +10378,19 @@
9597 fi
9598
9599 if test -n $lt_cv_sys_max_cmd_len ; then
9600 - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
9601 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
9602 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
9603 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
9604 else
9605 - echo "$as_me:$LINENO: result: none" >&5
9606 -echo "${ECHO_T}none" >&6
9607 + { echo "$as_me:$LINENO: result: none" >&5
9608 +echo "${ECHO_T}none" >&6; }
9609 fi
9610
9611
9612
9613
9614 # Check for command to grab the raw symbol name followed by C symbol from nm.
9615 -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
9616 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
9617 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
9618 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
9619 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
9620 echo $ECHO_N "(cached) $ECHO_C" >&6
9621 else
9622 @@ -10062,15 +10594,15 @@
9623 lt_cv_sys_global_symbol_to_cdecl=
9624 fi
9625 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
9626 - echo "$as_me:$LINENO: result: failed" >&5
9627 -echo "${ECHO_T}failed" >&6
9628 + { echo "$as_me:$LINENO: result: failed" >&5
9629 +echo "${ECHO_T}failed" >&6; }
9630 else
9631 - echo "$as_me:$LINENO: result: ok" >&5
9632 -echo "${ECHO_T}ok" >&6
9633 + { echo "$as_me:$LINENO: result: ok" >&5
9634 +echo "${ECHO_T}ok" >&6; }
9635 fi
9636
9637 -echo "$as_me:$LINENO: checking for objdir" >&5
9638 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6
9639 +{ echo "$as_me:$LINENO: checking for objdir" >&5
9640 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
9641 if test "${lt_cv_objdir+set}" = set; then
9642 echo $ECHO_N "(cached) $ECHO_C" >&6
9643 else
9644 @@ -10084,8 +10616,8 @@
9645 fi
9646 rmdir .libs 2>/dev/null
9647 fi
9648 -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
9649 -echo "${ECHO_T}$lt_cv_objdir" >&6
9650 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
9651 +echo "${ECHO_T}$lt_cv_objdir" >&6; }
9652 objdir=$lt_cv_objdir
9653
9654
9655 @@ -10136,8 +10668,8 @@
9656 if test -n "$ac_tool_prefix"; then
9657 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
9658 set dummy ${ac_tool_prefix}ar; ac_word=$2
9659 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9660 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9661 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9662 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9663 if test "${ac_cv_prog_AR+set}" = set; then
9664 echo $ECHO_N "(cached) $ECHO_C" >&6
9665 else
9666 @@ -10150,32 +10682,34 @@
9667 IFS=$as_save_IFS
9668 test -z "$as_dir" && as_dir=.
9669 for ac_exec_ext in '' $ac_executable_extensions; do
9670 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9671 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9672 ac_cv_prog_AR="${ac_tool_prefix}ar"
9673 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9674 break 2
9675 fi
9676 done
9677 done
9678 +IFS=$as_save_IFS
9679
9680 fi
9681 fi
9682 AR=$ac_cv_prog_AR
9683 if test -n "$AR"; then
9684 - echo "$as_me:$LINENO: result: $AR" >&5
9685 -echo "${ECHO_T}$AR" >&6
9686 + { echo "$as_me:$LINENO: result: $AR" >&5
9687 +echo "${ECHO_T}$AR" >&6; }
9688 else
9689 - echo "$as_me:$LINENO: result: no" >&5
9690 -echo "${ECHO_T}no" >&6
9691 + { echo "$as_me:$LINENO: result: no" >&5
9692 +echo "${ECHO_T}no" >&6; }
9693 fi
9694
9695 +
9696 fi
9697 if test -z "$ac_cv_prog_AR"; then
9698 ac_ct_AR=$AR
9699 # Extract the first word of "ar", so it can be a program name with args.
9700 set dummy ar; ac_word=$2
9701 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9702 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9703 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9704 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9705 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
9706 echo $ECHO_N "(cached) $ECHO_C" >&6
9707 else
9708 @@ -10188,27 +10722,41 @@
9709 IFS=$as_save_IFS
9710 test -z "$as_dir" && as_dir=.
9711 for ac_exec_ext in '' $ac_executable_extensions; do
9712 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9713 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9714 ac_cv_prog_ac_ct_AR="ar"
9715 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9716 break 2
9717 fi
9718 done
9719 done
9720 +IFS=$as_save_IFS
9721
9722 - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
9723 fi
9724 fi
9725 ac_ct_AR=$ac_cv_prog_ac_ct_AR
9726 if test -n "$ac_ct_AR"; then
9727 - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
9728 -echo "${ECHO_T}$ac_ct_AR" >&6
9729 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
9730 +echo "${ECHO_T}$ac_ct_AR" >&6; }
9731 else
9732 - echo "$as_me:$LINENO: result: no" >&5
9733 -echo "${ECHO_T}no" >&6
9734 + { echo "$as_me:$LINENO: result: no" >&5
9735 +echo "${ECHO_T}no" >&6; }
9736 fi
9737
9738 - AR=$ac_ct_AR
9739 + if test "x$ac_ct_AR" = x; then
9740 + AR="false"
9741 + else
9742 + case $cross_compiling:$ac_tool_warned in
9743 +yes:)
9744 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
9745 +whose name does not start with the host triplet. If you think this
9746 +configuration is useful to you, please write to autoconf@gnu.org." >&5
9747 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
9748 +whose name does not start with the host triplet. If you think this
9749 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
9750 +ac_tool_warned=yes ;;
9751 +esac
9752 + AR=$ac_ct_AR
9753 + fi
9754 else
9755 AR="$ac_cv_prog_AR"
9756 fi
9757 @@ -10216,8 +10764,8 @@
9758 if test -n "$ac_tool_prefix"; then
9759 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
9760 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
9761 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9762 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9763 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9764 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9765 if test "${ac_cv_prog_RANLIB+set}" = set; then
9766 echo $ECHO_N "(cached) $ECHO_C" >&6
9767 else
9768 @@ -10230,32 +10778,34 @@
9769 IFS=$as_save_IFS
9770 test -z "$as_dir" && as_dir=.
9771 for ac_exec_ext in '' $ac_executable_extensions; do
9772 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9773 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9774 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
9775 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9776 break 2
9777 fi
9778 done
9779 done
9780 +IFS=$as_save_IFS
9781
9782 fi
9783 fi
9784 RANLIB=$ac_cv_prog_RANLIB
9785 if test -n "$RANLIB"; then
9786 - echo "$as_me:$LINENO: result: $RANLIB" >&5
9787 -echo "${ECHO_T}$RANLIB" >&6
9788 + { echo "$as_me:$LINENO: result: $RANLIB" >&5
9789 +echo "${ECHO_T}$RANLIB" >&6; }
9790 else
9791 - echo "$as_me:$LINENO: result: no" >&5
9792 -echo "${ECHO_T}no" >&6
9793 + { echo "$as_me:$LINENO: result: no" >&5
9794 +echo "${ECHO_T}no" >&6; }
9795 fi
9796
9797 +
9798 fi
9799 if test -z "$ac_cv_prog_RANLIB"; then
9800 ac_ct_RANLIB=$RANLIB
9801 # Extract the first word of "ranlib", so it can be a program name with args.
9802 set dummy ranlib; ac_word=$2
9803 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9804 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9805 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9806 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9807 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
9808 echo $ECHO_N "(cached) $ECHO_C" >&6
9809 else
9810 @@ -10268,36 +10818,50 @@
9811 IFS=$as_save_IFS
9812 test -z "$as_dir" && as_dir=.
9813 for ac_exec_ext in '' $ac_executable_extensions; do
9814 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9815 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9816 ac_cv_prog_ac_ct_RANLIB="ranlib"
9817 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9818 break 2
9819 fi
9820 done
9821 done
9822 +IFS=$as_save_IFS
9823
9824 - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
9825 fi
9826 fi
9827 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
9828 if test -n "$ac_ct_RANLIB"; then
9829 - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
9830 -echo "${ECHO_T}$ac_ct_RANLIB" >&6
9831 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
9832 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
9833 else
9834 - echo "$as_me:$LINENO: result: no" >&5
9835 -echo "${ECHO_T}no" >&6
9836 + { echo "$as_me:$LINENO: result: no" >&5
9837 +echo "${ECHO_T}no" >&6; }
9838 fi
9839
9840 - RANLIB=$ac_ct_RANLIB
9841 -else
9842 + if test "x$ac_ct_RANLIB" = x; then
9843 + RANLIB=":"
9844 + else
9845 + case $cross_compiling:$ac_tool_warned in
9846 +yes:)
9847 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
9848 +whose name does not start with the host triplet. If you think this
9849 +configuration is useful to you, please write to autoconf@gnu.org." >&5
9850 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
9851 +whose name does not start with the host triplet. If you think this
9852 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
9853 +ac_tool_warned=yes ;;
9854 +esac
9855 + RANLIB=$ac_ct_RANLIB
9856 + fi
9857 +else
9858 RANLIB="$ac_cv_prog_RANLIB"
9859 fi
9860
9861 if test -n "$ac_tool_prefix"; then
9862 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9863 set dummy ${ac_tool_prefix}strip; ac_word=$2
9864 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9865 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9866 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9867 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9868 if test "${ac_cv_prog_STRIP+set}" = set; then
9869 echo $ECHO_N "(cached) $ECHO_C" >&6
9870 else
9871 @@ -10310,32 +10874,34 @@
9872 IFS=$as_save_IFS
9873 test -z "$as_dir" && as_dir=.
9874 for ac_exec_ext in '' $ac_executable_extensions; do
9875 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9876 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9877 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
9878 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9879 break 2
9880 fi
9881 done
9882 done
9883 +IFS=$as_save_IFS
9884
9885 fi
9886 fi
9887 STRIP=$ac_cv_prog_STRIP
9888 if test -n "$STRIP"; then
9889 - echo "$as_me:$LINENO: result: $STRIP" >&5
9890 -echo "${ECHO_T}$STRIP" >&6
9891 + { echo "$as_me:$LINENO: result: $STRIP" >&5
9892 +echo "${ECHO_T}$STRIP" >&6; }
9893 else
9894 - echo "$as_me:$LINENO: result: no" >&5
9895 -echo "${ECHO_T}no" >&6
9896 + { echo "$as_me:$LINENO: result: no" >&5
9897 +echo "${ECHO_T}no" >&6; }
9898 fi
9899
9900 +
9901 fi
9902 if test -z "$ac_cv_prog_STRIP"; then
9903 ac_ct_STRIP=$STRIP
9904 # Extract the first word of "strip", so it can be a program name with args.
9905 set dummy strip; ac_word=$2
9906 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9907 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9908 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
9909 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
9910 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
9911 echo $ECHO_N "(cached) $ECHO_C" >&6
9912 else
9913 @@ -10348,27 +10914,41 @@
9914 IFS=$as_save_IFS
9915 test -z "$as_dir" && as_dir=.
9916 for ac_exec_ext in '' $ac_executable_extensions; do
9917 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9918 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9919 ac_cv_prog_ac_ct_STRIP="strip"
9920 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9921 break 2
9922 fi
9923 done
9924 done
9925 +IFS=$as_save_IFS
9926
9927 - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
9928 fi
9929 fi
9930 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
9931 if test -n "$ac_ct_STRIP"; then
9932 - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
9933 -echo "${ECHO_T}$ac_ct_STRIP" >&6
9934 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
9935 +echo "${ECHO_T}$ac_ct_STRIP" >&6; }
9936 else
9937 - echo "$as_me:$LINENO: result: no" >&5
9938 -echo "${ECHO_T}no" >&6
9939 + { echo "$as_me:$LINENO: result: no" >&5
9940 +echo "${ECHO_T}no" >&6; }
9941 fi
9942
9943 - STRIP=$ac_ct_STRIP
9944 + if test "x$ac_ct_STRIP" = x; then
9945 + STRIP=":"
9946 + else
9947 + case $cross_compiling:$ac_tool_warned in
9948 +yes:)
9949 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
9950 +whose name does not start with the host triplet. If you think this
9951 +configuration is useful to you, please write to autoconf@gnu.org." >&5
9952 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
9953 +whose name does not start with the host triplet. If you think this
9954 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
9955 +ac_tool_warned=yes ;;
9956 +esac
9957 + STRIP=$ac_ct_STRIP
9958 + fi
9959 else
9960 STRIP="$ac_cv_prog_STRIP"
9961 fi
9962 @@ -10427,8 +11007,8 @@
9963 case $deplibs_check_method in
9964 file_magic*)
9965 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
9966 - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
9967 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
9968 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
9969 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
9970 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
9971 echo $ECHO_N "(cached) $ECHO_C" >&6
9972 else
9973 @@ -10480,17 +11060,17 @@
9974
9975 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
9976 if test -n "$MAGIC_CMD"; then
9977 - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
9978 -echo "${ECHO_T}$MAGIC_CMD" >&6
9979 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
9980 +echo "${ECHO_T}$MAGIC_CMD" >&6; }
9981 else
9982 - echo "$as_me:$LINENO: result: no" >&5
9983 -echo "${ECHO_T}no" >&6
9984 + { echo "$as_me:$LINENO: result: no" >&5
9985 +echo "${ECHO_T}no" >&6; }
9986 fi
9987
9988 if test -z "$lt_cv_path_MAGIC_CMD"; then
9989 if test -n "$ac_tool_prefix"; then
9990 - echo "$as_me:$LINENO: checking for file" >&5
9991 -echo $ECHO_N "checking for file... $ECHO_C" >&6
9992 + { echo "$as_me:$LINENO: checking for file" >&5
9993 +echo $ECHO_N "checking for file... $ECHO_C" >&6; }
9994 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
9995 echo $ECHO_N "(cached) $ECHO_C" >&6
9996 else
9997 @@ -10542,11 +11122,11 @@
9998
9999 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
10000 if test -n "$MAGIC_CMD"; then
10001 - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
10002 -echo "${ECHO_T}$MAGIC_CMD" >&6
10003 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
10004 +echo "${ECHO_T}$MAGIC_CMD" >&6; }
10005 else
10006 - echo "$as_me:$LINENO: result: no" >&5
10007 -echo "${ECHO_T}no" >&6
10008 + { echo "$as_me:$LINENO: result: no" >&5
10009 +echo "${ECHO_T}no" >&6; }
10010 fi
10011
10012 else
10013 @@ -10561,21 +11141,21 @@
10014 enable_dlopen=yes
10015 enable_win32_dll=yes
10016
10017 -# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
10018 +# Check whether --enable-libtool-lock was given.
10019 if test "${enable_libtool_lock+set}" = set; then
10020 - enableval="$enable_libtool_lock"
10021 + enableval=$enable_libtool_lock;
10022 +fi
10023
10024 -fi;
10025 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
10026
10027
10028 -# Check whether --with-pic or --without-pic was given.
10029 +# Check whether --with-pic was given.
10030 if test "${with_pic+set}" = set; then
10031 - withval="$with_pic"
10032 - pic_mode="$withval"
10033 + withval=$with_pic; pic_mode="$withval"
10034 else
10035 pic_mode=default
10036 -fi;
10037 +fi
10038 +
10039 test -z "$pic_mode" && pic_mode=default
10040
10041 # Use C for the default configuration in the libtool script
10042 @@ -10633,8 +11213,8 @@
10043 lt_prog_compiler_no_builtin_flag=' -fno-builtin'
10044
10045
10046 -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
10047 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
10048 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
10049 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
10050 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
10051 echo $ECHO_N "(cached) $ECHO_C" >&6
10052 else
10053 @@ -10651,11 +11231,11 @@
10054 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
10055 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
10056 -e 's:$: $lt_compiler_flag:'`
10057 - (eval echo "\"\$as_me:10654: $lt_compile\"" >&5)
10058 + (eval echo "\"\$as_me:11234: $lt_compile\"" >&5)
10059 (eval "$lt_compile" 2>conftest.err)
10060 ac_status=$?
10061 cat conftest.err >&5
10062 - echo "$as_me:10658: \$? = $ac_status" >&5
10063 + echo "$as_me:11238: \$? = $ac_status" >&5
10064 if (exit $ac_status) && test -s "$ac_outfile"; then
10065 # The compiler can only warn and ignore the option if not recognized
10066 # So say no if there are warnings other than the usual output.
10067 @@ -10668,8 +11248,8 @@
10068 $rm conftest*
10069
10070 fi
10071 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
10072 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
10073 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
10074 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
10075
10076 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
10077 lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
10078 @@ -10683,8 +11263,8 @@
10079 lt_prog_compiler_pic=
10080 lt_prog_compiler_static=
10081
10082 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
10083 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
10084 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
10085 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
10086
10087 if test "$GCC" = yes; then
10088 lt_prog_compiler_wl='-Wl,'
10089 @@ -10893,16 +11473,16 @@
10090 esac
10091 fi
10092
10093 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
10094 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6
10095 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
10096 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
10097
10098 #
10099 # Check to make sure the PIC flag actually works.
10100 #
10101 if test -n "$lt_prog_compiler_pic"; then
10102
10103 -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
10104 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
10105 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
10106 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
10107 if test "${lt_prog_compiler_pic_works+set}" = set; then
10108 echo $ECHO_N "(cached) $ECHO_C" >&6
10109 else
10110 @@ -10919,11 +11499,11 @@
10111 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
10112 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
10113 -e 's:$: $lt_compiler_flag:'`
10114 - (eval echo "\"\$as_me:10922: $lt_compile\"" >&5)
10115 + (eval echo "\"\$as_me:11502: $lt_compile\"" >&5)
10116 (eval "$lt_compile" 2>conftest.err)
10117 ac_status=$?
10118 cat conftest.err >&5
10119 - echo "$as_me:10926: \$? = $ac_status" >&5
10120 + echo "$as_me:11506: \$? = $ac_status" >&5
10121 if (exit $ac_status) && test -s "$ac_outfile"; then
10122 # The compiler can only warn and ignore the option if not recognized
10123 # So say no if there are warnings other than the usual output.
10124 @@ -10936,8 +11516,8 @@
10125 $rm conftest*
10126
10127 fi
10128 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
10129 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
10130 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
10131 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
10132
10133 if test x"$lt_prog_compiler_pic_works" = xyes; then
10134 case $lt_prog_compiler_pic in
10135 @@ -10964,8 +11544,8 @@
10136 # Check to make sure the static flag actually works.
10137 #
10138 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
10139 -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
10140 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
10141 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
10142 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
10143 if test "${lt_prog_compiler_static_works+set}" = set; then
10144 echo $ECHO_N "(cached) $ECHO_C" >&6
10145 else
10146 @@ -10992,8 +11572,8 @@
10147 LDFLAGS="$save_LDFLAGS"
10148
10149 fi
10150 -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
10151 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
10152 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
10153 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
10154
10155 if test x"$lt_prog_compiler_static_works" = xyes; then
10156 :
10157 @@ -11002,8 +11582,8 @@
10158 fi
10159
10160
10161 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
10162 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
10163 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
10164 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
10165 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
10166 echo $ECHO_N "(cached) $ECHO_C" >&6
10167 else
10168 @@ -11023,11 +11603,11 @@
10169 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
10170 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
10171 -e 's:$: $lt_compiler_flag:'`
10172 - (eval echo "\"\$as_me:11026: $lt_compile\"" >&5)
10173 + (eval echo "\"\$as_me:11606: $lt_compile\"" >&5)
10174 (eval "$lt_compile" 2>out/conftest.err)
10175 ac_status=$?
10176 cat out/conftest.err >&5
10177 - echo "$as_me:11030: \$? = $ac_status" >&5
10178 + echo "$as_me:11610: \$? = $ac_status" >&5
10179 if (exit $ac_status) && test -s out/conftest2.$ac_objext
10180 then
10181 # The compiler can only warn and ignore the option if not recognized
10182 @@ -11049,23 +11629,23 @@
10183 $rm conftest*
10184
10185 fi
10186 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
10187 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
10188 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
10189 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
10190
10191
10192 hard_links="nottested"
10193 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
10194 # do not overwrite the value of need_locks provided by the user
10195 - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
10196 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
10197 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
10198 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
10199 hard_links=yes
10200 $rm conftest*
10201 ln conftest.a conftest.b 2>/dev/null && hard_links=no
10202 touch conftest.a
10203 ln conftest.a conftest.b 2>&5 || hard_links=no
10204 ln conftest.a conftest.b 2>/dev/null && hard_links=no
10205 - echo "$as_me:$LINENO: result: $hard_links" >&5
10206 -echo "${ECHO_T}$hard_links" >&6
10207 + { echo "$as_me:$LINENO: result: $hard_links" >&5
10208 +echo "${ECHO_T}$hard_links" >&6; }
10209 if test "$hard_links" = no; then
10210 { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
10211 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
10212 @@ -11075,8 +11655,8 @@
10213 need_locks=no
10214 fi
10215
10216 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
10217 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
10218 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
10219 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
10220
10221 runpath_var=
10222 allow_undefined_flag=
10223 @@ -11492,26 +12072,23 @@
10224 }
10225 _ACEOF
10226 rm -f conftest.$ac_objext conftest$ac_exeext
10227 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10228 - (eval $ac_link) 2>conftest.er1
10229 +if { (ac_try="$ac_link"
10230 +case "(($ac_try" in
10231 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10232 + *) ac_try_echo=$ac_try;;
10233 +esac
10234 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10235 + (eval "$ac_link") 2>conftest.er1
10236 ac_status=$?
10237 grep -v '^ *+' conftest.er1 >conftest.err
10238 rm -f conftest.er1
10239 cat conftest.err >&5
10240 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10241 - (exit $ac_status); } &&
10242 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10243 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10244 - (eval $ac_try) 2>&5
10245 - ac_status=$?
10246 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10247 - (exit $ac_status); }; } &&
10248 - { ac_try='test -s conftest$ac_exeext'
10249 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10250 - (eval $ac_try) 2>&5
10251 - ac_status=$?
10252 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10253 - (exit $ac_status); }; }; then
10254 + (exit $ac_status); } && {
10255 + test -z "$ac_c_werror_flag" ||
10256 + test ! -s conftest.err
10257 + } && test -s conftest$ac_exeext &&
10258 + $as_test_x conftest$ac_exeext; then
10259
10260 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
10261 }'`
10262 @@ -11522,8 +12099,10 @@
10263 echo "$as_me: failed program was:" >&5
10264 sed 's/^/| /' conftest.$ac_ext >&5
10265
10266 +
10267 fi
10268 -rm -f conftest.err conftest.$ac_objext \
10269 +
10270 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10271 conftest$ac_exeext conftest.$ac_ext
10272 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10273
10274 @@ -11552,26 +12131,23 @@
10275 }
10276 _ACEOF
10277 rm -f conftest.$ac_objext conftest$ac_exeext
10278 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10279 - (eval $ac_link) 2>conftest.er1
10280 +if { (ac_try="$ac_link"
10281 +case "(($ac_try" in
10282 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10283 + *) ac_try_echo=$ac_try;;
10284 +esac
10285 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10286 + (eval "$ac_link") 2>conftest.er1
10287 ac_status=$?
10288 grep -v '^ *+' conftest.er1 >conftest.err
10289 rm -f conftest.er1
10290 cat conftest.err >&5
10291 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10292 - (exit $ac_status); } &&
10293 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10294 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10295 - (eval $ac_try) 2>&5
10296 - ac_status=$?
10297 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10298 - (exit $ac_status); }; } &&
10299 - { ac_try='test -s conftest$ac_exeext'
10300 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10301 - (eval $ac_try) 2>&5
10302 - ac_status=$?
10303 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10304 - (exit $ac_status); }; }; then
10305 + (exit $ac_status); } && {
10306 + test -z "$ac_c_werror_flag" ||
10307 + test ! -s conftest.err
10308 + } && test -s conftest$ac_exeext &&
10309 + $as_test_x conftest$ac_exeext; then
10310
10311 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
10312 }'`
10313 @@ -11582,8 +12158,10 @@
10314 echo "$as_me: failed program was:" >&5
10315 sed 's/^/| /' conftest.$ac_ext >&5
10316
10317 +
10318 fi
10319 -rm -f conftest.err conftest.$ac_objext \
10320 +
10321 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10322 conftest$ac_exeext conftest.$ac_ext
10323 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10324
10325 @@ -12041,8 +12619,8 @@
10326 esac
10327 fi
10328
10329 -echo "$as_me:$LINENO: result: $ld_shlibs" >&5
10330 -echo "${ECHO_T}$ld_shlibs" >&6
10331 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
10332 +echo "${ECHO_T}$ld_shlibs" >&6; }
10333 test "$ld_shlibs" = no && can_build_shared=no
10334
10335 #
10336 @@ -12062,8 +12640,8 @@
10337 # Test whether the compiler implicitly links with -lc since on some
10338 # systems, -lgcc has to come before -lc. If gcc already passes -lc
10339 # to ld, don't add -lc before -lgcc.
10340 - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
10341 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
10342 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
10343 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
10344 $rm conftest*
10345 printf "$lt_simple_compile_test_code" > conftest.$ac_ext
10346
10347 @@ -12100,16 +12678,16 @@
10348 cat conftest.err 1>&5
10349 fi
10350 $rm conftest*
10351 - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
10352 -echo "${ECHO_T}$archive_cmds_need_lc" >&6
10353 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
10354 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
10355 ;;
10356 esac
10357 fi
10358 ;;
10359 esac
10360
10361 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
10362 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
10363 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
10364 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
10365 library_names_spec=
10366 libname_spec='lib$name'
10367 soname_spec=
10368 @@ -12708,8 +13286,8 @@
10369 dynamic_linker=no
10370 ;;
10371 esac
10372 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
10373 -echo "${ECHO_T}$dynamic_linker" >&6
10374 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
10375 +echo "${ECHO_T}$dynamic_linker" >&6; }
10376 test "$dynamic_linker" = no && can_build_shared=no
10377
10378 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
10379 @@ -12717,8 +13295,8 @@
10380 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
10381 fi
10382
10383 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
10384 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
10385 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
10386 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
10387 hardcode_action=
10388 if test -n "$hardcode_libdir_flag_spec" || \
10389 test -n "$runpath_var" || \
10390 @@ -12742,8 +13320,8 @@
10391 # directories.
10392 hardcode_action=unsupported
10393 fi
10394 -echo "$as_me:$LINENO: result: $hardcode_action" >&5
10395 -echo "${ECHO_T}$hardcode_action" >&6
10396 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
10397 +echo "${ECHO_T}$hardcode_action" >&6; }
10398
10399 if test "$hardcode_action" = relink; then
10400 # Fast installation is not supported
10401 @@ -12756,29 +13334,29 @@
10402
10403 striplib=
10404 old_striplib=
10405 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
10406 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
10407 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
10408 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
10409 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
10410 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
10411 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
10412 - echo "$as_me:$LINENO: result: yes" >&5
10413 -echo "${ECHO_T}yes" >&6
10414 + { echo "$as_me:$LINENO: result: yes" >&5
10415 +echo "${ECHO_T}yes" >&6; }
10416 else
10417 # FIXME - insert some real tests, host_os isn't really good enough
10418 case $host_os in
10419 darwin*)
10420 if test -n "$STRIP" ; then
10421 striplib="$STRIP -x"
10422 - echo "$as_me:$LINENO: result: yes" >&5
10423 -echo "${ECHO_T}yes" >&6
10424 + { echo "$as_me:$LINENO: result: yes" >&5
10425 +echo "${ECHO_T}yes" >&6; }
10426 else
10427 - echo "$as_me:$LINENO: result: no" >&5
10428 -echo "${ECHO_T}no" >&6
10429 + { echo "$as_me:$LINENO: result: no" >&5
10430 +echo "${ECHO_T}no" >&6; }
10431 fi
10432 ;;
10433 *)
10434 - echo "$as_me:$LINENO: result: no" >&5
10435 -echo "${ECHO_T}no" >&6
10436 + { echo "$as_me:$LINENO: result: no" >&5
10437 +echo "${ECHO_T}no" >&6; }
10438 ;;
10439 esac
10440 fi
10441 @@ -12810,8 +13388,8 @@
10442
10443 darwin*)
10444 # if libdl is installed we need to link against it
10445 - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
10446 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
10447 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
10448 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
10449 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
10450 echo $ECHO_N "(cached) $ECHO_C" >&6
10451 else
10452 @@ -12824,55 +13402,53 @@
10453 cat >>conftest.$ac_ext <<_ACEOF
10454 /* end confdefs.h. */
10455
10456 -/* Override any gcc2 internal prototype to avoid an error. */
10457 +/* Override any GCC internal prototype to avoid an error.
10458 + Use char because int might match the return type of a GCC
10459 + builtin and then its argument prototype would still apply. */
10460 #ifdef __cplusplus
10461 extern "C"
10462 #endif
10463 -/* We use char because int might match the return type of a gcc2
10464 - builtin and then its argument prototype would still apply. */
10465 char dlopen ();
10466 int
10467 main ()
10468 {
10469 -dlopen ();
10470 +return dlopen ();
10471 ;
10472 return 0;
10473 }
10474 _ACEOF
10475 rm -f conftest.$ac_objext conftest$ac_exeext
10476 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10477 - (eval $ac_link) 2>conftest.er1
10478 +if { (ac_try="$ac_link"
10479 +case "(($ac_try" in
10480 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10481 + *) ac_try_echo=$ac_try;;
10482 +esac
10483 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10484 + (eval "$ac_link") 2>conftest.er1
10485 ac_status=$?
10486 grep -v '^ *+' conftest.er1 >conftest.err
10487 rm -f conftest.er1
10488 cat conftest.err >&5
10489 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10490 - (exit $ac_status); } &&
10491 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10492 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10493 - (eval $ac_try) 2>&5
10494 - ac_status=$?
10495 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10496 - (exit $ac_status); }; } &&
10497 - { ac_try='test -s conftest$ac_exeext'
10498 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10499 - (eval $ac_try) 2>&5
10500 - ac_status=$?
10501 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10502 - (exit $ac_status); }; }; then
10503 + (exit $ac_status); } && {
10504 + test -z "$ac_c_werror_flag" ||
10505 + test ! -s conftest.err
10506 + } && test -s conftest$ac_exeext &&
10507 + $as_test_x conftest$ac_exeext; then
10508 ac_cv_lib_dl_dlopen=yes
10509 else
10510 echo "$as_me: failed program was:" >&5
10511 sed 's/^/| /' conftest.$ac_ext >&5
10512
10513 -ac_cv_lib_dl_dlopen=no
10514 + ac_cv_lib_dl_dlopen=no
10515 fi
10516 -rm -f conftest.err conftest.$ac_objext \
10517 +
10518 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10519 conftest$ac_exeext conftest.$ac_ext
10520 LIBS=$ac_check_lib_save_LIBS
10521 fi
10522 -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
10523 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
10524 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
10525 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
10526 if test $ac_cv_lib_dl_dlopen = yes; then
10527 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
10528 else
10529 @@ -12886,8 +13462,8 @@
10530 ;;
10531
10532 *)
10533 - echo "$as_me:$LINENO: checking for shl_load" >&5
10534 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
10535 + { echo "$as_me:$LINENO: checking for shl_load" >&5
10536 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
10537 if test "${ac_cv_func_shl_load+set}" = set; then
10538 echo $ECHO_N "(cached) $ECHO_C" >&6
10539 else
10540 @@ -12914,72 +13490,64 @@
10541
10542 #undef shl_load
10543
10544 -/* Override any gcc2 internal prototype to avoid an error. */
10545 +/* Override any GCC internal prototype to avoid an error.
10546 + Use char because int might match the return type of a GCC
10547 + builtin and then its argument prototype would still apply. */
10548 #ifdef __cplusplus
10549 extern "C"
10550 -{
10551 #endif
10552 -/* We use char because int might match the return type of a gcc2
10553 - builtin and then its argument prototype would still apply. */
10554 char shl_load ();
10555 /* The GNU C library defines this for functions which it implements
10556 to always fail with ENOSYS. Some functions are actually named
10557 something starting with __ and the normal name is an alias. */
10558 -#if defined (__stub_shl_load) || defined (__stub___shl_load)
10559 +#if defined __stub_shl_load || defined __stub___shl_load
10560 choke me
10561 -#else
10562 -char (*f) () = shl_load;
10563 -#endif
10564 -#ifdef __cplusplus
10565 -}
10566 #endif
10567
10568 int
10569 main ()
10570 {
10571 -return f != shl_load;
10572 +return shl_load ();
10573 ;
10574 return 0;
10575 }
10576 _ACEOF
10577 rm -f conftest.$ac_objext conftest$ac_exeext
10578 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10579 - (eval $ac_link) 2>conftest.er1
10580 +if { (ac_try="$ac_link"
10581 +case "(($ac_try" in
10582 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10583 + *) ac_try_echo=$ac_try;;
10584 +esac
10585 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10586 + (eval "$ac_link") 2>conftest.er1
10587 ac_status=$?
10588 grep -v '^ *+' conftest.er1 >conftest.err
10589 rm -f conftest.er1
10590 cat conftest.err >&5
10591 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10592 - (exit $ac_status); } &&
10593 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10594 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10595 - (eval $ac_try) 2>&5
10596 - ac_status=$?
10597 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10598 - (exit $ac_status); }; } &&
10599 - { ac_try='test -s conftest$ac_exeext'
10600 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10601 - (eval $ac_try) 2>&5
10602 - ac_status=$?
10603 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10604 - (exit $ac_status); }; }; then
10605 + (exit $ac_status); } && {
10606 + test -z "$ac_c_werror_flag" ||
10607 + test ! -s conftest.err
10608 + } && test -s conftest$ac_exeext &&
10609 + $as_test_x conftest$ac_exeext; then
10610 ac_cv_func_shl_load=yes
10611 else
10612 echo "$as_me: failed program was:" >&5
10613 sed 's/^/| /' conftest.$ac_ext >&5
10614
10615 -ac_cv_func_shl_load=no
10616 + ac_cv_func_shl_load=no
10617 fi
10618 -rm -f conftest.err conftest.$ac_objext \
10619 +
10620 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10621 conftest$ac_exeext conftest.$ac_ext
10622 fi
10623 -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
10624 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6
10625 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
10626 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
10627 if test $ac_cv_func_shl_load = yes; then
10628 lt_cv_dlopen="shl_load"
10629 else
10630 - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
10631 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
10632 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
10633 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
10634 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
10635 echo $ECHO_N "(cached) $ECHO_C" >&6
10636 else
10637 @@ -12992,60 +13560,58 @@
10638 cat >>conftest.$ac_ext <<_ACEOF
10639 /* end confdefs.h. */
10640
10641 -/* Override any gcc2 internal prototype to avoid an error. */
10642 +/* Override any GCC internal prototype to avoid an error.
10643 + Use char because int might match the return type of a GCC
10644 + builtin and then its argument prototype would still apply. */
10645 #ifdef __cplusplus
10646 extern "C"
10647 #endif
10648 -/* We use char because int might match the return type of a gcc2
10649 - builtin and then its argument prototype would still apply. */
10650 char shl_load ();
10651 int
10652 main ()
10653 {
10654 -shl_load ();
10655 +return shl_load ();
10656 ;
10657 return 0;
10658 }
10659 _ACEOF
10660 rm -f conftest.$ac_objext conftest$ac_exeext
10661 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10662 - (eval $ac_link) 2>conftest.er1
10663 +if { (ac_try="$ac_link"
10664 +case "(($ac_try" in
10665 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10666 + *) ac_try_echo=$ac_try;;
10667 +esac
10668 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10669 + (eval "$ac_link") 2>conftest.er1
10670 ac_status=$?
10671 grep -v '^ *+' conftest.er1 >conftest.err
10672 rm -f conftest.er1
10673 cat conftest.err >&5
10674 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10675 - (exit $ac_status); } &&
10676 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10677 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10678 - (eval $ac_try) 2>&5
10679 - ac_status=$?
10680 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10681 - (exit $ac_status); }; } &&
10682 - { ac_try='test -s conftest$ac_exeext'
10683 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10684 - (eval $ac_try) 2>&5
10685 - ac_status=$?
10686 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10687 - (exit $ac_status); }; }; then
10688 + (exit $ac_status); } && {
10689 + test -z "$ac_c_werror_flag" ||
10690 + test ! -s conftest.err
10691 + } && test -s conftest$ac_exeext &&
10692 + $as_test_x conftest$ac_exeext; then
10693 ac_cv_lib_dld_shl_load=yes
10694 else
10695 echo "$as_me: failed program was:" >&5
10696 sed 's/^/| /' conftest.$ac_ext >&5
10697
10698 -ac_cv_lib_dld_shl_load=no
10699 + ac_cv_lib_dld_shl_load=no
10700 fi
10701 -rm -f conftest.err conftest.$ac_objext \
10702 +
10703 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10704 conftest$ac_exeext conftest.$ac_ext
10705 LIBS=$ac_check_lib_save_LIBS
10706 fi
10707 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
10708 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
10709 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
10710 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
10711 if test $ac_cv_lib_dld_shl_load = yes; then
10712 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
10713 else
10714 - echo "$as_me:$LINENO: checking for dlopen" >&5
10715 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
10716 + { echo "$as_me:$LINENO: checking for dlopen" >&5
10717 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
10718 if test "${ac_cv_func_dlopen+set}" = set; then
10719 echo $ECHO_N "(cached) $ECHO_C" >&6
10720 else
10721 @@ -13072,72 +13638,64 @@
10722
10723 #undef dlopen
10724
10725 -/* Override any gcc2 internal prototype to avoid an error. */
10726 +/* Override any GCC internal prototype to avoid an error.
10727 + Use char because int might match the return type of a GCC
10728 + builtin and then its argument prototype would still apply. */
10729 #ifdef __cplusplus
10730 extern "C"
10731 -{
10732 #endif
10733 -/* We use char because int might match the return type of a gcc2
10734 - builtin and then its argument prototype would still apply. */
10735 char dlopen ();
10736 /* The GNU C library defines this for functions which it implements
10737 to always fail with ENOSYS. Some functions are actually named
10738 something starting with __ and the normal name is an alias. */
10739 -#if defined (__stub_dlopen) || defined (__stub___dlopen)
10740 +#if defined __stub_dlopen || defined __stub___dlopen
10741 choke me
10742 -#else
10743 -char (*f) () = dlopen;
10744 -#endif
10745 -#ifdef __cplusplus
10746 -}
10747 #endif
10748
10749 int
10750 main ()
10751 {
10752 -return f != dlopen;
10753 +return dlopen ();
10754 ;
10755 return 0;
10756 }
10757 _ACEOF
10758 rm -f conftest.$ac_objext conftest$ac_exeext
10759 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10760 - (eval $ac_link) 2>conftest.er1
10761 +if { (ac_try="$ac_link"
10762 +case "(($ac_try" in
10763 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10764 + *) ac_try_echo=$ac_try;;
10765 +esac
10766 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10767 + (eval "$ac_link") 2>conftest.er1
10768 ac_status=$?
10769 grep -v '^ *+' conftest.er1 >conftest.err
10770 rm -f conftest.er1
10771 cat conftest.err >&5
10772 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10773 - (exit $ac_status); } &&
10774 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10775 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10776 - (eval $ac_try) 2>&5
10777 - ac_status=$?
10778 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10779 - (exit $ac_status); }; } &&
10780 - { ac_try='test -s conftest$ac_exeext'
10781 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10782 - (eval $ac_try) 2>&5
10783 - ac_status=$?
10784 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10785 - (exit $ac_status); }; }; then
10786 + (exit $ac_status); } && {
10787 + test -z "$ac_c_werror_flag" ||
10788 + test ! -s conftest.err
10789 + } && test -s conftest$ac_exeext &&
10790 + $as_test_x conftest$ac_exeext; then
10791 ac_cv_func_dlopen=yes
10792 else
10793 echo "$as_me: failed program was:" >&5
10794 sed 's/^/| /' conftest.$ac_ext >&5
10795
10796 -ac_cv_func_dlopen=no
10797 + ac_cv_func_dlopen=no
10798 fi
10799 -rm -f conftest.err conftest.$ac_objext \
10800 +
10801 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10802 conftest$ac_exeext conftest.$ac_ext
10803 fi
10804 -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
10805 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6
10806 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
10807 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
10808 if test $ac_cv_func_dlopen = yes; then
10809 lt_cv_dlopen="dlopen"
10810 else
10811 - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
10812 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
10813 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
10814 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
10815 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
10816 echo $ECHO_N "(cached) $ECHO_C" >&6
10817 else
10818 @@ -13150,60 +13708,58 @@
10819 cat >>conftest.$ac_ext <<_ACEOF
10820 /* end confdefs.h. */
10821
10822 -/* Override any gcc2 internal prototype to avoid an error. */
10823 +/* Override any GCC internal prototype to avoid an error.
10824 + Use char because int might match the return type of a GCC
10825 + builtin and then its argument prototype would still apply. */
10826 #ifdef __cplusplus
10827 extern "C"
10828 #endif
10829 -/* We use char because int might match the return type of a gcc2
10830 - builtin and then its argument prototype would still apply. */
10831 char dlopen ();
10832 int
10833 main ()
10834 {
10835 -dlopen ();
10836 +return dlopen ();
10837 ;
10838 return 0;
10839 }
10840 _ACEOF
10841 rm -f conftest.$ac_objext conftest$ac_exeext
10842 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10843 - (eval $ac_link) 2>conftest.er1
10844 +if { (ac_try="$ac_link"
10845 +case "(($ac_try" in
10846 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10847 + *) ac_try_echo=$ac_try;;
10848 +esac
10849 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10850 + (eval "$ac_link") 2>conftest.er1
10851 ac_status=$?
10852 grep -v '^ *+' conftest.er1 >conftest.err
10853 rm -f conftest.er1
10854 cat conftest.err >&5
10855 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10856 - (exit $ac_status); } &&
10857 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10858 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10859 - (eval $ac_try) 2>&5
10860 - ac_status=$?
10861 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10862 - (exit $ac_status); }; } &&
10863 - { ac_try='test -s conftest$ac_exeext'
10864 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10865 - (eval $ac_try) 2>&5
10866 - ac_status=$?
10867 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10868 - (exit $ac_status); }; }; then
10869 + (exit $ac_status); } && {
10870 + test -z "$ac_c_werror_flag" ||
10871 + test ! -s conftest.err
10872 + } && test -s conftest$ac_exeext &&
10873 + $as_test_x conftest$ac_exeext; then
10874 ac_cv_lib_dl_dlopen=yes
10875 else
10876 echo "$as_me: failed program was:" >&5
10877 sed 's/^/| /' conftest.$ac_ext >&5
10878
10879 -ac_cv_lib_dl_dlopen=no
10880 + ac_cv_lib_dl_dlopen=no
10881 fi
10882 -rm -f conftest.err conftest.$ac_objext \
10883 +
10884 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10885 conftest$ac_exeext conftest.$ac_ext
10886 LIBS=$ac_check_lib_save_LIBS
10887 fi
10888 -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
10889 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
10890 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
10891 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
10892 if test $ac_cv_lib_dl_dlopen = yes; then
10893 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
10894 else
10895 - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
10896 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
10897 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
10898 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
10899 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
10900 echo $ECHO_N "(cached) $ECHO_C" >&6
10901 else
10902 @@ -13216,60 +13772,58 @@
10903 cat >>conftest.$ac_ext <<_ACEOF
10904 /* end confdefs.h. */
10905
10906 -/* Override any gcc2 internal prototype to avoid an error. */
10907 +/* Override any GCC internal prototype to avoid an error.
10908 + Use char because int might match the return type of a GCC
10909 + builtin and then its argument prototype would still apply. */
10910 #ifdef __cplusplus
10911 extern "C"
10912 #endif
10913 -/* We use char because int might match the return type of a gcc2
10914 - builtin and then its argument prototype would still apply. */
10915 char dlopen ();
10916 int
10917 main ()
10918 {
10919 -dlopen ();
10920 +return dlopen ();
10921 ;
10922 return 0;
10923 }
10924 _ACEOF
10925 rm -f conftest.$ac_objext conftest$ac_exeext
10926 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10927 - (eval $ac_link) 2>conftest.er1
10928 +if { (ac_try="$ac_link"
10929 +case "(($ac_try" in
10930 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10931 + *) ac_try_echo=$ac_try;;
10932 +esac
10933 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10934 + (eval "$ac_link") 2>conftest.er1
10935 ac_status=$?
10936 grep -v '^ *+' conftest.er1 >conftest.err
10937 rm -f conftest.er1
10938 cat conftest.err >&5
10939 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10940 - (exit $ac_status); } &&
10941 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10942 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10943 - (eval $ac_try) 2>&5
10944 - ac_status=$?
10945 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10946 - (exit $ac_status); }; } &&
10947 - { ac_try='test -s conftest$ac_exeext'
10948 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10949 - (eval $ac_try) 2>&5
10950 - ac_status=$?
10951 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10952 - (exit $ac_status); }; }; then
10953 + (exit $ac_status); } && {
10954 + test -z "$ac_c_werror_flag" ||
10955 + test ! -s conftest.err
10956 + } && test -s conftest$ac_exeext &&
10957 + $as_test_x conftest$ac_exeext; then
10958 ac_cv_lib_svld_dlopen=yes
10959 else
10960 echo "$as_me: failed program was:" >&5
10961 sed 's/^/| /' conftest.$ac_ext >&5
10962
10963 -ac_cv_lib_svld_dlopen=no
10964 + ac_cv_lib_svld_dlopen=no
10965 fi
10966 -rm -f conftest.err conftest.$ac_objext \
10967 +
10968 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10969 conftest$ac_exeext conftest.$ac_ext
10970 LIBS=$ac_check_lib_save_LIBS
10971 fi
10972 -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
10973 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
10974 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
10975 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
10976 if test $ac_cv_lib_svld_dlopen = yes; then
10977 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
10978 else
10979 - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
10980 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
10981 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
10982 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
10983 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
10984 echo $ECHO_N "(cached) $ECHO_C" >&6
10985 else
10986 @@ -13282,55 +13836,53 @@
10987 cat >>conftest.$ac_ext <<_ACEOF
10988 /* end confdefs.h. */
10989
10990 -/* Override any gcc2 internal prototype to avoid an error. */
10991 +/* Override any GCC internal prototype to avoid an error.
10992 + Use char because int might match the return type of a GCC
10993 + builtin and then its argument prototype would still apply. */
10994 #ifdef __cplusplus
10995 extern "C"
10996 #endif
10997 -/* We use char because int might match the return type of a gcc2
10998 - builtin and then its argument prototype would still apply. */
10999 char dld_link ();
11000 int
11001 main ()
11002 {
11003 -dld_link ();
11004 +return dld_link ();
11005 ;
11006 return 0;
11007 }
11008 _ACEOF
11009 rm -f conftest.$ac_objext conftest$ac_exeext
11010 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11011 - (eval $ac_link) 2>conftest.er1
11012 +if { (ac_try="$ac_link"
11013 +case "(($ac_try" in
11014 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11015 + *) ac_try_echo=$ac_try;;
11016 +esac
11017 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11018 + (eval "$ac_link") 2>conftest.er1
11019 ac_status=$?
11020 grep -v '^ *+' conftest.er1 >conftest.err
11021 rm -f conftest.er1
11022 cat conftest.err >&5
11023 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11024 - (exit $ac_status); } &&
11025 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11026 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11027 - (eval $ac_try) 2>&5
11028 - ac_status=$?
11029 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11030 - (exit $ac_status); }; } &&
11031 - { ac_try='test -s conftest$ac_exeext'
11032 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11033 - (eval $ac_try) 2>&5
11034 - ac_status=$?
11035 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11036 - (exit $ac_status); }; }; then
11037 + (exit $ac_status); } && {
11038 + test -z "$ac_c_werror_flag" ||
11039 + test ! -s conftest.err
11040 + } && test -s conftest$ac_exeext &&
11041 + $as_test_x conftest$ac_exeext; then
11042 ac_cv_lib_dld_dld_link=yes
11043 else
11044 echo "$as_me: failed program was:" >&5
11045 sed 's/^/| /' conftest.$ac_ext >&5
11046
11047 -ac_cv_lib_dld_dld_link=no
11048 + ac_cv_lib_dld_dld_link=no
11049 fi
11050 -rm -f conftest.err conftest.$ac_objext \
11051 +
11052 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11053 conftest$ac_exeext conftest.$ac_ext
11054 LIBS=$ac_check_lib_save_LIBS
11055 fi
11056 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
11057 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
11058 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
11059 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
11060 if test $ac_cv_lib_dld_dld_link = yes; then
11061 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
11062 fi
11063 @@ -13370,8 +13922,8 @@
11064 save_LIBS="$LIBS"
11065 LIBS="$lt_cv_dlopen_libs $LIBS"
11066
11067 - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
11068 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
11069 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
11070 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
11071 if test "${lt_cv_dlopen_self+set}" = set; then
11072 echo $ECHO_N "(cached) $ECHO_C" >&6
11073 else
11074 @@ -13381,7 +13933,7 @@
11075 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11076 lt_status=$lt_dlunknown
11077 cat > conftest.$ac_ext <<EOF
11078 -#line 13384 "configure"
11079 +#line 13936 "configure"
11080 #include "confdefs.h"
11081
11082 #if HAVE_DLFCN_H
11083 @@ -13465,13 +14017,13 @@
11084
11085
11086 fi
11087 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
11088 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
11089 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
11090 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
11091
11092 if test "x$lt_cv_dlopen_self" = xyes; then
11093 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
11094 - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
11095 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
11096 + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
11097 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
11098 if test "${lt_cv_dlopen_self_static+set}" = set; then
11099 echo $ECHO_N "(cached) $ECHO_C" >&6
11100 else
11101 @@ -13481,7 +14033,7 @@
11102 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11103 lt_status=$lt_dlunknown
11104 cat > conftest.$ac_ext <<EOF
11105 -#line 13484 "configure"
11106 +#line 14036 "configure"
11107 #include "confdefs.h"
11108
11109 #if HAVE_DLFCN_H
11110 @@ -13565,8 +14117,8 @@
11111
11112
11113 fi
11114 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
11115 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
11116 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
11117 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
11118 fi
11119
11120 CPPFLAGS="$save_CPPFLAGS"
11121 @@ -13588,13 +14140,13 @@
11122
11123
11124 # Report which library types will actually be built
11125 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
11126 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
11127 -echo "$as_me:$LINENO: result: $can_build_shared" >&5
11128 -echo "${ECHO_T}$can_build_shared" >&6
11129 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
11130 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
11131 +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
11132 +echo "${ECHO_T}$can_build_shared" >&6; }
11133
11134 -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
11135 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
11136 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
11137 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
11138 test "$can_build_shared" = "no" && enable_shared=no
11139
11140 # On AIX, shared libraries and static libraries use the same namespace, and
11141 @@ -13614,15 +14166,15 @@
11142 fi
11143 ;;
11144 esac
11145 -echo "$as_me:$LINENO: result: $enable_shared" >&5
11146 -echo "${ECHO_T}$enable_shared" >&6
11147 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5
11148 +echo "${ECHO_T}$enable_shared" >&6; }
11149
11150 -echo "$as_me:$LINENO: checking whether to build static libraries" >&5
11151 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
11152 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
11153 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
11154 # Make sure either enable_shared or enable_static is yes.
11155 test "$enable_shared" = yes || enable_static=yes
11156 -echo "$as_me:$LINENO: result: $enable_static" >&5
11157 -echo "${ECHO_T}$enable_static" >&6
11158 +{ echo "$as_me:$LINENO: result: $enable_static" >&5
11159 +echo "${ECHO_T}$enable_static" >&6; }
11160
11161 # The else clause should only fire when bootstrapping the
11162 # libtool distribution, otherwise you forgot to ship ltmain.sh
11163 @@ -14114,11 +14666,11 @@
11164 CC="$lt_save_CC"
11165
11166
11167 -# Check whether --with-tags or --without-tags was given.
11168 +# Check whether --with-tags was given.
11169 if test "${with_tags+set}" = set; then
11170 - withval="$with_tags"
11171 - tagnames="$withval"
11172 -fi;
11173 + withval=$with_tags; tagnames="$withval"
11174 +fi
11175 +
11176
11177 if test -f "$ltmain" && test -n "$tagnames"; then
11178 if test ! -f "${ofile}"; then
11179 @@ -14172,7 +14724,7 @@
11180 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11181 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11182 (test "X$CXX" != "Xg++"))) ; then
11183 - ac_ext=cc
11184 + ac_ext=cpp
11185 ac_cpp='$CXXCPP $CPPFLAGS'
11186 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11187 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11188 @@ -14291,18 +14843,18 @@
11189 # Set up default GNU C++ configuration
11190
11191
11192 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
11193 +# Check whether --with-gnu-ld was given.
11194 if test "${with_gnu_ld+set}" = set; then
11195 - withval="$with_gnu_ld"
11196 - test "$withval" = no || with_gnu_ld=yes
11197 + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
11198 else
11199 with_gnu_ld=no
11200 -fi;
11201 +fi
11202 +
11203 ac_prog=ld
11204 if test "$GCC" = yes; then
11205 # Check if gcc -print-prog-name=ld gives a path.
11206 - echo "$as_me:$LINENO: checking for ld used by $CC" >&5
11207 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
11208 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
11209 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
11210 case $host in
11211 *-*-mingw*)
11212 # gcc leaves a trailing carriage return which upsets mingw
11213 @@ -14331,11 +14883,11 @@
11214 ;;
11215 esac
11216 elif test "$with_gnu_ld" = yes; then
11217 - echo "$as_me:$LINENO: checking for GNU ld" >&5
11218 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
11219 + { echo "$as_me:$LINENO: checking for GNU ld" >&5
11220 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
11221 else
11222 - echo "$as_me:$LINENO: checking for non-GNU ld" >&5
11223 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
11224 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
11225 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
11226 fi
11227 if test "${lt_cv_path_LD+set}" = set; then
11228 echo $ECHO_N "(cached) $ECHO_C" >&6
11229 @@ -14368,17 +14920,17 @@
11230
11231 LD="$lt_cv_path_LD"
11232 if test -n "$LD"; then
11233 - echo "$as_me:$LINENO: result: $LD" >&5
11234 -echo "${ECHO_T}$LD" >&6
11235 + { echo "$as_me:$LINENO: result: $LD" >&5
11236 +echo "${ECHO_T}$LD" >&6; }
11237 else
11238 - echo "$as_me:$LINENO: result: no" >&5
11239 -echo "${ECHO_T}no" >&6
11240 + { echo "$as_me:$LINENO: result: no" >&5
11241 +echo "${ECHO_T}no" >&6; }
11242 fi
11243 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
11244 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
11245 { (exit 1); exit 1; }; }
11246 -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
11247 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
11248 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
11249 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
11250 if test "${lt_cv_prog_gnu_ld+set}" = set; then
11251 echo $ECHO_N "(cached) $ECHO_C" >&6
11252 else
11253 @@ -14392,8 +14944,8 @@
11254 ;;
11255 esac
11256 fi
11257 -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
11258 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
11259 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
11260 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
11261 with_gnu_ld=$lt_cv_prog_gnu_ld
11262
11263
11264 @@ -14443,8 +14995,8 @@
11265 fi
11266
11267 # PORTME: fill in a description of your system's C++ link characteristics
11268 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11269 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
11270 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11271 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
11272 ld_shlibs_CXX=yes
11273 case $host_os in
11274 aix3*)
11275 @@ -14556,26 +15108,23 @@
11276 }
11277 _ACEOF
11278 rm -f conftest.$ac_objext conftest$ac_exeext
11279 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11280 - (eval $ac_link) 2>conftest.er1
11281 +if { (ac_try="$ac_link"
11282 +case "(($ac_try" in
11283 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11284 + *) ac_try_echo=$ac_try;;
11285 +esac
11286 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11287 + (eval "$ac_link") 2>conftest.er1
11288 ac_status=$?
11289 grep -v '^ *+' conftest.er1 >conftest.err
11290 rm -f conftest.er1
11291 cat conftest.err >&5
11292 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11293 - (exit $ac_status); } &&
11294 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
11295 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11296 - (eval $ac_try) 2>&5
11297 - ac_status=$?
11298 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11299 - (exit $ac_status); }; } &&
11300 - { ac_try='test -s conftest$ac_exeext'
11301 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11302 - (eval $ac_try) 2>&5
11303 - ac_status=$?
11304 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11305 - (exit $ac_status); }; }; then
11306 + (exit $ac_status); } && {
11307 + test -z "$ac_cxx_werror_flag" ||
11308 + test ! -s conftest.err
11309 + } && test -s conftest$ac_exeext &&
11310 + $as_test_x conftest$ac_exeext; then
11311
11312 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
11313 }'`
11314 @@ -14586,8 +15135,10 @@
11315 echo "$as_me: failed program was:" >&5
11316 sed 's/^/| /' conftest.$ac_ext >&5
11317
11318 +
11319 fi
11320 -rm -f conftest.err conftest.$ac_objext \
11321 +
11322 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11323 conftest$ac_exeext conftest.$ac_ext
11324 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11325
11326 @@ -14617,26 +15168,23 @@
11327 }
11328 _ACEOF
11329 rm -f conftest.$ac_objext conftest$ac_exeext
11330 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11331 - (eval $ac_link) 2>conftest.er1
11332 +if { (ac_try="$ac_link"
11333 +case "(($ac_try" in
11334 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11335 + *) ac_try_echo=$ac_try;;
11336 +esac
11337 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11338 + (eval "$ac_link") 2>conftest.er1
11339 ac_status=$?
11340 grep -v '^ *+' conftest.er1 >conftest.err
11341 rm -f conftest.er1
11342 cat conftest.err >&5
11343 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11344 - (exit $ac_status); } &&
11345 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
11346 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11347 - (eval $ac_try) 2>&5
11348 - ac_status=$?
11349 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11350 - (exit $ac_status); }; } &&
11351 - { ac_try='test -s conftest$ac_exeext'
11352 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11353 - (eval $ac_try) 2>&5
11354 - ac_status=$?
11355 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11356 - (exit $ac_status); }; }; then
11357 + (exit $ac_status); } && {
11358 + test -z "$ac_cxx_werror_flag" ||
11359 + test ! -s conftest.err
11360 + } && test -s conftest$ac_exeext &&
11361 + $as_test_x conftest$ac_exeext; then
11362
11363 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
11364 }'`
11365 @@ -14647,8 +15195,10 @@
11366 echo "$as_me: failed program was:" >&5
11367 sed 's/^/| /' conftest.$ac_ext >&5
11368
11369 +
11370 fi
11371 -rm -f conftest.err conftest.$ac_objext \
11372 +
11373 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11374 conftest$ac_exeext conftest.$ac_ext
11375 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11376
11377 @@ -15379,8 +15929,8 @@
11378 ld_shlibs_CXX=no
11379 ;;
11380 esac
11381 -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
11382 -echo "${ECHO_T}$ld_shlibs_CXX" >&6
11383 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
11384 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
11385 test "$ld_shlibs_CXX" = no && can_build_shared=no
11386
11387 GCC_CXX="$GXX"
11388 @@ -15519,8 +16069,8 @@
11389 lt_prog_compiler_pic_CXX=
11390 lt_prog_compiler_static_CXX=
11391
11392 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
11393 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11394 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
11395 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
11396
11397 # C++ specific cases for pic, static, wl, etc.
11398 if test "$GXX" = yes; then
11399 @@ -15793,16 +16343,16 @@
11400 esac
11401 fi
11402
11403 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
11404 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
11405 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
11406 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
11407
11408 #
11409 # Check to make sure the PIC flag actually works.
11410 #
11411 if test -n "$lt_prog_compiler_pic_CXX"; then
11412
11413 -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
11414 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
11415 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
11416 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
11417 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
11418 echo $ECHO_N "(cached) $ECHO_C" >&6
11419 else
11420 @@ -15819,11 +16369,11 @@
11421 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11422 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11423 -e 's:$: $lt_compiler_flag:'`
11424 - (eval echo "\"\$as_me:15822: $lt_compile\"" >&5)
11425 + (eval echo "\"\$as_me:16372: $lt_compile\"" >&5)
11426 (eval "$lt_compile" 2>conftest.err)
11427 ac_status=$?
11428 cat conftest.err >&5
11429 - echo "$as_me:15826: \$? = $ac_status" >&5
11430 + echo "$as_me:16376: \$? = $ac_status" >&5
11431 if (exit $ac_status) && test -s "$ac_outfile"; then
11432 # The compiler can only warn and ignore the option if not recognized
11433 # So say no if there are warnings other than the usual output.
11434 @@ -15836,8 +16386,8 @@
11435 $rm conftest*
11436
11437 fi
11438 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
11439 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
11440 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
11441 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
11442
11443 if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
11444 case $lt_prog_compiler_pic_CXX in
11445 @@ -15864,8 +16414,8 @@
11446 # Check to make sure the static flag actually works.
11447 #
11448 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
11449 -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
11450 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
11451 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
11452 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
11453 if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
11454 echo $ECHO_N "(cached) $ECHO_C" >&6
11455 else
11456 @@ -15892,8 +16442,8 @@
11457 LDFLAGS="$save_LDFLAGS"
11458
11459 fi
11460 -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
11461 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
11462 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
11463 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
11464
11465 if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
11466 :
11467 @@ -15902,8 +16452,8 @@
11468 fi
11469
11470
11471 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
11472 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
11473 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
11474 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
11475 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
11476 echo $ECHO_N "(cached) $ECHO_C" >&6
11477 else
11478 @@ -15923,11 +16473,11 @@
11479 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11480 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11481 -e 's:$: $lt_compiler_flag:'`
11482 - (eval echo "\"\$as_me:15926: $lt_compile\"" >&5)
11483 + (eval echo "\"\$as_me:16476: $lt_compile\"" >&5)
11484 (eval "$lt_compile" 2>out/conftest.err)
11485 ac_status=$?
11486 cat out/conftest.err >&5
11487 - echo "$as_me:15930: \$? = $ac_status" >&5
11488 + echo "$as_me:16480: \$? = $ac_status" >&5
11489 if (exit $ac_status) && test -s out/conftest2.$ac_objext
11490 then
11491 # The compiler can only warn and ignore the option if not recognized
11492 @@ -15949,23 +16499,23 @@
11493 $rm conftest*
11494
11495 fi
11496 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
11497 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
11498 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
11499 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
11500
11501
11502 hard_links="nottested"
11503 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
11504 # do not overwrite the value of need_locks provided by the user
11505 - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
11506 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
11507 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
11508 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
11509 hard_links=yes
11510 $rm conftest*
11511 ln conftest.a conftest.b 2>/dev/null && hard_links=no
11512 touch conftest.a
11513 ln conftest.a conftest.b 2>&5 || hard_links=no
11514 ln conftest.a conftest.b 2>/dev/null && hard_links=no
11515 - echo "$as_me:$LINENO: result: $hard_links" >&5
11516 -echo "${ECHO_T}$hard_links" >&6
11517 + { echo "$as_me:$LINENO: result: $hard_links" >&5
11518 +echo "${ECHO_T}$hard_links" >&6; }
11519 if test "$hard_links" = no; then
11520 { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
11521 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
11522 @@ -15975,8 +16525,8 @@
11523 need_locks=no
11524 fi
11525
11526 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11527 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
11528 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11529 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
11530
11531 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
11532 case $host_os in
11533 @@ -16006,8 +16556,8 @@
11534 ;;
11535 esac
11536
11537 -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
11538 -echo "${ECHO_T}$ld_shlibs_CXX" >&6
11539 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
11540 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
11541 test "$ld_shlibs_CXX" = no && can_build_shared=no
11542
11543 #
11544 @@ -16027,8 +16577,8 @@
11545 # Test whether the compiler implicitly links with -lc since on some
11546 # systems, -lgcc has to come before -lc. If gcc already passes -lc
11547 # to ld, don't add -lc before -lgcc.
11548 - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
11549 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
11550 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
11551 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
11552 $rm conftest*
11553 printf "$lt_simple_compile_test_code" > conftest.$ac_ext
11554
11555 @@ -16065,16 +16615,16 @@
11556 cat conftest.err 1>&5
11557 fi
11558 $rm conftest*
11559 - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
11560 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
11561 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
11562 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
11563 ;;
11564 esac
11565 fi
11566 ;;
11567 esac
11568
11569 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
11570 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
11571 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
11572 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
11573 library_names_spec=
11574 libname_spec='lib$name'
11575 soname_spec=
11576 @@ -16673,8 +17223,8 @@
11577 dynamic_linker=no
11578 ;;
11579 esac
11580 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
11581 -echo "${ECHO_T}$dynamic_linker" >&6
11582 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
11583 +echo "${ECHO_T}$dynamic_linker" >&6; }
11584 test "$dynamic_linker" = no && can_build_shared=no
11585
11586 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
11587 @@ -16682,8 +17232,8 @@
11588 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
11589 fi
11590
11591 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
11592 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
11593 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
11594 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
11595 hardcode_action_CXX=
11596 if test -n "$hardcode_libdir_flag_spec_CXX" || \
11597 test -n "$runpath_var_CXX" || \
11598 @@ -16707,8 +17257,8 @@
11599 # directories.
11600 hardcode_action_CXX=unsupported
11601 fi
11602 -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
11603 -echo "${ECHO_T}$hardcode_action_CXX" >&6
11604 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
11605 +echo "${ECHO_T}$hardcode_action_CXX" >&6; }
11606
11607 if test "$hardcode_action_CXX" = relink; then
11608 # Fast installation is not supported
11609 @@ -17233,13 +17783,13 @@
11610 cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
11611
11612
11613 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
11614 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
11615 -echo "$as_me:$LINENO: result: $can_build_shared" >&5
11616 -echo "${ECHO_T}$can_build_shared" >&6
11617 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
11618 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
11619 +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
11620 +echo "${ECHO_T}$can_build_shared" >&6; }
11621
11622 -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
11623 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
11624 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
11625 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
11626 test "$can_build_shared" = "no" && enable_shared=no
11627
11628 # On AIX, shared libraries and static libraries use the same namespace, and
11629 @@ -17258,15 +17808,15 @@
11630 fi
11631 ;;
11632 esac
11633 -echo "$as_me:$LINENO: result: $enable_shared" >&5
11634 -echo "${ECHO_T}$enable_shared" >&6
11635 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5
11636 +echo "${ECHO_T}$enable_shared" >&6; }
11637
11638 -echo "$as_me:$LINENO: checking whether to build static libraries" >&5
11639 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
11640 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
11641 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
11642 # Make sure either enable_shared or enable_static is yes.
11643 test "$enable_shared" = yes || enable_static=yes
11644 -echo "$as_me:$LINENO: result: $enable_static" >&5
11645 -echo "${ECHO_T}$enable_static" >&6
11646 +{ echo "$as_me:$LINENO: result: $enable_static" >&5
11647 +echo "${ECHO_T}$enable_static" >&6; }
11648
11649 GCC_F77="$G77"
11650 LD_F77="$LD"
11651 @@ -17275,8 +17825,8 @@
11652 lt_prog_compiler_pic_F77=
11653 lt_prog_compiler_static_F77=
11654
11655 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
11656 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11657 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
11658 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
11659
11660 if test "$GCC" = yes; then
11661 lt_prog_compiler_wl_F77='-Wl,'
11662 @@ -17485,16 +18035,16 @@
11663 esac
11664 fi
11665
11666 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
11667 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
11668 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
11669 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
11670
11671 #
11672 # Check to make sure the PIC flag actually works.
11673 #
11674 if test -n "$lt_prog_compiler_pic_F77"; then
11675
11676 -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
11677 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
11678 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
11679 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
11680 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
11681 echo $ECHO_N "(cached) $ECHO_C" >&6
11682 else
11683 @@ -17511,11 +18061,11 @@
11684 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11685 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11686 -e 's:$: $lt_compiler_flag:'`
11687 - (eval echo "\"\$as_me:17514: $lt_compile\"" >&5)
11688 + (eval echo "\"\$as_me:18064: $lt_compile\"" >&5)
11689 (eval "$lt_compile" 2>conftest.err)
11690 ac_status=$?
11691 cat conftest.err >&5
11692 - echo "$as_me:17518: \$? = $ac_status" >&5
11693 + echo "$as_me:18068: \$? = $ac_status" >&5
11694 if (exit $ac_status) && test -s "$ac_outfile"; then
11695 # The compiler can only warn and ignore the option if not recognized
11696 # So say no if there are warnings other than the usual output.
11697 @@ -17528,8 +18078,8 @@
11698 $rm conftest*
11699
11700 fi
11701 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
11702 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
11703 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
11704 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
11705
11706 if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
11707 case $lt_prog_compiler_pic_F77 in
11708 @@ -17556,8 +18106,8 @@
11709 # Check to make sure the static flag actually works.
11710 #
11711 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
11712 -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
11713 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
11714 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
11715 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
11716 if test "${lt_prog_compiler_static_works_F77+set}" = set; then
11717 echo $ECHO_N "(cached) $ECHO_C" >&6
11718 else
11719 @@ -17584,8 +18134,8 @@
11720 LDFLAGS="$save_LDFLAGS"
11721
11722 fi
11723 -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
11724 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
11725 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
11726 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
11727
11728 if test x"$lt_prog_compiler_static_works_F77" = xyes; then
11729 :
11730 @@ -17594,8 +18144,8 @@
11731 fi
11732
11733
11734 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
11735 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
11736 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
11737 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
11738 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
11739 echo $ECHO_N "(cached) $ECHO_C" >&6
11740 else
11741 @@ -17615,11 +18165,11 @@
11742 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11743 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11744 -e 's:$: $lt_compiler_flag:'`
11745 - (eval echo "\"\$as_me:17618: $lt_compile\"" >&5)
11746 + (eval echo "\"\$as_me:18168: $lt_compile\"" >&5)
11747 (eval "$lt_compile" 2>out/conftest.err)
11748 ac_status=$?
11749 cat out/conftest.err >&5
11750 - echo "$as_me:17622: \$? = $ac_status" >&5
11751 + echo "$as_me:18172: \$? = $ac_status" >&5
11752 if (exit $ac_status) && test -s out/conftest2.$ac_objext
11753 then
11754 # The compiler can only warn and ignore the option if not recognized
11755 @@ -17641,23 +18191,23 @@
11756 $rm conftest*
11757
11758 fi
11759 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
11760 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
11761 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
11762 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
11763
11764
11765 hard_links="nottested"
11766 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
11767 # do not overwrite the value of need_locks provided by the user
11768 - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
11769 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
11770 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
11771 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
11772 hard_links=yes
11773 $rm conftest*
11774 ln conftest.a conftest.b 2>/dev/null && hard_links=no
11775 touch conftest.a
11776 ln conftest.a conftest.b 2>&5 || hard_links=no
11777 ln conftest.a conftest.b 2>/dev/null && hard_links=no
11778 - echo "$as_me:$LINENO: result: $hard_links" >&5
11779 -echo "${ECHO_T}$hard_links" >&6
11780 + { echo "$as_me:$LINENO: result: $hard_links" >&5
11781 +echo "${ECHO_T}$hard_links" >&6; }
11782 if test "$hard_links" = no; then
11783 { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
11784 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
11785 @@ -17667,8 +18217,8 @@
11786 need_locks=no
11787 fi
11788
11789 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11790 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
11791 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11792 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
11793
11794 runpath_var=
11795 allow_undefined_flag_F77=
11796 @@ -18074,26 +18624,23 @@
11797 end
11798 _ACEOF
11799 rm -f conftest.$ac_objext conftest$ac_exeext
11800 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11801 - (eval $ac_link) 2>conftest.er1
11802 +if { (ac_try="$ac_link"
11803 +case "(($ac_try" in
11804 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11805 + *) ac_try_echo=$ac_try;;
11806 +esac
11807 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11808 + (eval "$ac_link") 2>conftest.er1
11809 ac_status=$?
11810 grep -v '^ *+' conftest.er1 >conftest.err
11811 rm -f conftest.er1
11812 cat conftest.err >&5
11813 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11814 - (exit $ac_status); } &&
11815 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
11816 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11817 - (eval $ac_try) 2>&5
11818 - ac_status=$?
11819 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11820 - (exit $ac_status); }; } &&
11821 - { ac_try='test -s conftest$ac_exeext'
11822 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11823 - (eval $ac_try) 2>&5
11824 - ac_status=$?
11825 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11826 - (exit $ac_status); }; }; then
11827 + (exit $ac_status); } && {
11828 + test -z "$ac_f77_werror_flag" ||
11829 + test ! -s conftest.err
11830 + } && test -s conftest$ac_exeext &&
11831 + $as_test_x conftest$ac_exeext; then
11832
11833 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
11834 }'`
11835 @@ -18104,8 +18651,10 @@
11836 echo "$as_me: failed program was:" >&5
11837 sed 's/^/| /' conftest.$ac_ext >&5
11838
11839 +
11840 fi
11841 -rm -f conftest.err conftest.$ac_objext \
11842 +
11843 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11844 conftest$ac_exeext conftest.$ac_ext
11845 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11846
11847 @@ -18124,26 +18673,23 @@
11848 end
11849 _ACEOF
11850 rm -f conftest.$ac_objext conftest$ac_exeext
11851 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11852 - (eval $ac_link) 2>conftest.er1
11853 +if { (ac_try="$ac_link"
11854 +case "(($ac_try" in
11855 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11856 + *) ac_try_echo=$ac_try;;
11857 +esac
11858 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11859 + (eval "$ac_link") 2>conftest.er1
11860 ac_status=$?
11861 grep -v '^ *+' conftest.er1 >conftest.err
11862 rm -f conftest.er1
11863 cat conftest.err >&5
11864 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11865 - (exit $ac_status); } &&
11866 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
11867 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11868 - (eval $ac_try) 2>&5
11869 - ac_status=$?
11870 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11871 - (exit $ac_status); }; } &&
11872 - { ac_try='test -s conftest$ac_exeext'
11873 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11874 - (eval $ac_try) 2>&5
11875 - ac_status=$?
11876 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11877 - (exit $ac_status); }; }; then
11878 + (exit $ac_status); } && {
11879 + test -z "$ac_f77_werror_flag" ||
11880 + test ! -s conftest.err
11881 + } && test -s conftest$ac_exeext &&
11882 + $as_test_x conftest$ac_exeext; then
11883
11884 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
11885 }'`
11886 @@ -18154,8 +18700,10 @@
11887 echo "$as_me: failed program was:" >&5
11888 sed 's/^/| /' conftest.$ac_ext >&5
11889
11890 +
11891 fi
11892 -rm -f conftest.err conftest.$ac_objext \
11893 +
11894 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11895 conftest$ac_exeext conftest.$ac_ext
11896 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11897
11898 @@ -18613,8 +19161,8 @@
11899 esac
11900 fi
11901
11902 -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
11903 -echo "${ECHO_T}$ld_shlibs_F77" >&6
11904 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
11905 +echo "${ECHO_T}$ld_shlibs_F77" >&6; }
11906 test "$ld_shlibs_F77" = no && can_build_shared=no
11907
11908 #
11909 @@ -18634,8 +19182,8 @@
11910 # Test whether the compiler implicitly links with -lc since on some
11911 # systems, -lgcc has to come before -lc. If gcc already passes -lc
11912 # to ld, don't add -lc before -lgcc.
11913 - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
11914 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
11915 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
11916 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
11917 $rm conftest*
11918 printf "$lt_simple_compile_test_code" > conftest.$ac_ext
11919
11920 @@ -18672,16 +19220,16 @@
11921 cat conftest.err 1>&5
11922 fi
11923 $rm conftest*
11924 - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
11925 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
11926 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
11927 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
11928 ;;
11929 esac
11930 fi
11931 ;;
11932 esac
11933
11934 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
11935 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
11936 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
11937 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
11938 library_names_spec=
11939 libname_spec='lib$name'
11940 soname_spec=
11941 @@ -19280,8 +19828,8 @@
11942 dynamic_linker=no
11943 ;;
11944 esac
11945 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
11946 -echo "${ECHO_T}$dynamic_linker" >&6
11947 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
11948 +echo "${ECHO_T}$dynamic_linker" >&6; }
11949 test "$dynamic_linker" = no && can_build_shared=no
11950
11951 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
11952 @@ -19289,8 +19837,8 @@
11953 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
11954 fi
11955
11956 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
11957 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
11958 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
11959 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
11960 hardcode_action_F77=
11961 if test -n "$hardcode_libdir_flag_spec_F77" || \
11962 test -n "$runpath_var_F77" || \
11963 @@ -19314,8 +19862,8 @@
11964 # directories.
11965 hardcode_action_F77=unsupported
11966 fi
11967 -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
11968 -echo "${ECHO_T}$hardcode_action_F77" >&6
11969 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
11970 +echo "${ECHO_T}$hardcode_action_F77" >&6; }
11971
11972 if test "$hardcode_action_F77" = relink; then
11973 # Fast installation is not supported
11974 @@ -19752,7 +20300,6 @@
11975 if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
11976
11977
11978 -
11979 # Source file extension for Java test sources.
11980 ac_ext=java
11981
11982 @@ -19820,8 +20367,8 @@
11983 lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
11984
11985
11986 -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
11987 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
11988 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
11989 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
11990 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
11991 echo $ECHO_N "(cached) $ECHO_C" >&6
11992 else
11993 @@ -19838,11 +20385,11 @@
11994 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11995 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11996 -e 's:$: $lt_compiler_flag:'`
11997 - (eval echo "\"\$as_me:19841: $lt_compile\"" >&5)
11998 + (eval echo "\"\$as_me:20388: $lt_compile\"" >&5)
11999 (eval "$lt_compile" 2>conftest.err)
12000 ac_status=$?
12001 cat conftest.err >&5
12002 - echo "$as_me:19845: \$? = $ac_status" >&5
12003 + echo "$as_me:20392: \$? = $ac_status" >&5
12004 if (exit $ac_status) && test -s "$ac_outfile"; then
12005 # The compiler can only warn and ignore the option if not recognized
12006 # So say no if there are warnings other than the usual output.
12007 @@ -19855,8 +20402,8 @@
12008 $rm conftest*
12009
12010 fi
12011 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
12012 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
12013 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
12014 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
12015
12016 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
12017 lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
12018 @@ -19870,8 +20417,8 @@
12019 lt_prog_compiler_pic_GCJ=
12020 lt_prog_compiler_static_GCJ=
12021
12022 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
12023 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
12024 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
12025 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
12026
12027 if test "$GCC" = yes; then
12028 lt_prog_compiler_wl_GCJ='-Wl,'
12029 @@ -20080,16 +20627,16 @@
12030 esac
12031 fi
12032
12033 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
12034 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
12035 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
12036 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
12037
12038 #
12039 # Check to make sure the PIC flag actually works.
12040 #
12041 if test -n "$lt_prog_compiler_pic_GCJ"; then
12042
12043 -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
12044 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
12045 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
12046 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
12047 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
12048 echo $ECHO_N "(cached) $ECHO_C" >&6
12049 else
12050 @@ -20106,11 +20653,11 @@
12051 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12052 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12053 -e 's:$: $lt_compiler_flag:'`
12054 - (eval echo "\"\$as_me:20109: $lt_compile\"" >&5)
12055 + (eval echo "\"\$as_me:20656: $lt_compile\"" >&5)
12056 (eval "$lt_compile" 2>conftest.err)
12057 ac_status=$?
12058 cat conftest.err >&5
12059 - echo "$as_me:20113: \$? = $ac_status" >&5
12060 + echo "$as_me:20660: \$? = $ac_status" >&5
12061 if (exit $ac_status) && test -s "$ac_outfile"; then
12062 # The compiler can only warn and ignore the option if not recognized
12063 # So say no if there are warnings other than the usual output.
12064 @@ -20123,8 +20670,8 @@
12065 $rm conftest*
12066
12067 fi
12068 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
12069 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
12070 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
12071 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
12072
12073 if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
12074 case $lt_prog_compiler_pic_GCJ in
12075 @@ -20151,8 +20698,8 @@
12076 # Check to make sure the static flag actually works.
12077 #
12078 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
12079 -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
12080 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
12081 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
12082 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
12083 if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
12084 echo $ECHO_N "(cached) $ECHO_C" >&6
12085 else
12086 @@ -20179,8 +20726,8 @@
12087 LDFLAGS="$save_LDFLAGS"
12088
12089 fi
12090 -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
12091 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
12092 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
12093 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
12094
12095 if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
12096 :
12097 @@ -20189,8 +20736,8 @@
12098 fi
12099
12100
12101 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
12102 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
12103 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
12104 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
12105 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
12106 echo $ECHO_N "(cached) $ECHO_C" >&6
12107 else
12108 @@ -20210,11 +20757,11 @@
12109 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12110 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12111 -e 's:$: $lt_compiler_flag:'`
12112 - (eval echo "\"\$as_me:20213: $lt_compile\"" >&5)
12113 + (eval echo "\"\$as_me:20760: $lt_compile\"" >&5)
12114 (eval "$lt_compile" 2>out/conftest.err)
12115 ac_status=$?
12116 cat out/conftest.err >&5
12117 - echo "$as_me:20217: \$? = $ac_status" >&5
12118 + echo "$as_me:20764: \$? = $ac_status" >&5
12119 if (exit $ac_status) && test -s out/conftest2.$ac_objext
12120 then
12121 # The compiler can only warn and ignore the option if not recognized
12122 @@ -20236,23 +20783,23 @@
12123 $rm conftest*
12124
12125 fi
12126 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
12127 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
12128 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
12129 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
12130
12131
12132 hard_links="nottested"
12133 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
12134 # do not overwrite the value of need_locks provided by the user
12135 - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
12136 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
12137 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
12138 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
12139 hard_links=yes
12140 $rm conftest*
12141 ln conftest.a conftest.b 2>/dev/null && hard_links=no
12142 touch conftest.a
12143 ln conftest.a conftest.b 2>&5 || hard_links=no
12144 ln conftest.a conftest.b 2>/dev/null && hard_links=no
12145 - echo "$as_me:$LINENO: result: $hard_links" >&5
12146 -echo "${ECHO_T}$hard_links" >&6
12147 + { echo "$as_me:$LINENO: result: $hard_links" >&5
12148 +echo "${ECHO_T}$hard_links" >&6; }
12149 if test "$hard_links" = no; then
12150 { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
12151 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
12152 @@ -20262,8 +20809,8 @@
12153 need_locks=no
12154 fi
12155
12156 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
12157 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
12158 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
12159 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
12160
12161 runpath_var=
12162 allow_undefined_flag_GCJ=
12163 @@ -20679,26 +21226,23 @@
12164 }
12165 _ACEOF
12166 rm -f conftest.$ac_objext conftest$ac_exeext
12167 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12168 - (eval $ac_link) 2>conftest.er1
12169 +if { (ac_try="$ac_link"
12170 +case "(($ac_try" in
12171 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12172 + *) ac_try_echo=$ac_try;;
12173 +esac
12174 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12175 + (eval "$ac_link") 2>conftest.er1
12176 ac_status=$?
12177 grep -v '^ *+' conftest.er1 >conftest.err
12178 rm -f conftest.er1
12179 cat conftest.err >&5
12180 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12181 - (exit $ac_status); } &&
12182 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12183 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12184 - (eval $ac_try) 2>&5
12185 - ac_status=$?
12186 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12187 - (exit $ac_status); }; } &&
12188 - { ac_try='test -s conftest$ac_exeext'
12189 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12190 - (eval $ac_try) 2>&5
12191 - ac_status=$?
12192 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12193 - (exit $ac_status); }; }; then
12194 + (exit $ac_status); } && {
12195 + test -z "$ac_c_werror_flag" ||
12196 + test ! -s conftest.err
12197 + } && test -s conftest$ac_exeext &&
12198 + $as_test_x conftest$ac_exeext; then
12199
12200 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12201 }'`
12202 @@ -20709,8 +21253,10 @@
12203 echo "$as_me: failed program was:" >&5
12204 sed 's/^/| /' conftest.$ac_ext >&5
12205
12206 +
12207 fi
12208 -rm -f conftest.err conftest.$ac_objext \
12209 +
12210 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12211 conftest$ac_exeext conftest.$ac_ext
12212 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12213
12214 @@ -20739,26 +21285,23 @@
12215 }
12216 _ACEOF
12217 rm -f conftest.$ac_objext conftest$ac_exeext
12218 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12219 - (eval $ac_link) 2>conftest.er1
12220 +if { (ac_try="$ac_link"
12221 +case "(($ac_try" in
12222 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12223 + *) ac_try_echo=$ac_try;;
12224 +esac
12225 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12226 + (eval "$ac_link") 2>conftest.er1
12227 ac_status=$?
12228 grep -v '^ *+' conftest.er1 >conftest.err
12229 rm -f conftest.er1
12230 cat conftest.err >&5
12231 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12232 - (exit $ac_status); } &&
12233 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12234 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12235 - (eval $ac_try) 2>&5
12236 - ac_status=$?
12237 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12238 - (exit $ac_status); }; } &&
12239 - { ac_try='test -s conftest$ac_exeext'
12240 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12241 - (eval $ac_try) 2>&5
12242 - ac_status=$?
12243 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12244 - (exit $ac_status); }; }; then
12245 + (exit $ac_status); } && {
12246 + test -z "$ac_c_werror_flag" ||
12247 + test ! -s conftest.err
12248 + } && test -s conftest$ac_exeext &&
12249 + $as_test_x conftest$ac_exeext; then
12250
12251 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
12252 }'`
12253 @@ -20769,8 +21312,10 @@
12254 echo "$as_me: failed program was:" >&5
12255 sed 's/^/| /' conftest.$ac_ext >&5
12256
12257 +
12258 fi
12259 -rm -f conftest.err conftest.$ac_objext \
12260 +
12261 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12262 conftest$ac_exeext conftest.$ac_ext
12263 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12264
12265 @@ -21228,8 +21773,8 @@
12266 esac
12267 fi
12268
12269 -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
12270 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6
12271 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
12272 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
12273 test "$ld_shlibs_GCJ" = no && can_build_shared=no
12274
12275 #
12276 @@ -21249,8 +21794,8 @@
12277 # Test whether the compiler implicitly links with -lc since on some
12278 # systems, -lgcc has to come before -lc. If gcc already passes -lc
12279 # to ld, don't add -lc before -lgcc.
12280 - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
12281 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
12282 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
12283 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
12284 $rm conftest*
12285 printf "$lt_simple_compile_test_code" > conftest.$ac_ext
12286
12287 @@ -21287,16 +21832,16 @@
12288 cat conftest.err 1>&5
12289 fi
12290 $rm conftest*
12291 - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
12292 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
12293 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
12294 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
12295 ;;
12296 esac
12297 fi
12298 ;;
12299 esac
12300
12301 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
12302 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
12303 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
12304 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
12305 library_names_spec=
12306 libname_spec='lib$name'
12307 soname_spec=
12308 @@ -21895,8 +22440,8 @@
12309 dynamic_linker=no
12310 ;;
12311 esac
12312 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
12313 -echo "${ECHO_T}$dynamic_linker" >&6
12314 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
12315 +echo "${ECHO_T}$dynamic_linker" >&6; }
12316 test "$dynamic_linker" = no && can_build_shared=no
12317
12318 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
12319 @@ -21904,8 +22449,8 @@
12320 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
12321 fi
12322
12323 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
12324 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
12325 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
12326 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
12327 hardcode_action_GCJ=
12328 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
12329 test -n "$runpath_var_GCJ" || \
12330 @@ -21929,8 +22474,8 @@
12331 # directories.
12332 hardcode_action_GCJ=unsupported
12333 fi
12334 -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
12335 -echo "${ECHO_T}$hardcode_action_GCJ" >&6
12336 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
12337 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
12338
12339 if test "$hardcode_action_GCJ" = relink; then
12340 # Fast installation is not supported
12341 @@ -22366,7 +22911,6 @@
12342 RC)
12343
12344
12345 -
12346 # Source file extension for RC test sources.
12347 ac_ext=rc
12348
12349 @@ -22910,15 +23454,15 @@
12350 fi
12351
12352 # make sure $() command substitution works
12353 -echo "$as_me:$LINENO: checking for POSIX sh \$() command substitution" >&5
12354 -echo $ECHO_N "checking for POSIX sh \$() command substitution... $ECHO_C" >&6
12355 +{ echo "$as_me:$LINENO: checking for POSIX sh \$() command substitution" >&5
12356 +echo $ECHO_N "checking for POSIX sh \$() command substitution... $ECHO_C" >&6; }
12357 if test "x$(pwd)" = "x`pwd`" && test "y$(echo "foobar")" = "y`echo foobar`" # ''''
12358 then
12359 - echo "$as_me:$LINENO: result: yes" >&5
12360 -echo "${ECHO_T}yes" >&6
12361 + { echo "$as_me:$LINENO: result: yes" >&5
12362 +echo "${ECHO_T}yes" >&6; }
12363 else
12364 - echo "$as_me:$LINENO: result: no" >&5
12365 -echo "${ECHO_T}no" >&6
12366 + { echo "$as_me:$LINENO: result: no" >&5
12367 +echo "${ECHO_T}no" >&6; }
12368 uname=`uname 2>&1` # ''
12369 uname_a=`uname -a 2>&1` # ''
12370 { { echo "$as_me:$LINENO: error:
12371 @@ -23141,15 +23685,15 @@
12372
12373 sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|"
12374 # Not so sure whether this hack is all *that* evil...
12375 -echo "$as_me:$LINENO: checking for po/Makevars requiring hack" >&5
12376 -echo $ECHO_N "checking for po/Makevars requiring hack... $ECHO_C" >&6
12377 +{ echo "$as_me:$LINENO: checking for po/Makevars requiring hack" >&5
12378 +echo $ECHO_N "checking for po/Makevars requiring hack... $ECHO_C" >&6; }
12379 if test -f "${srcdir}/po/Makevars.template"; then
12380 sed "$sed_cmds" < "${srcdir}/po/Makevars.template" > "${srcdir}/po/Makevars"
12381 - echo "$as_me:$LINENO: result: yes, done." >&5
12382 -echo "${ECHO_T}yes, done." >&6
12383 + { echo "$as_me:$LINENO: result: yes, done." >&5
12384 +echo "${ECHO_T}yes, done." >&6; }
12385 else
12386 - echo "$as_me:$LINENO: result: no" >&5
12387 -echo "${ECHO_T}no" >&6
12388 + { echo "$as_me:$LINENO: result: no" >&5
12389 +echo "${ECHO_T}no" >&6; }
12390 fi
12391
12392 ALL_LINGUAS="cs da de fr es eu it ja nb pl pt_BR ru sl sv uk vi zh_CN zh_TW"
12393 @@ -23168,17 +23712,17 @@
12394
12395
12396
12397 - echo "$as_me:$LINENO: checking whether NLS is requested" >&5
12398 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
12399 - # Check whether --enable-nls or --disable-nls was given.
12400 + { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
12401 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
12402 + # Check whether --enable-nls was given.
12403 if test "${enable_nls+set}" = set; then
12404 - enableval="$enable_nls"
12405 - USE_NLS=$enableval
12406 + enableval=$enable_nls; USE_NLS=$enableval
12407 else
12408 USE_NLS=yes
12409 -fi;
12410 - echo "$as_me:$LINENO: result: $USE_NLS" >&5
12411 -echo "${ECHO_T}$USE_NLS" >&6
12412 +fi
12413 +
12414 + { echo "$as_me:$LINENO: result: $USE_NLS" >&5
12415 +echo "${ECHO_T}$USE_NLS" >&6; }
12416
12417
12418
12419 @@ -23215,8 +23759,8 @@
12420
12421 # Extract the first word of "msgfmt", so it can be a program name with args.
12422 set dummy msgfmt; ac_word=$2
12423 -echo "$as_me:$LINENO: checking for $ac_word" >&5
12424 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12425 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12426 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12427 if test "${ac_cv_path_MSGFMT+set}" = set; then
12428 echo $ECHO_N "(cached) $ECHO_C" >&6
12429 else
12430 @@ -23246,17 +23790,17 @@
12431 fi
12432 MSGFMT="$ac_cv_path_MSGFMT"
12433 if test "$MSGFMT" != ":"; then
12434 - echo "$as_me:$LINENO: result: $MSGFMT" >&5
12435 -echo "${ECHO_T}$MSGFMT" >&6
12436 + { echo "$as_me:$LINENO: result: $MSGFMT" >&5
12437 +echo "${ECHO_T}$MSGFMT" >&6; }
12438 else
12439 - echo "$as_me:$LINENO: result: no" >&5
12440 -echo "${ECHO_T}no" >&6
12441 + { echo "$as_me:$LINENO: result: no" >&5
12442 +echo "${ECHO_T}no" >&6; }
12443 fi
12444
12445 # Extract the first word of "gmsgfmt", so it can be a program name with args.
12446 set dummy gmsgfmt; ac_word=$2
12447 -echo "$as_me:$LINENO: checking for $ac_word" >&5
12448 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12449 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12450 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12451 if test "${ac_cv_path_GMSGFMT+set}" = set; then
12452 echo $ECHO_N "(cached) $ECHO_C" >&6
12453 else
12454 @@ -23271,30 +23815,31 @@
12455 IFS=$as_save_IFS
12456 test -z "$as_dir" && as_dir=.
12457 for ac_exec_ext in '' $ac_executable_extensions; do
12458 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12459 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12460 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
12461 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12462 break 2
12463 fi
12464 done
12465 done
12466 +IFS=$as_save_IFS
12467
12468 test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
12469 ;;
12470 esac
12471 fi
12472 GMSGFMT=$ac_cv_path_GMSGFMT
12473 -
12474 if test -n "$GMSGFMT"; then
12475 - echo "$as_me:$LINENO: result: $GMSGFMT" >&5
12476 -echo "${ECHO_T}$GMSGFMT" >&6
12477 + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
12478 +echo "${ECHO_T}$GMSGFMT" >&6; }
12479 else
12480 - echo "$as_me:$LINENO: result: no" >&5
12481 -echo "${ECHO_T}no" >&6
12482 + { echo "$as_me:$LINENO: result: no" >&5
12483 +echo "${ECHO_T}no" >&6; }
12484 fi
12485
12486
12487
12488 +
12489 # Prepare PATH_SEPARATOR.
12490 # The user is always right.
12491 if test "${PATH_SEPARATOR+set}" != set; then
12492 @@ -23325,8 +23870,8 @@
12493
12494 # Extract the first word of "xgettext", so it can be a program name with args.
12495 set dummy xgettext; ac_word=$2
12496 -echo "$as_me:$LINENO: checking for $ac_word" >&5
12497 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12498 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12499 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12500 if test "${ac_cv_path_XGETTEXT+set}" = set; then
12501 echo $ECHO_N "(cached) $ECHO_C" >&6
12502 else
12503 @@ -23356,11 +23901,11 @@
12504 fi
12505 XGETTEXT="$ac_cv_path_XGETTEXT"
12506 if test "$XGETTEXT" != ":"; then
12507 - echo "$as_me:$LINENO: result: $XGETTEXT" >&5
12508 -echo "${ECHO_T}$XGETTEXT" >&6
12509 + { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
12510 +echo "${ECHO_T}$XGETTEXT" >&6; }
12511 else
12512 - echo "$as_me:$LINENO: result: no" >&5
12513 -echo "${ECHO_T}no" >&6
12514 + { echo "$as_me:$LINENO: result: no" >&5
12515 +echo "${ECHO_T}no" >&6; }
12516 fi
12517
12518 rm -f messages.po
12519 @@ -23396,8 +23941,8 @@
12520
12521 # Extract the first word of "msgmerge", so it can be a program name with args.
12522 set dummy msgmerge; ac_word=$2
12523 -echo "$as_me:$LINENO: checking for $ac_word" >&5
12524 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12525 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12526 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12527 if test "${ac_cv_path_MSGMERGE+set}" = set; then
12528 echo $ECHO_N "(cached) $ECHO_C" >&6
12529 else
12530 @@ -23426,11 +23971,11 @@
12531 fi
12532 MSGMERGE="$ac_cv_path_MSGMERGE"
12533 if test "$MSGMERGE" != ":"; then
12534 - echo "$as_me:$LINENO: result: $MSGMERGE" >&5
12535 -echo "${ECHO_T}$MSGMERGE" >&6
12536 + { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
12537 +echo "${ECHO_T}$MSGMERGE" >&6; }
12538 else
12539 - echo "$as_me:$LINENO: result: no" >&5
12540 -echo "${ECHO_T}no" >&6
12541 + { echo "$as_me:$LINENO: result: no" >&5
12542 +echo "${ECHO_T}no" >&6; }
12543 fi
12544
12545
12546 @@ -23440,8 +23985,8 @@
12547 : ;
12548 else
12549 GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
12550 - echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
12551 -echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
12552 + { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
12553 +echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
12554 GMSGFMT=":"
12555 fi
12556 fi
12557 @@ -23451,14 +23996,14 @@
12558 (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
12559 : ;
12560 else
12561 - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
12562 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
12563 + { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
12564 +echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
12565 XGETTEXT=":"
12566 fi
12567 rm -f messages.po
12568 fi
12569
12570 - ac_config_commands="$ac_config_commands default-1"
12571 + ac_config_commands="$ac_config_commands default-1"
12572
12573
12574
12575 @@ -23478,13 +24023,13 @@
12576 prefix="$acl_save_prefix"
12577
12578
12579 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
12580 +# Check whether --with-gnu-ld was given.
12581 if test "${with_gnu_ld+set}" = set; then
12582 - withval="$with_gnu_ld"
12583 - test "$withval" = no || with_gnu_ld=yes
12584 + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
12585 else
12586 with_gnu_ld=no
12587 -fi;
12588 +fi
12589 +
12590 # Prepare PATH_SEPARATOR.
12591 # The user is always right.
12592 if test "${PATH_SEPARATOR+set}" != set; then
12593 @@ -23501,8 +24046,8 @@
12594 ac_prog=ld
12595 if test "$GCC" = yes; then
12596 # Check if gcc -print-prog-name=ld gives a path.
12597 - echo "$as_me:$LINENO: checking for ld used by GCC" >&5
12598 -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
12599 + { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
12600 +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
12601 case $host in
12602 *-*-mingw*)
12603 # gcc leaves a trailing carriage return which upsets mingw
12604 @@ -23531,11 +24076,11 @@
12605 ;;
12606 esac
12607 elif test "$with_gnu_ld" = yes; then
12608 - echo "$as_me:$LINENO: checking for GNU ld" >&5
12609 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
12610 + { echo "$as_me:$LINENO: checking for GNU ld" >&5
12611 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
12612 else
12613 - echo "$as_me:$LINENO: checking for non-GNU ld" >&5
12614 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
12615 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
12616 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
12617 fi
12618 if test "${acl_cv_path_LD+set}" = set; then
12619 echo $ECHO_N "(cached) $ECHO_C" >&6
12620 @@ -23565,17 +24110,17 @@
12621
12622 LD="$acl_cv_path_LD"
12623 if test -n "$LD"; then
12624 - echo "$as_me:$LINENO: result: $LD" >&5
12625 -echo "${ECHO_T}$LD" >&6
12626 + { echo "$as_me:$LINENO: result: $LD" >&5
12627 +echo "${ECHO_T}$LD" >&6; }
12628 else
12629 - echo "$as_me:$LINENO: result: no" >&5
12630 -echo "${ECHO_T}no" >&6
12631 + { echo "$as_me:$LINENO: result: no" >&5
12632 +echo "${ECHO_T}no" >&6; }
12633 fi
12634 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
12635 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
12636 { (exit 1); exit 1; }; }
12637 -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
12638 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
12639 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
12640 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
12641 if test "${acl_cv_prog_gnu_ld+set}" = set; then
12642 echo $ECHO_N "(cached) $ECHO_C" >&6
12643 else
12644 @@ -23587,14 +24132,14 @@
12645 acl_cv_prog_gnu_ld=no ;;
12646 esac
12647 fi
12648 -echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
12649 -echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
12650 +{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
12651 +echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
12652 with_gnu_ld=$acl_cv_prog_gnu_ld
12653
12654
12655
12656 - echo "$as_me:$LINENO: checking for shared library run path origin" >&5
12657 -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
12658 + { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
12659 +echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
12660 if test "${acl_cv_rpath+set}" = set; then
12661 echo $ECHO_N "(cached) $ECHO_C" >&6
12662 else
12663 @@ -23606,8 +24151,8 @@
12664 acl_cv_rpath=done
12665
12666 fi
12667 -echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
12668 -echo "${ECHO_T}$acl_cv_rpath" >&6
12669 +{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
12670 +echo "${ECHO_T}$acl_cv_rpath" >&6; }
12671 wl="$acl_cv_wl"
12672 libext="$acl_cv_libext"
12673 shlibext="$acl_cv_shlibext"
12674 @@ -23615,13 +24160,13 @@
12675 hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
12676 hardcode_direct="$acl_cv_hardcode_direct"
12677 hardcode_minus_L="$acl_cv_hardcode_minus_L"
12678 - # Check whether --enable-rpath or --disable-rpath was given.
12679 + # Check whether --enable-rpath was given.
12680 if test "${enable_rpath+set}" = set; then
12681 - enableval="$enable_rpath"
12682 - :
12683 + enableval=$enable_rpath; :
12684 else
12685 enable_rpath=yes
12686 -fi;
12687 +fi
12688 +
12689
12690
12691
12692 @@ -23643,10 +24188,9 @@
12693 prefix="$acl_save_prefix"
12694
12695
12696 -# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
12697 +# Check whether --with-libiconv-prefix was given.
12698 if test "${with_libiconv_prefix+set}" = set; then
12699 - withval="$with_libiconv_prefix"
12700 -
12701 + withval=$with_libiconv_prefix;
12702 if test "X$withval" = "Xno"; then
12703 use_additional=no
12704 else
12705 @@ -23669,7 +24213,8 @@
12706 fi
12707 fi
12708
12709 -fi;
12710 +fi
12711 +
12712 LIBICONV=
12713 LTLIBICONV=
12714 INCICONV=
12715 @@ -24022,17 +24567,17 @@
12716
12717
12718
12719 - echo "$as_me:$LINENO: checking whether NLS is requested" >&5
12720 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
12721 - # Check whether --enable-nls or --disable-nls was given.
12722 + { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
12723 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
12724 + # Check whether --enable-nls was given.
12725 if test "${enable_nls+set}" = set; then
12726 - enableval="$enable_nls"
12727 - USE_NLS=$enableval
12728 + enableval=$enable_nls; USE_NLS=$enableval
12729 else
12730 USE_NLS=yes
12731 -fi;
12732 - echo "$as_me:$LINENO: result: $USE_NLS" >&5
12733 -echo "${ECHO_T}$USE_NLS" >&6
12734 +fi
12735 +
12736 + { echo "$as_me:$LINENO: result: $USE_NLS" >&5
12737 +echo "${ECHO_T}$USE_NLS" >&6; }
12738
12739
12740
12741 @@ -24049,8 +24594,8 @@
12742
12743
12744
12745 - echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
12746 -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
12747 + { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
12748 +echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
12749 if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
12750 echo $ECHO_N "(cached) $ECHO_C" >&6
12751 else
12752 @@ -24073,38 +24618,36 @@
12753 }
12754 _ACEOF
12755 rm -f conftest.$ac_objext conftest$ac_exeext
12756 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12757 - (eval $ac_link) 2>conftest.er1
12758 +if { (ac_try="$ac_link"
12759 +case "(($ac_try" in
12760 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12761 + *) ac_try_echo=$ac_try;;
12762 +esac
12763 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12764 + (eval "$ac_link") 2>conftest.er1
12765 ac_status=$?
12766 grep -v '^ *+' conftest.er1 >conftest.err
12767 rm -f conftest.er1
12768 cat conftest.err >&5
12769 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12770 - (exit $ac_status); } &&
12771 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12772 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12773 - (eval $ac_try) 2>&5
12774 - ac_status=$?
12775 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12776 - (exit $ac_status); }; } &&
12777 - { ac_try='test -s conftest$ac_exeext'
12778 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12779 - (eval $ac_try) 2>&5
12780 - ac_status=$?
12781 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12782 - (exit $ac_status); }; }; then
12783 + (exit $ac_status); } && {
12784 + test -z "$ac_c_werror_flag" ||
12785 + test ! -s conftest.err
12786 + } && test -s conftest$ac_exeext &&
12787 + $as_test_x conftest$ac_exeext; then
12788 gt_cv_func_gnugettext1_libc=yes
12789 else
12790 echo "$as_me: failed program was:" >&5
12791 sed 's/^/| /' conftest.$ac_ext >&5
12792
12793 -gt_cv_func_gnugettext1_libc=no
12794 + gt_cv_func_gnugettext1_libc=no
12795 fi
12796 -rm -f conftest.err conftest.$ac_objext \
12797 +
12798 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12799 conftest$ac_exeext conftest.$ac_ext
12800 fi
12801 -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
12802 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
12803 +{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
12804 +echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
12805
12806 if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
12807
12808 @@ -24137,8 +24680,8 @@
12809 done
12810
12811
12812 - echo "$as_me:$LINENO: checking for iconv" >&5
12813 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6
12814 + { echo "$as_me:$LINENO: checking for iconv" >&5
12815 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
12816 if test "${am_cv_func_iconv+set}" = set; then
12817 echo $ECHO_N "(cached) $ECHO_C" >&6
12818 else
12819 @@ -24164,33 +24707,32 @@
12820 }
12821 _ACEOF
12822 rm -f conftest.$ac_objext conftest$ac_exeext
12823 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12824 - (eval $ac_link) 2>conftest.er1
12825 +if { (ac_try="$ac_link"
12826 +case "(($ac_try" in
12827 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12828 + *) ac_try_echo=$ac_try;;
12829 +esac
12830 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12831 + (eval "$ac_link") 2>conftest.er1
12832 ac_status=$?
12833 grep -v '^ *+' conftest.er1 >conftest.err
12834 rm -f conftest.er1
12835 cat conftest.err >&5
12836 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12837 - (exit $ac_status); } &&
12838 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12839 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12840 - (eval $ac_try) 2>&5
12841 - ac_status=$?
12842 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12843 - (exit $ac_status); }; } &&
12844 - { ac_try='test -s conftest$ac_exeext'
12845 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12846 - (eval $ac_try) 2>&5
12847 - ac_status=$?
12848 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12849 - (exit $ac_status); }; }; then
12850 + (exit $ac_status); } && {
12851 + test -z "$ac_c_werror_flag" ||
12852 + test ! -s conftest.err
12853 + } && test -s conftest$ac_exeext &&
12854 + $as_test_x conftest$ac_exeext; then
12855 am_cv_func_iconv=yes
12856 else
12857 echo "$as_me: failed program was:" >&5
12858 sed 's/^/| /' conftest.$ac_ext >&5
12859
12860 +
12861 fi
12862 -rm -f conftest.err conftest.$ac_objext \
12863 +
12864 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12865 conftest$ac_exeext conftest.$ac_ext
12866 if test "$am_cv_func_iconv" != yes; then
12867 am_save_LIBS="$LIBS"
12868 @@ -24214,41 +24756,40 @@
12869 }
12870 _ACEOF
12871 rm -f conftest.$ac_objext conftest$ac_exeext
12872 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12873 - (eval $ac_link) 2>conftest.er1
12874 +if { (ac_try="$ac_link"
12875 +case "(($ac_try" in
12876 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12877 + *) ac_try_echo=$ac_try;;
12878 +esac
12879 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12880 + (eval "$ac_link") 2>conftest.er1
12881 ac_status=$?
12882 grep -v '^ *+' conftest.er1 >conftest.err
12883 rm -f conftest.er1
12884 cat conftest.err >&5
12885 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12886 - (exit $ac_status); } &&
12887 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12888 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12889 - (eval $ac_try) 2>&5
12890 - ac_status=$?
12891 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12892 - (exit $ac_status); }; } &&
12893 - { ac_try='test -s conftest$ac_exeext'
12894 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12895 - (eval $ac_try) 2>&5
12896 - ac_status=$?
12897 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12898 - (exit $ac_status); }; }; then
12899 + (exit $ac_status); } && {
12900 + test -z "$ac_c_werror_flag" ||
12901 + test ! -s conftest.err
12902 + } && test -s conftest$ac_exeext &&
12903 + $as_test_x conftest$ac_exeext; then
12904 am_cv_lib_iconv=yes
12905 am_cv_func_iconv=yes
12906 else
12907 echo "$as_me: failed program was:" >&5
12908 sed 's/^/| /' conftest.$ac_ext >&5
12909
12910 +
12911 fi
12912 -rm -f conftest.err conftest.$ac_objext \
12913 +
12914 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12915 conftest$ac_exeext conftest.$ac_ext
12916 LIBS="$am_save_LIBS"
12917 fi
12918
12919 fi
12920 -echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
12921 -echo "${ECHO_T}$am_cv_func_iconv" >&6
12922 +{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
12923 +echo "${ECHO_T}$am_cv_func_iconv" >&6; }
12924 if test "$am_cv_func_iconv" = yes; then
12925
12926 cat >>confdefs.h <<\_ACEOF
12927 @@ -24257,10 +24798,10 @@
12928
12929 fi
12930 if test "$am_cv_lib_iconv" = yes; then
12931 - echo "$as_me:$LINENO: checking how to link with libiconv" >&5
12932 -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
12933 - echo "$as_me:$LINENO: result: $LIBICONV" >&5
12934 -echo "${ECHO_T}$LIBICONV" >&6
12935 + { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
12936 +echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
12937 + { echo "$as_me:$LINENO: result: $LIBICONV" >&5
12938 +echo "${ECHO_T}$LIBICONV" >&6; }
12939 else
12940 CPPFLAGS="$am_save_CPPFLAGS"
12941 LIBICONV=
12942 @@ -24286,10 +24827,9 @@
12943 prefix="$acl_save_prefix"
12944
12945
12946 -# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
12947 +# Check whether --with-libintl-prefix was given.
12948 if test "${with_libintl_prefix+set}" = set; then
12949 - withval="$with_libintl_prefix"
12950 -
12951 + withval=$with_libintl_prefix;
12952 if test "X$withval" = "Xno"; then
12953 use_additional=no
12954 else
12955 @@ -24312,7 +24852,8 @@
12956 fi
12957 fi
12958
12959 -fi;
12960 +fi
12961 +
12962 LIBINTL=
12963 LTLIBINTL=
12964 INCINTL=
12965 @@ -24648,8 +25189,8 @@
12966 done
12967 fi
12968
12969 - echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
12970 -echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
12971 + { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
12972 +echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
12973 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
12974 echo $ECHO_N "(cached) $ECHO_C" >&6
12975 else
12976 @@ -24680,34 +25221,32 @@
12977 }
12978 _ACEOF
12979 rm -f conftest.$ac_objext conftest$ac_exeext
12980 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12981 - (eval $ac_link) 2>conftest.er1
12982 +if { (ac_try="$ac_link"
12983 +case "(($ac_try" in
12984 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12985 + *) ac_try_echo=$ac_try;;
12986 +esac
12987 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12988 + (eval "$ac_link") 2>conftest.er1
12989 ac_status=$?
12990 grep -v '^ *+' conftest.er1 >conftest.err
12991 rm -f conftest.er1
12992 cat conftest.err >&5
12993 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12994 - (exit $ac_status); } &&
12995 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12996 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12997 - (eval $ac_try) 2>&5
12998 - ac_status=$?
12999 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13000 - (exit $ac_status); }; } &&
13001 - { ac_try='test -s conftest$ac_exeext'
13002 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13003 - (eval $ac_try) 2>&5
13004 - ac_status=$?
13005 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13006 - (exit $ac_status); }; }; then
13007 + (exit $ac_status); } && {
13008 + test -z "$ac_c_werror_flag" ||
13009 + test ! -s conftest.err
13010 + } && test -s conftest$ac_exeext &&
13011 + $as_test_x conftest$ac_exeext; then
13012 gt_cv_func_gnugettext1_libintl=yes
13013 else
13014 echo "$as_me: failed program was:" >&5
13015 sed 's/^/| /' conftest.$ac_ext >&5
13016
13017 -gt_cv_func_gnugettext1_libintl=no
13018 + gt_cv_func_gnugettext1_libintl=no
13019 fi
13020 -rm -f conftest.err conftest.$ac_objext \
13021 +
13022 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13023 conftest$ac_exeext conftest.$ac_ext
13024 if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
13025 LIBS="$LIBS $LIBICONV"
13026 @@ -24734,26 +25273,23 @@
13027 }
13028 _ACEOF
13029 rm -f conftest.$ac_objext conftest$ac_exeext
13030 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13031 - (eval $ac_link) 2>conftest.er1
13032 +if { (ac_try="$ac_link"
13033 +case "(($ac_try" in
13034 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13035 + *) ac_try_echo=$ac_try;;
13036 +esac
13037 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13038 + (eval "$ac_link") 2>conftest.er1
13039 ac_status=$?
13040 grep -v '^ *+' conftest.er1 >conftest.err
13041 rm -f conftest.er1
13042 cat conftest.err >&5
13043 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13044 - (exit $ac_status); } &&
13045 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13046 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13047 - (eval $ac_try) 2>&5
13048 - ac_status=$?
13049 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13050 - (exit $ac_status); }; } &&
13051 - { ac_try='test -s conftest$ac_exeext'
13052 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13053 - (eval $ac_try) 2>&5
13054 - ac_status=$?
13055 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13056 - (exit $ac_status); }; }; then
13057 + (exit $ac_status); } && {
13058 + test -z "$ac_c_werror_flag" ||
13059 + test ! -s conftest.err
13060 + } && test -s conftest$ac_exeext &&
13061 + $as_test_x conftest$ac_exeext; then
13062 LIBINTL="$LIBINTL $LIBICONV"
13063 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
13064 gt_cv_func_gnugettext1_libintl=yes
13065 @@ -24762,15 +25298,17 @@
13066 echo "$as_me: failed program was:" >&5
13067 sed 's/^/| /' conftest.$ac_ext >&5
13068
13069 +
13070 fi
13071 -rm -f conftest.err conftest.$ac_objext \
13072 +
13073 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13074 conftest$ac_exeext conftest.$ac_ext
13075 fi
13076 CPPFLAGS="$gt_save_CPPFLAGS"
13077 LIBS="$gt_save_LIBS"
13078 fi
13079 -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
13080 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
13081 +{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
13082 +echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
13083 fi
13084
13085 if test "$gt_cv_func_gnugettext1_libc" = "yes" \
13086 @@ -24798,13 +25336,13 @@
13087 fi
13088 fi
13089
13090 - echo "$as_me:$LINENO: checking whether to use NLS" >&5
13091 -echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
13092 - echo "$as_me:$LINENO: result: $USE_NLS" >&5
13093 -echo "${ECHO_T}$USE_NLS" >&6
13094 + { echo "$as_me:$LINENO: checking whether to use NLS" >&5
13095 +echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
13096 + { echo "$as_me:$LINENO: result: $USE_NLS" >&5
13097 +echo "${ECHO_T}$USE_NLS" >&6; }
13098 if test "$USE_NLS" = "yes"; then
13099 - echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
13100 -echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
13101 + { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
13102 +echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
13103 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
13104 if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
13105 gt_source="external libintl"
13106 @@ -24814,18 +25352,18 @@
13107 else
13108 gt_source="included intl directory"
13109 fi
13110 - echo "$as_me:$LINENO: result: $gt_source" >&5
13111 -echo "${ECHO_T}$gt_source" >&6
13112 + { echo "$as_me:$LINENO: result: $gt_source" >&5
13113 +echo "${ECHO_T}$gt_source" >&6; }
13114 fi
13115
13116 if test "$USE_NLS" = "yes"; then
13117
13118 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
13119 if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
13120 - echo "$as_me:$LINENO: checking how to link with libintl" >&5
13121 -echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
13122 - echo "$as_me:$LINENO: result: $LIBINTL" >&5
13123 -echo "${ECHO_T}$LIBINTL" >&6
13124 + { echo "$as_me:$LINENO: checking how to link with libintl" >&5
13125 +echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
13126 + { echo "$as_me:$LINENO: result: $LIBINTL" >&5
13127 +echo "${ECHO_T}$LIBINTL" >&6; }
13128
13129 for element in $INCINTL; do
13130 haveit=
13131 @@ -24909,8 +25447,8 @@
13132
13133 # Extract the first word of "msgfmt", so it can be a program name with args.
13134 set dummy msgfmt; ac_word=$2
13135 -echo "$as_me:$LINENO: checking for $ac_word" >&5
13136 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13137 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
13138 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
13139 if test "${ac_cv_path_MSGFMT+set}" = set; then
13140 echo $ECHO_N "(cached) $ECHO_C" >&6
13141 else
13142 @@ -24940,17 +25478,17 @@
13143 fi
13144 MSGFMT="$ac_cv_path_MSGFMT"
13145 if test "$MSGFMT" != ":"; then
13146 - echo "$as_me:$LINENO: result: $MSGFMT" >&5
13147 -echo "${ECHO_T}$MSGFMT" >&6
13148 + { echo "$as_me:$LINENO: result: $MSGFMT" >&5
13149 +echo "${ECHO_T}$MSGFMT" >&6; }
13150 else
13151 - echo "$as_me:$LINENO: result: no" >&5
13152 -echo "${ECHO_T}no" >&6
13153 + { echo "$as_me:$LINENO: result: no" >&5
13154 +echo "${ECHO_T}no" >&6; }
13155 fi
13156
13157 # Extract the first word of "gmsgfmt", so it can be a program name with args.
13158 set dummy gmsgfmt; ac_word=$2
13159 -echo "$as_me:$LINENO: checking for $ac_word" >&5
13160 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13161 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
13162 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
13163 if test "${ac_cv_path_GMSGFMT+set}" = set; then
13164 echo $ECHO_N "(cached) $ECHO_C" >&6
13165 else
13166 @@ -24965,30 +25503,31 @@
13167 IFS=$as_save_IFS
13168 test -z "$as_dir" && as_dir=.
13169 for ac_exec_ext in '' $ac_executable_extensions; do
13170 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13171 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13172 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
13173 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
13174 break 2
13175 fi
13176 done
13177 done
13178 +IFS=$as_save_IFS
13179
13180 test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
13181 ;;
13182 esac
13183 fi
13184 GMSGFMT=$ac_cv_path_GMSGFMT
13185 -
13186 if test -n "$GMSGFMT"; then
13187 - echo "$as_me:$LINENO: result: $GMSGFMT" >&5
13188 -echo "${ECHO_T}$GMSGFMT" >&6
13189 + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
13190 +echo "${ECHO_T}$GMSGFMT" >&6; }
13191 else
13192 - echo "$as_me:$LINENO: result: no" >&5
13193 -echo "${ECHO_T}no" >&6
13194 + { echo "$as_me:$LINENO: result: no" >&5
13195 +echo "${ECHO_T}no" >&6; }
13196 fi
13197
13198
13199
13200 +
13201 # Prepare PATH_SEPARATOR.
13202 # The user is always right.
13203 if test "${PATH_SEPARATOR+set}" != set; then
13204 @@ -25019,8 +25558,8 @@
13205
13206 # Extract the first word of "xgettext", so it can be a program name with args.
13207 set dummy xgettext; ac_word=$2
13208 -echo "$as_me:$LINENO: checking for $ac_word" >&5
13209 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13210 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
13211 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
13212 if test "${ac_cv_path_XGETTEXT+set}" = set; then
13213 echo $ECHO_N "(cached) $ECHO_C" >&6
13214 else
13215 @@ -25050,11 +25589,11 @@
13216 fi
13217 XGETTEXT="$ac_cv_path_XGETTEXT"
13218 if test "$XGETTEXT" != ":"; then
13219 - echo "$as_me:$LINENO: result: $XGETTEXT" >&5
13220 -echo "${ECHO_T}$XGETTEXT" >&6
13221 + { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
13222 +echo "${ECHO_T}$XGETTEXT" >&6; }
13223 else
13224 - echo "$as_me:$LINENO: result: no" >&5
13225 -echo "${ECHO_T}no" >&6
13226 + { echo "$as_me:$LINENO: result: no" >&5
13227 +echo "${ECHO_T}no" >&6; }
13228 fi
13229
13230 rm -f messages.po
13231 @@ -25090,8 +25629,8 @@
13232
13233 # Extract the first word of "msgmerge", so it can be a program name with args.
13234 set dummy msgmerge; ac_word=$2
13235 -echo "$as_me:$LINENO: checking for $ac_word" >&5
13236 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13237 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
13238 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
13239 if test "${ac_cv_path_MSGMERGE+set}" = set; then
13240 echo $ECHO_N "(cached) $ECHO_C" >&6
13241 else
13242 @@ -25120,11 +25659,11 @@
13243 fi
13244 MSGMERGE="$ac_cv_path_MSGMERGE"
13245 if test "$MSGMERGE" != ":"; then
13246 - echo "$as_me:$LINENO: result: $MSGMERGE" >&5
13247 -echo "${ECHO_T}$MSGMERGE" >&6
13248 + { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
13249 +echo "${ECHO_T}$MSGMERGE" >&6; }
13250 else
13251 - echo "$as_me:$LINENO: result: no" >&5
13252 -echo "${ECHO_T}no" >&6
13253 + { echo "$as_me:$LINENO: result: no" >&5
13254 +echo "${ECHO_T}no" >&6; }
13255 fi
13256
13257
13258 @@ -25134,8 +25673,8 @@
13259 : ;
13260 else
13261 GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
13262 - echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
13263 -echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
13264 + { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
13265 +echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
13266 GMSGFMT=":"
13267 fi
13268 fi
13269 @@ -25145,14 +25684,14 @@
13270 (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
13271 : ;
13272 else
13273 - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
13274 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
13275 + { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
13276 +echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
13277 XGETTEXT=":"
13278 fi
13279 rm -f messages.po
13280 fi
13281
13282 - ac_config_commands="$ac_config_commands default-2"
13283 + ac_config_commands="$ac_config_commands default-2"
13284
13285
13286
13287 @@ -25185,8 +25724,8 @@
13288 done
13289
13290
13291 - echo "$as_me:$LINENO: checking for iconv" >&5
13292 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6
13293 + { echo "$as_me:$LINENO: checking for iconv" >&5
13294 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
13295 if test "${am_cv_func_iconv+set}" = set; then
13296 echo $ECHO_N "(cached) $ECHO_C" >&6
13297 else
13298 @@ -25212,33 +25751,32 @@
13299 }
13300 _ACEOF
13301 rm -f conftest.$ac_objext conftest$ac_exeext
13302 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13303 - (eval $ac_link) 2>conftest.er1
13304 +if { (ac_try="$ac_link"
13305 +case "(($ac_try" in
13306 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13307 + *) ac_try_echo=$ac_try;;
13308 +esac
13309 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13310 + (eval "$ac_link") 2>conftest.er1
13311 ac_status=$?
13312 grep -v '^ *+' conftest.er1 >conftest.err
13313 rm -f conftest.er1
13314 cat conftest.err >&5
13315 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13316 - (exit $ac_status); } &&
13317 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13318 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13319 - (eval $ac_try) 2>&5
13320 - ac_status=$?
13321 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13322 - (exit $ac_status); }; } &&
13323 - { ac_try='test -s conftest$ac_exeext'
13324 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13325 - (eval $ac_try) 2>&5
13326 - ac_status=$?
13327 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13328 - (exit $ac_status); }; }; then
13329 + (exit $ac_status); } && {
13330 + test -z "$ac_c_werror_flag" ||
13331 + test ! -s conftest.err
13332 + } && test -s conftest$ac_exeext &&
13333 + $as_test_x conftest$ac_exeext; then
13334 am_cv_func_iconv=yes
13335 else
13336 echo "$as_me: failed program was:" >&5
13337 sed 's/^/| /' conftest.$ac_ext >&5
13338
13339 +
13340 fi
13341 -rm -f conftest.err conftest.$ac_objext \
13342 +
13343 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13344 conftest$ac_exeext conftest.$ac_ext
13345 if test "$am_cv_func_iconv" != yes; then
13346 am_save_LIBS="$LIBS"
13347 @@ -25262,41 +25800,40 @@
13348 }
13349 _ACEOF
13350 rm -f conftest.$ac_objext conftest$ac_exeext
13351 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13352 - (eval $ac_link) 2>conftest.er1
13353 +if { (ac_try="$ac_link"
13354 +case "(($ac_try" in
13355 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13356 + *) ac_try_echo=$ac_try;;
13357 +esac
13358 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13359 + (eval "$ac_link") 2>conftest.er1
13360 ac_status=$?
13361 grep -v '^ *+' conftest.er1 >conftest.err
13362 rm -f conftest.er1
13363 cat conftest.err >&5
13364 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13365 - (exit $ac_status); } &&
13366 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13367 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13368 - (eval $ac_try) 2>&5
13369 - ac_status=$?
13370 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13371 - (exit $ac_status); }; } &&
13372 - { ac_try='test -s conftest$ac_exeext'
13373 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13374 - (eval $ac_try) 2>&5
13375 - ac_status=$?
13376 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13377 - (exit $ac_status); }; }; then
13378 + (exit $ac_status); } && {
13379 + test -z "$ac_c_werror_flag" ||
13380 + test ! -s conftest.err
13381 + } && test -s conftest$ac_exeext &&
13382 + $as_test_x conftest$ac_exeext; then
13383 am_cv_lib_iconv=yes
13384 am_cv_func_iconv=yes
13385 else
13386 echo "$as_me: failed program was:" >&5
13387 sed 's/^/| /' conftest.$ac_ext >&5
13388
13389 +
13390 fi
13391 -rm -f conftest.err conftest.$ac_objext \
13392 +
13393 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13394 conftest$ac_exeext conftest.$ac_ext
13395 LIBS="$am_save_LIBS"
13396 fi
13397
13398 fi
13399 -echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
13400 -echo "${ECHO_T}$am_cv_func_iconv" >&6
13401 +{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
13402 +echo "${ECHO_T}$am_cv_func_iconv" >&6; }
13403 if test "$am_cv_func_iconv" = yes; then
13404
13405 cat >>confdefs.h <<\_ACEOF
13406 @@ -25305,10 +25842,10 @@
13407
13408 fi
13409 if test "$am_cv_lib_iconv" = yes; then
13410 - echo "$as_me:$LINENO: checking how to link with libiconv" >&5
13411 -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
13412 - echo "$as_me:$LINENO: result: $LIBICONV" >&5
13413 -echo "${ECHO_T}$LIBICONV" >&6
13414 + { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
13415 +echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
13416 + { echo "$as_me:$LINENO: result: $LIBICONV" >&5
13417 +echo "${ECHO_T}$LIBICONV" >&6; }
13418 else
13419 CPPFLAGS="$am_save_CPPFLAGS"
13420 LIBICONV=
13421 @@ -25318,8 +25855,8 @@
13422
13423
13424 if test "$am_cv_func_iconv" = yes; then
13425 - echo "$as_me:$LINENO: checking for iconv declaration" >&5
13426 -echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
13427 + { echo "$as_me:$LINENO: checking for iconv declaration" >&5
13428 +echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
13429 if test "${am_cv_proto_iconv+set}" = set; then
13430 echo $ECHO_N "(cached) $ECHO_C" >&6
13431 else
13432 @@ -25352,42 +25889,39 @@
13433 }
13434 _ACEOF
13435 rm -f conftest.$ac_objext
13436 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13437 - (eval $ac_compile) 2>conftest.er1
13438 +if { (ac_try="$ac_compile"
13439 +case "(($ac_try" in
13440 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13441 + *) ac_try_echo=$ac_try;;
13442 +esac
13443 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13444 + (eval "$ac_compile") 2>conftest.er1
13445 ac_status=$?
13446 grep -v '^ *+' conftest.er1 >conftest.err
13447 rm -f conftest.er1
13448 cat conftest.err >&5
13449 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13450 - (exit $ac_status); } &&
13451 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13452 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13453 - (eval $ac_try) 2>&5
13454 - ac_status=$?
13455 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13456 - (exit $ac_status); }; } &&
13457 - { ac_try='test -s conftest.$ac_objext'
13458 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13459 - (eval $ac_try) 2>&5
13460 - ac_status=$?
13461 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13462 - (exit $ac_status); }; }; then
13463 + (exit $ac_status); } && {
13464 + test -z "$ac_c_werror_flag" ||
13465 + test ! -s conftest.err
13466 + } && test -s conftest.$ac_objext; then
13467 am_cv_proto_iconv_arg1=""
13468 else
13469 echo "$as_me: failed program was:" >&5
13470 sed 's/^/| /' conftest.$ac_ext >&5
13471
13472 -am_cv_proto_iconv_arg1="const"
13473 + am_cv_proto_iconv_arg1="const"
13474 fi
13475 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13476 +
13477 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13478 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
13479 fi
13480
13481 am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
13482 - echo "$as_me:$LINENO: result: ${ac_t:-
13483 + { echo "$as_me:$LINENO: result: ${ac_t:-
13484 }$am_cv_proto_iconv" >&5
13485 echo "${ECHO_T}${ac_t:-
13486 - }$am_cv_proto_iconv" >&6
13487 + }$am_cv_proto_iconv" >&6; }
13488
13489 cat >>confdefs.h <<_ACEOF
13490 #define ICONV_CONST $am_cv_proto_iconv_arg1
13491 @@ -25429,8 +25963,8 @@
13492
13493 AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
13494
13495 -echo "$as_me:$LINENO: checking for gettext" >&5
13496 -echo $ECHO_N "checking for gettext... $ECHO_C" >&6
13497 +{ echo "$as_me:$LINENO: checking for gettext" >&5
13498 +echo $ECHO_N "checking for gettext... $ECHO_C" >&6; }
13499 if test "${ac_cv_func_gettext+set}" = set; then
13500 echo $ECHO_N "(cached) $ECHO_C" >&6
13501 else
13502 @@ -25457,67 +25991,59 @@
13503
13504 #undef gettext
13505
13506 -/* Override any gcc2 internal prototype to avoid an error. */
13507 +/* Override any GCC internal prototype to avoid an error.
13508 + Use char because int might match the return type of a GCC
13509 + builtin and then its argument prototype would still apply. */
13510 #ifdef __cplusplus
13511 extern "C"
13512 -{
13513 #endif
13514 -/* We use char because int might match the return type of a gcc2
13515 - builtin and then its argument prototype would still apply. */
13516 char gettext ();
13517 /* The GNU C library defines this for functions which it implements
13518 to always fail with ENOSYS. Some functions are actually named
13519 something starting with __ and the normal name is an alias. */
13520 -#if defined (__stub_gettext) || defined (__stub___gettext)
13521 +#if defined __stub_gettext || defined __stub___gettext
13522 choke me
13523 -#else
13524 -char (*f) () = gettext;
13525 -#endif
13526 -#ifdef __cplusplus
13527 -}
13528 #endif
13529
13530 int
13531 main ()
13532 {
13533 -return f != gettext;
13534 +return gettext ();
13535 ;
13536 return 0;
13537 }
13538 _ACEOF
13539 rm -f conftest.$ac_objext conftest$ac_exeext
13540 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13541 - (eval $ac_link) 2>conftest.er1
13542 +if { (ac_try="$ac_link"
13543 +case "(($ac_try" in
13544 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13545 + *) ac_try_echo=$ac_try;;
13546 +esac
13547 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13548 + (eval "$ac_link") 2>conftest.er1
13549 ac_status=$?
13550 grep -v '^ *+' conftest.er1 >conftest.err
13551 rm -f conftest.er1
13552 cat conftest.err >&5
13553 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13554 - (exit $ac_status); } &&
13555 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13556 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13557 - (eval $ac_try) 2>&5
13558 - ac_status=$?
13559 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13560 - (exit $ac_status); }; } &&
13561 - { ac_try='test -s conftest$ac_exeext'
13562 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13563 - (eval $ac_try) 2>&5
13564 - ac_status=$?
13565 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13566 - (exit $ac_status); }; }; then
13567 + (exit $ac_status); } && {
13568 + test -z "$ac_c_werror_flag" ||
13569 + test ! -s conftest.err
13570 + } && test -s conftest$ac_exeext &&
13571 + $as_test_x conftest$ac_exeext; then
13572 ac_cv_func_gettext=yes
13573 else
13574 echo "$as_me: failed program was:" >&5
13575 sed 's/^/| /' conftest.$ac_ext >&5
13576
13577 -ac_cv_func_gettext=no
13578 + ac_cv_func_gettext=no
13579 fi
13580 -rm -f conftest.err conftest.$ac_objext \
13581 +
13582 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13583 conftest$ac_exeext conftest.$ac_ext
13584 fi
13585 -echo "$as_me:$LINENO: result: $ac_cv_func_gettext" >&5
13586 -echo "${ECHO_T}$ac_cv_func_gettext" >&6
13587 +{ echo "$as_me:$LINENO: result: $ac_cv_func_gettext" >&5
13588 +echo "${ECHO_T}$ac_cv_func_gettext" >&6; }
13589 if test $ac_cv_func_gettext = yes; then
13590 gettext_without_libintl=true
13591 fi
13592 @@ -25527,8 +26053,8 @@
13593 # we don't have to check for gettext in libintl. Otherwise
13594 # we may even require libintl.
13595 if test "$gettext_without_libintl" != "true" -a "$USE_NLS" = "yes"; then
13596 - echo "$as_me:$LINENO: checking for gettext in -lintl" >&5
13597 -echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6
13598 + { echo "$as_me:$LINENO: checking for gettext in -lintl" >&5
13599 +echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6; }
13600 if test "${ac_cv_lib_intl_gettext+set}" = set; then
13601 echo $ECHO_N "(cached) $ECHO_C" >&6
13602 else
13603 @@ -25541,55 +26067,53 @@
13604 cat >>conftest.$ac_ext <<_ACEOF
13605 /* end confdefs.h. */
13606
13607 -/* Override any gcc2 internal prototype to avoid an error. */
13608 +/* Override any GCC internal prototype to avoid an error.
13609 + Use char because int might match the return type of a GCC
13610 + builtin and then its argument prototype would still apply. */
13611 #ifdef __cplusplus
13612 extern "C"
13613 #endif
13614 -/* We use char because int might match the return type of a gcc2
13615 - builtin and then its argument prototype would still apply. */
13616 char gettext ();
13617 int
13618 main ()
13619 {
13620 -gettext ();
13621 +return gettext ();
13622 ;
13623 return 0;
13624 }
13625 _ACEOF
13626 rm -f conftest.$ac_objext conftest$ac_exeext
13627 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13628 - (eval $ac_link) 2>conftest.er1
13629 +if { (ac_try="$ac_link"
13630 +case "(($ac_try" in
13631 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13632 + *) ac_try_echo=$ac_try;;
13633 +esac
13634 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13635 + (eval "$ac_link") 2>conftest.er1
13636 ac_status=$?
13637 grep -v '^ *+' conftest.er1 >conftest.err
13638 rm -f conftest.er1
13639 cat conftest.err >&5
13640 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13641 - (exit $ac_status); } &&
13642 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13643 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13644 - (eval $ac_try) 2>&5
13645 - ac_status=$?
13646 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13647 - (exit $ac_status); }; } &&
13648 - { ac_try='test -s conftest$ac_exeext'
13649 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13650 - (eval $ac_try) 2>&5
13651 - ac_status=$?
13652 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13653 - (exit $ac_status); }; }; then
13654 + (exit $ac_status); } && {
13655 + test -z "$ac_c_werror_flag" ||
13656 + test ! -s conftest.err
13657 + } && test -s conftest$ac_exeext &&
13658 + $as_test_x conftest$ac_exeext; then
13659 ac_cv_lib_intl_gettext=yes
13660 else
13661 echo "$as_me: failed program was:" >&5
13662 sed 's/^/| /' conftest.$ac_ext >&5
13663
13664 -ac_cv_lib_intl_gettext=no
13665 + ac_cv_lib_intl_gettext=no
13666 fi
13667 -rm -f conftest.err conftest.$ac_objext \
13668 +
13669 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13670 conftest$ac_exeext conftest.$ac_ext
13671 LIBS=$ac_check_lib_save_LIBS
13672 fi
13673 -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
13674 -echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
13675 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
13676 +echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6; }
13677 if test $ac_cv_lib_intl_gettext = yes; then
13678 INTLLIBS="$INTLLIBS -lintl"
13679 fi
13680 @@ -25605,9 +26129,9 @@
13681 ac_header_dirent=no
13682 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
13683 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
13684 -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
13685 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
13686 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
13687 +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
13688 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
13689 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
13690 echo $ECHO_N "(cached) $ECHO_C" >&6
13691 else
13692 cat >conftest.$ac_ext <<_ACEOF
13693 @@ -25629,37 +26153,35 @@
13694 }
13695 _ACEOF
13696 rm -f conftest.$ac_objext
13697 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13698 - (eval $ac_compile) 2>conftest.er1
13699 +if { (ac_try="$ac_compile"
13700 +case "(($ac_try" in
13701 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13702 + *) ac_try_echo=$ac_try;;
13703 +esac
13704 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13705 + (eval "$ac_compile") 2>conftest.er1
13706 ac_status=$?
13707 grep -v '^ *+' conftest.er1 >conftest.err
13708 rm -f conftest.er1
13709 cat conftest.err >&5
13710 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13711 - (exit $ac_status); } &&
13712 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13713 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13714 - (eval $ac_try) 2>&5
13715 - ac_status=$?
13716 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13717 - (exit $ac_status); }; } &&
13718 - { ac_try='test -s conftest.$ac_objext'
13719 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13720 - (eval $ac_try) 2>&5
13721 - ac_status=$?
13722 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13723 - (exit $ac_status); }; }; then
13724 + (exit $ac_status); } && {
13725 + test -z "$ac_c_werror_flag" ||
13726 + test ! -s conftest.err
13727 + } && test -s conftest.$ac_objext; then
13728 eval "$as_ac_Header=yes"
13729 else
13730 echo "$as_me: failed program was:" >&5
13731 sed 's/^/| /' conftest.$ac_ext >&5
13732
13733 -eval "$as_ac_Header=no"
13734 + eval "$as_ac_Header=no"
13735 fi
13736 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13737 +
13738 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13739 fi
13740 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
13741 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
13742 +ac_res=`eval echo '${'$as_ac_Header'}'`
13743 + { echo "$as_me:$LINENO: result: $ac_res" >&5
13744 +echo "${ECHO_T}$ac_res" >&6; }
13745 if test `eval echo '${'$as_ac_Header'}'` = yes; then
13746 cat >>confdefs.h <<_ACEOF
13747 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
13748 @@ -25671,13 +26193,12 @@
13749 done
13750 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
13751 if test $ac_header_dirent = dirent.h; then
13752 - echo "$as_me:$LINENO: checking for library containing opendir" >&5
13753 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
13754 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5
13755 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
13756 if test "${ac_cv_search_opendir+set}" = set; then
13757 echo $ECHO_N "(cached) $ECHO_C" >&6
13758 else
13759 ac_func_search_save_LIBS=$LIBS
13760 -ac_cv_search_opendir=no
13761 cat >conftest.$ac_ext <<_ACEOF
13762 /* confdefs.h. */
13763 _ACEOF
13764 @@ -25685,124 +26206,83 @@
13765 cat >>conftest.$ac_ext <<_ACEOF
13766 /* end confdefs.h. */
13767
13768 -/* Override any gcc2 internal prototype to avoid an error. */
13769 +/* Override any GCC internal prototype to avoid an error.
13770 + Use char because int might match the return type of a GCC
13771 + builtin and then its argument prototype would still apply. */
13772 #ifdef __cplusplus
13773 extern "C"
13774 #endif
13775 -/* We use char because int might match the return type of a gcc2
13776 - builtin and then its argument prototype would still apply. */
13777 char opendir ();
13778 int
13779 main ()
13780 {
13781 -opendir ();
13782 +return opendir ();
13783 ;
13784 return 0;
13785 }
13786 _ACEOF
13787 -rm -f conftest.$ac_objext conftest$ac_exeext
13788 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13789 - (eval $ac_link) 2>conftest.er1
13790 +for ac_lib in '' dir; do
13791 + if test -z "$ac_lib"; then
13792 + ac_res="none required"
13793 + else
13794 + ac_res=-l$ac_lib
13795 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13796 + fi
13797 + rm -f conftest.$ac_objext conftest$ac_exeext
13798 +if { (ac_try="$ac_link"
13799 +case "(($ac_try" in
13800 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13801 + *) ac_try_echo=$ac_try;;
13802 +esac
13803 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13804 + (eval "$ac_link") 2>conftest.er1
13805 ac_status=$?
13806 grep -v '^ *+' conftest.er1 >conftest.err
13807 rm -f conftest.er1
13808 cat conftest.err >&5
13809 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13810 - (exit $ac_status); } &&
13811 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13812 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13813 - (eval $ac_try) 2>&5
13814 - ac_status=$?
13815 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13816 - (exit $ac_status); }; } &&
13817 - { ac_try='test -s conftest$ac_exeext'
13818 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13819 - (eval $ac_try) 2>&5
13820 - ac_status=$?
13821 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13822 - (exit $ac_status); }; }; then
13823 - ac_cv_search_opendir="none required"
13824 + (exit $ac_status); } && {
13825 + test -z "$ac_c_werror_flag" ||
13826 + test ! -s conftest.err
13827 + } && test -s conftest$ac_exeext &&
13828 + $as_test_x conftest$ac_exeext; then
13829 + ac_cv_search_opendir=$ac_res
13830 else
13831 echo "$as_me: failed program was:" >&5
13832 sed 's/^/| /' conftest.$ac_ext >&5
13833
13834 -fi
13835 -rm -f conftest.err conftest.$ac_objext \
13836 - conftest$ac_exeext conftest.$ac_ext
13837 -if test "$ac_cv_search_opendir" = no; then
13838 - for ac_lib in dir; do
13839 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13840 - cat >conftest.$ac_ext <<_ACEOF
13841 -/* confdefs.h. */
13842 -_ACEOF
13843 -cat confdefs.h >>conftest.$ac_ext
13844 -cat >>conftest.$ac_ext <<_ACEOF
13845 -/* end confdefs.h. */
13846
13847 -/* Override any gcc2 internal prototype to avoid an error. */
13848 -#ifdef __cplusplus
13849 -extern "C"
13850 -#endif
13851 -/* We use char because int might match the return type of a gcc2
13852 - builtin and then its argument prototype would still apply. */
13853 -char opendir ();
13854 -int
13855 -main ()
13856 -{
13857 -opendir ();
13858 - ;
13859 - return 0;
13860 -}
13861 -_ACEOF
13862 -rm -f conftest.$ac_objext conftest$ac_exeext
13863 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13864 - (eval $ac_link) 2>conftest.er1
13865 - ac_status=$?
13866 - grep -v '^ *+' conftest.er1 >conftest.err
13867 - rm -f conftest.er1
13868 - cat conftest.err >&5
13869 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13870 - (exit $ac_status); } &&
13871 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13872 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13873 - (eval $ac_try) 2>&5
13874 - ac_status=$?
13875 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13876 - (exit $ac_status); }; } &&
13877 - { ac_try='test -s conftest$ac_exeext'
13878 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13879 - (eval $ac_try) 2>&5
13880 - ac_status=$?
13881 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13882 - (exit $ac_status); }; }; then
13883 - ac_cv_search_opendir="-l$ac_lib"
13884 -break
13885 -else
13886 - echo "$as_me: failed program was:" >&5
13887 -sed 's/^/| /' conftest.$ac_ext >&5
13888 +fi
13889
13890 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13891 + conftest$ac_exeext
13892 + if test "${ac_cv_search_opendir+set}" = set; then
13893 + break
13894 fi
13895 -rm -f conftest.err conftest.$ac_objext \
13896 - conftest$ac_exeext conftest.$ac_ext
13897 - done
13898 +done
13899 +if test "${ac_cv_search_opendir+set}" = set; then
13900 + :
13901 +else
13902 + ac_cv_search_opendir=no
13903 fi
13904 +rm conftest.$ac_ext
13905 LIBS=$ac_func_search_save_LIBS
13906 fi
13907 -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
13908 -echo "${ECHO_T}$ac_cv_search_opendir" >&6
13909 -if test "$ac_cv_search_opendir" != no; then
13910 - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
13911 +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
13912 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
13913 +ac_res=$ac_cv_search_opendir
13914 +if test "$ac_res" != no; then
13915 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13916
13917 fi
13918
13919 else
13920 - echo "$as_me:$LINENO: checking for library containing opendir" >&5
13921 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
13922 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5
13923 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
13924 if test "${ac_cv_search_opendir+set}" = set; then
13925 echo $ECHO_N "(cached) $ECHO_C" >&6
13926 else
13927 ac_func_search_save_LIBS=$LIBS
13928 -ac_cv_search_opendir=no
13929 cat >conftest.$ac_ext <<_ACEOF
13930 /* confdefs.h. */
13931 _ACEOF
13932 @@ -25810,120 +26290,80 @@
13933 cat >>conftest.$ac_ext <<_ACEOF
13934 /* end confdefs.h. */
13935
13936 -/* Override any gcc2 internal prototype to avoid an error. */
13937 +/* Override any GCC internal prototype to avoid an error.
13938 + Use char because int might match the return type of a GCC
13939 + builtin and then its argument prototype would still apply. */
13940 #ifdef __cplusplus
13941 extern "C"
13942 #endif
13943 -/* We use char because int might match the return type of a gcc2
13944 - builtin and then its argument prototype would still apply. */
13945 char opendir ();
13946 int
13947 main ()
13948 {
13949 -opendir ();
13950 +return opendir ();
13951 ;
13952 return 0;
13953 }
13954 _ACEOF
13955 -rm -f conftest.$ac_objext conftest$ac_exeext
13956 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13957 - (eval $ac_link) 2>conftest.er1
13958 +for ac_lib in '' x; do
13959 + if test -z "$ac_lib"; then
13960 + ac_res="none required"
13961 + else
13962 + ac_res=-l$ac_lib
13963 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13964 + fi
13965 + rm -f conftest.$ac_objext conftest$ac_exeext
13966 +if { (ac_try="$ac_link"
13967 +case "(($ac_try" in
13968 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13969 + *) ac_try_echo=$ac_try;;
13970 +esac
13971 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13972 + (eval "$ac_link") 2>conftest.er1
13973 ac_status=$?
13974 grep -v '^ *+' conftest.er1 >conftest.err
13975 rm -f conftest.er1
13976 cat conftest.err >&5
13977 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13978 - (exit $ac_status); } &&
13979 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13980 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13981 - (eval $ac_try) 2>&5
13982 - ac_status=$?
13983 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13984 - (exit $ac_status); }; } &&
13985 - { ac_try='test -s conftest$ac_exeext'
13986 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13987 - (eval $ac_try) 2>&5
13988 - ac_status=$?
13989 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13990 - (exit $ac_status); }; }; then
13991 - ac_cv_search_opendir="none required"
13992 + (exit $ac_status); } && {
13993 + test -z "$ac_c_werror_flag" ||
13994 + test ! -s conftest.err
13995 + } && test -s conftest$ac_exeext &&
13996 + $as_test_x conftest$ac_exeext; then
13997 + ac_cv_search_opendir=$ac_res
13998 else
13999 echo "$as_me: failed program was:" >&5
14000 sed 's/^/| /' conftest.$ac_ext >&5
14001
14002 -fi
14003 -rm -f conftest.err conftest.$ac_objext \
14004 - conftest$ac_exeext conftest.$ac_ext
14005 -if test "$ac_cv_search_opendir" = no; then
14006 - for ac_lib in x; do
14007 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
14008 - cat >conftest.$ac_ext <<_ACEOF
14009 -/* confdefs.h. */
14010 -_ACEOF
14011 -cat confdefs.h >>conftest.$ac_ext
14012 -cat >>conftest.$ac_ext <<_ACEOF
14013 -/* end confdefs.h. */
14014
14015 -/* Override any gcc2 internal prototype to avoid an error. */
14016 -#ifdef __cplusplus
14017 -extern "C"
14018 -#endif
14019 -/* We use char because int might match the return type of a gcc2
14020 - builtin and then its argument prototype would still apply. */
14021 -char opendir ();
14022 -int
14023 -main ()
14024 -{
14025 -opendir ();
14026 - ;
14027 - return 0;
14028 -}
14029 -_ACEOF
14030 -rm -f conftest.$ac_objext conftest$ac_exeext
14031 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14032 - (eval $ac_link) 2>conftest.er1
14033 - ac_status=$?
14034 - grep -v '^ *+' conftest.er1 >conftest.err
14035 - rm -f conftest.er1
14036 - cat conftest.err >&5
14037 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14038 - (exit $ac_status); } &&
14039 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14040 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14041 - (eval $ac_try) 2>&5
14042 - ac_status=$?
14043 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14044 - (exit $ac_status); }; } &&
14045 - { ac_try='test -s conftest$ac_exeext'
14046 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14047 - (eval $ac_try) 2>&5
14048 - ac_status=$?
14049 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14050 - (exit $ac_status); }; }; then
14051 - ac_cv_search_opendir="-l$ac_lib"
14052 -break
14053 -else
14054 - echo "$as_me: failed program was:" >&5
14055 -sed 's/^/| /' conftest.$ac_ext >&5
14056 +fi
14057
14058 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14059 + conftest$ac_exeext
14060 + if test "${ac_cv_search_opendir+set}" = set; then
14061 + break
14062 fi
14063 -rm -f conftest.err conftest.$ac_objext \
14064 - conftest$ac_exeext conftest.$ac_ext
14065 - done
14066 +done
14067 +if test "${ac_cv_search_opendir+set}" = set; then
14068 + :
14069 +else
14070 + ac_cv_search_opendir=no
14071 fi
14072 +rm conftest.$ac_ext
14073 LIBS=$ac_func_search_save_LIBS
14074 fi
14075 -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
14076 -echo "${ECHO_T}$ac_cv_search_opendir" >&6
14077 -if test "$ac_cv_search_opendir" != no; then
14078 - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
14079 +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
14080 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
14081 +ac_res=$ac_cv_search_opendir
14082 +if test "$ac_res" != no; then
14083 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
14084
14085 fi
14086
14087 fi
14088
14089 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
14090 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
14091 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
14092 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
14093 if test "${ac_cv_header_stdc+set}" = set; then
14094 echo $ECHO_N "(cached) $ECHO_C" >&6
14095 else
14096 @@ -25947,34 +26387,31 @@
14097 }
14098 _ACEOF
14099 rm -f conftest.$ac_objext
14100 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14101 - (eval $ac_compile) 2>conftest.er1
14102 +if { (ac_try="$ac_compile"
14103 +case "(($ac_try" in
14104 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14105 + *) ac_try_echo=$ac_try;;
14106 +esac
14107 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14108 + (eval "$ac_compile") 2>conftest.er1
14109 ac_status=$?
14110 grep -v '^ *+' conftest.er1 >conftest.err
14111 rm -f conftest.er1
14112 cat conftest.err >&5
14113 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14114 - (exit $ac_status); } &&
14115 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14116 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14117 - (eval $ac_try) 2>&5
14118 - ac_status=$?
14119 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14120 - (exit $ac_status); }; } &&
14121 - { ac_try='test -s conftest.$ac_objext'
14122 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14123 - (eval $ac_try) 2>&5
14124 - ac_status=$?
14125 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14126 - (exit $ac_status); }; }; then
14127 + (exit $ac_status); } && {
14128 + test -z "$ac_c_werror_flag" ||
14129 + test ! -s conftest.err
14130 + } && test -s conftest.$ac_objext; then
14131 ac_cv_header_stdc=yes
14132 else
14133 echo "$as_me: failed program was:" >&5
14134 sed 's/^/| /' conftest.$ac_ext >&5
14135
14136 -ac_cv_header_stdc=no
14137 + ac_cv_header_stdc=no
14138 fi
14139 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14140 +
14141 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14142
14143 if test $ac_cv_header_stdc = yes; then
14144 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
14145 @@ -26030,6 +26467,7 @@
14146 cat >>conftest.$ac_ext <<_ACEOF
14147 /* end confdefs.h. */
14148 #include <ctype.h>
14149 +#include <stdlib.h>
14150 #if ((' ' & 0x0FF) == 0x020)
14151 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
14152 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
14153 @@ -26049,18 +26487,27 @@
14154 for (i = 0; i < 256; i++)
14155 if (XOR (islower (i), ISLOWER (i))
14156 || toupper (i) != TOUPPER (i))
14157 - exit(2);
14158 - exit (0);
14159 + return 2;
14160 + return 0;
14161 }
14162 _ACEOF
14163 rm -f conftest$ac_exeext
14164 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14165 - (eval $ac_link) 2>&5
14166 +if { (ac_try="$ac_link"
14167 +case "(($ac_try" in
14168 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14169 + *) ac_try_echo=$ac_try;;
14170 +esac
14171 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14172 + (eval "$ac_link") 2>&5
14173 ac_status=$?
14174 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14175 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14176 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14177 - (eval $ac_try) 2>&5
14178 + { (case "(($ac_try" in
14179 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14180 + *) ac_try_echo=$ac_try;;
14181 +esac
14182 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14183 + (eval "$ac_try") 2>&5
14184 ac_status=$?
14185 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14186 (exit $ac_status); }; }; then
14187 @@ -26073,12 +26520,14 @@
14188 ( exit $ac_status )
14189 ac_cv_header_stdc=no
14190 fi
14191 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14192 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14193 fi
14194 +
14195 +
14196 fi
14197 fi
14198 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
14199 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
14200 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
14201 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
14202 if test $ac_cv_header_stdc = yes; then
14203
14204 cat >>confdefs.h <<\_ACEOF
14205 @@ -26088,8 +26537,8 @@
14206 fi
14207
14208
14209 -echo "$as_me:$LINENO: checking for inline" >&5
14210 -echo $ECHO_N "checking for inline... $ECHO_C" >&6
14211 +{ echo "$as_me:$LINENO: checking for inline" >&5
14212 +echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
14213 if test "${ac_cv_c_inline+set}" = set; then
14214 echo $ECHO_N "(cached) $ECHO_C" >&6
14215 else
14216 @@ -26109,38 +26558,37 @@
14217
14218 _ACEOF
14219 rm -f conftest.$ac_objext
14220 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14221 - (eval $ac_compile) 2>conftest.er1
14222 +if { (ac_try="$ac_compile"
14223 +case "(($ac_try" in
14224 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14225 + *) ac_try_echo=$ac_try;;
14226 +esac
14227 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14228 + (eval "$ac_compile") 2>conftest.er1
14229 ac_status=$?
14230 grep -v '^ *+' conftest.er1 >conftest.err
14231 rm -f conftest.er1
14232 cat conftest.err >&5
14233 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14234 - (exit $ac_status); } &&
14235 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14236 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14237 - (eval $ac_try) 2>&5
14238 - ac_status=$?
14239 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14240 - (exit $ac_status); }; } &&
14241 - { ac_try='test -s conftest.$ac_objext'
14242 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14243 - (eval $ac_try) 2>&5
14244 - ac_status=$?
14245 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14246 - (exit $ac_status); }; }; then
14247 - ac_cv_c_inline=$ac_kw; break
14248 + (exit $ac_status); } && {
14249 + test -z "$ac_c_werror_flag" ||
14250 + test ! -s conftest.err
14251 + } && test -s conftest.$ac_objext; then
14252 + ac_cv_c_inline=$ac_kw
14253 else
14254 echo "$as_me: failed program was:" >&5
14255 sed 's/^/| /' conftest.$ac_ext >&5
14256
14257 +
14258 fi
14259 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14260 +
14261 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14262 + test "$ac_cv_c_inline" != no && break
14263 done
14264
14265 fi
14266 -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
14267 -echo "${ECHO_T}$ac_cv_c_inline" >&6
14268 +{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
14269 +echo "${ECHO_T}$ac_cv_c_inline" >&6; }
14270
14271
14272 case $ac_cv_c_inline in
14273 @@ -26158,8 +26606,8 @@
14274 ;;
14275 esac
14276
14277 -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
14278 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
14279 +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
14280 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
14281 if test "${ac_cv_c_const+set}" = set; then
14282 echo $ECHO_N "(cached) $ECHO_C" >&6
14283 else
14284 @@ -26177,10 +26625,10 @@
14285 #ifndef __cplusplus
14286 /* Ultrix mips cc rejects this. */
14287 typedef int charset[2];
14288 - const charset x;
14289 + const charset cs;
14290 /* SunOS 4.1.1 cc rejects this. */
14291 - char const *const *ccp;
14292 - char **p;
14293 + char const *const *pcpcc;
14294 + char **ppc;
14295 /* NEC SVR4.0.2 mips cc rejects this. */
14296 struct point {int x, y;};
14297 static struct point const zero = {0,0};
14298 @@ -26189,16 +26637,17 @@
14299 an arm of an if-expression whose if-part is not a constant
14300 expression */
14301 const char *g = "string";
14302 - ccp = &g + (g ? g-g : 0);
14303 + pcpcc = &g + (g ? g-g : 0);
14304 /* HPUX 7.0 cc rejects these. */
14305 - ++ccp;
14306 - p = (char**) ccp;
14307 - ccp = (char const *const *) p;
14308 + ++pcpcc;
14309 + ppc = (char**) pcpcc;
14310 + pcpcc = (char const *const *) ppc;
14311 { /* SCO 3.2v4 cc rejects this. */
14312 char *t;
14313 char const *s = 0 ? (char *) 0 : (char const *) 0;
14314
14315 *t++ = 0;
14316 + if (s) return 0;
14317 }
14318 { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
14319 int x[] = {25, 17};
14320 @@ -26217,7 +26666,9 @@
14321 }
14322 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
14323 const int foo = 10;
14324 + if (!foo) return 0;
14325 }
14326 + return !cs[0] && !zero.x;
14327 #endif
14328
14329 ;
14330 @@ -26225,37 +26676,34 @@
14331 }
14332 _ACEOF
14333 rm -f conftest.$ac_objext
14334 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14335 - (eval $ac_compile) 2>conftest.er1
14336 +if { (ac_try="$ac_compile"
14337 +case "(($ac_try" in
14338 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14339 + *) ac_try_echo=$ac_try;;
14340 +esac
14341 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14342 + (eval "$ac_compile") 2>conftest.er1
14343 ac_status=$?
14344 grep -v '^ *+' conftest.er1 >conftest.err
14345 rm -f conftest.er1
14346 cat conftest.err >&5
14347 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14348 - (exit $ac_status); } &&
14349 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14350 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14351 - (eval $ac_try) 2>&5
14352 - ac_status=$?
14353 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14354 - (exit $ac_status); }; } &&
14355 - { ac_try='test -s conftest.$ac_objext'
14356 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14357 - (eval $ac_try) 2>&5
14358 - ac_status=$?
14359 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14360 - (exit $ac_status); }; }; then
14361 + (exit $ac_status); } && {
14362 + test -z "$ac_c_werror_flag" ||
14363 + test ! -s conftest.err
14364 + } && test -s conftest.$ac_objext; then
14365 ac_cv_c_const=yes
14366 else
14367 echo "$as_me: failed program was:" >&5
14368 sed 's/^/| /' conftest.$ac_ext >&5
14369
14370 -ac_cv_c_const=no
14371 + ac_cv_c_const=no
14372 fi
14373 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14374 +
14375 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14376 fi
14377 -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
14378 -echo "${ECHO_T}$ac_cv_c_const" >&6
14379 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
14380 +echo "${ECHO_T}$ac_cv_c_const" >&6; }
14381 if test $ac_cv_c_const = no; then
14382
14383 cat >>confdefs.h <<\_ACEOF
14384 @@ -26292,18 +26740,19 @@
14385 endian.h byteswap.h asm/io.h mntent.h
14386 do
14387 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
14388 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
14389 - echo "$as_me:$LINENO: checking for $ac_header" >&5
14390 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14391 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
14392 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14393 + { echo "$as_me:$LINENO: checking for $ac_header" >&5
14394 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
14395 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14396 echo $ECHO_N "(cached) $ECHO_C" >&6
14397 fi
14398 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
14399 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14400 +ac_res=`eval echo '${'$as_ac_Header'}'`
14401 + { echo "$as_me:$LINENO: result: $ac_res" >&5
14402 +echo "${ECHO_T}$ac_res" >&6; }
14403 else
14404 # Is the header compilable?
14405 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
14406 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
14407 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
14408 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
14409 cat >conftest.$ac_ext <<_ACEOF
14410 /* confdefs.h. */
14411 _ACEOF
14412 @@ -26314,40 +26763,37 @@
14413 #include <$ac_header>
14414 _ACEOF
14415 rm -f conftest.$ac_objext
14416 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14417 - (eval $ac_compile) 2>conftest.er1
14418 +if { (ac_try="$ac_compile"
14419 +case "(($ac_try" in
14420 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14421 + *) ac_try_echo=$ac_try;;
14422 +esac
14423 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14424 + (eval "$ac_compile") 2>conftest.er1
14425 ac_status=$?
14426 grep -v '^ *+' conftest.er1 >conftest.err
14427 rm -f conftest.er1
14428 cat conftest.err >&5
14429 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14430 - (exit $ac_status); } &&
14431 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14432 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14433 - (eval $ac_try) 2>&5
14434 - ac_status=$?
14435 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14436 - (exit $ac_status); }; } &&
14437 - { ac_try='test -s conftest.$ac_objext'
14438 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14439 - (eval $ac_try) 2>&5
14440 - ac_status=$?
14441 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14442 - (exit $ac_status); }; }; then
14443 + (exit $ac_status); } && {
14444 + test -z "$ac_c_werror_flag" ||
14445 + test ! -s conftest.err
14446 + } && test -s conftest.$ac_objext; then
14447 ac_header_compiler=yes
14448 else
14449 echo "$as_me: failed program was:" >&5
14450 sed 's/^/| /' conftest.$ac_ext >&5
14451
14452 -ac_header_compiler=no
14453 + ac_header_compiler=no
14454 fi
14455 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14456 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14457 -echo "${ECHO_T}$ac_header_compiler" >&6
14458 +
14459 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14460 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14461 +echo "${ECHO_T}$ac_header_compiler" >&6; }
14462
14463 # Is the header present?
14464 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
14465 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
14466 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
14467 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
14468 cat >conftest.$ac_ext <<_ACEOF
14469 /* confdefs.h. */
14470 _ACEOF
14471 @@ -26356,24 +26802,22 @@
14472 /* end confdefs.h. */
14473 #include <$ac_header>
14474 _ACEOF
14475 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
14476 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14477 +if { (ac_try="$ac_cpp conftest.$ac_ext"
14478 +case "(($ac_try" in
14479 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14480 + *) ac_try_echo=$ac_try;;
14481 +esac
14482 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14483 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
14484 ac_status=$?
14485 grep -v '^ *+' conftest.er1 >conftest.err
14486 rm -f conftest.er1
14487 cat conftest.err >&5
14488 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14489 - (exit $ac_status); } >/dev/null; then
14490 - if test -s conftest.err; then
14491 - ac_cpp_err=$ac_c_preproc_warn_flag
14492 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14493 - else
14494 - ac_cpp_err=
14495 - fi
14496 -else
14497 - ac_cpp_err=yes
14498 -fi
14499 -if test -z "$ac_cpp_err"; then
14500 + (exit $ac_status); } >/dev/null && {
14501 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14502 + test ! -s conftest.err
14503 + }; then
14504 ac_header_preproc=yes
14505 else
14506 echo "$as_me: failed program was:" >&5
14507 @@ -26381,9 +26825,10 @@
14508
14509 ac_header_preproc=no
14510 fi
14511 +
14512 rm -f conftest.err conftest.$ac_ext
14513 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14514 -echo "${ECHO_T}$ac_header_preproc" >&6
14515 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14516 +echo "${ECHO_T}$ac_header_preproc" >&6; }
14517
14518 # So? What about this header?
14519 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14520 @@ -26407,25 +26852,24 @@
14521 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
14522 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
14523 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
14524 - (
14525 - cat <<\_ASBOX
14526 + ( cat <<\_ASBOX
14527 ## ------------------------------------------------- ##
14528 ## Report this to gphoto-devel@lists.sourceforge.net ##
14529 ## ------------------------------------------------- ##
14530 _ASBOX
14531 - ) |
14532 - sed "s/^/$as_me: WARNING: /" >&2
14533 + ) | sed "s/^/$as_me: WARNING: /" >&2
14534 ;;
14535 esac
14536 -echo "$as_me:$LINENO: checking for $ac_header" >&5
14537 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14538 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
14539 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
14540 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
14541 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14542 echo $ECHO_N "(cached) $ECHO_C" >&6
14543 else
14544 eval "$as_ac_Header=\$ac_header_preproc"
14545 fi
14546 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
14547 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14548 +ac_res=`eval echo '${'$as_ac_Header'}'`
14549 + { echo "$as_me:$LINENO: result: $ac_res" >&5
14550 +echo "${ECHO_T}$ac_res" >&6; }
14551
14552 fi
14553 if test `eval echo '${'$as_ac_Header'}'` = yes; then
14554 @@ -26439,17 +26883,17 @@
14555
14556
14557 if test "${ac_cv_header_regex_h+set}" = set; then
14558 - echo "$as_me:$LINENO: checking for regex.h" >&5
14559 -echo $ECHO_N "checking for regex.h... $ECHO_C" >&6
14560 + { echo "$as_me:$LINENO: checking for regex.h" >&5
14561 +echo $ECHO_N "checking for regex.h... $ECHO_C" >&6; }
14562 if test "${ac_cv_header_regex_h+set}" = set; then
14563 echo $ECHO_N "(cached) $ECHO_C" >&6
14564 fi
14565 -echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
14566 -echo "${ECHO_T}$ac_cv_header_regex_h" >&6
14567 +{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
14568 +echo "${ECHO_T}$ac_cv_header_regex_h" >&6; }
14569 else
14570 # Is the header compilable?
14571 -echo "$as_me:$LINENO: checking regex.h usability" >&5
14572 -echo $ECHO_N "checking regex.h usability... $ECHO_C" >&6
14573 +{ echo "$as_me:$LINENO: checking regex.h usability" >&5
14574 +echo $ECHO_N "checking regex.h usability... $ECHO_C" >&6; }
14575 cat >conftest.$ac_ext <<_ACEOF
14576 /* confdefs.h. */
14577 _ACEOF
14578 @@ -26460,40 +26904,37 @@
14579 #include <regex.h>
14580 _ACEOF
14581 rm -f conftest.$ac_objext
14582 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14583 - (eval $ac_compile) 2>conftest.er1
14584 +if { (ac_try="$ac_compile"
14585 +case "(($ac_try" in
14586 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14587 + *) ac_try_echo=$ac_try;;
14588 +esac
14589 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14590 + (eval "$ac_compile") 2>conftest.er1
14591 ac_status=$?
14592 grep -v '^ *+' conftest.er1 >conftest.err
14593 rm -f conftest.er1
14594 cat conftest.err >&5
14595 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14596 - (exit $ac_status); } &&
14597 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14598 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14599 - (eval $ac_try) 2>&5
14600 - ac_status=$?
14601 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14602 - (exit $ac_status); }; } &&
14603 - { ac_try='test -s conftest.$ac_objext'
14604 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14605 - (eval $ac_try) 2>&5
14606 - ac_status=$?
14607 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14608 - (exit $ac_status); }; }; then
14609 + (exit $ac_status); } && {
14610 + test -z "$ac_c_werror_flag" ||
14611 + test ! -s conftest.err
14612 + } && test -s conftest.$ac_objext; then
14613 ac_header_compiler=yes
14614 else
14615 echo "$as_me: failed program was:" >&5
14616 sed 's/^/| /' conftest.$ac_ext >&5
14617
14618 -ac_header_compiler=no
14619 + ac_header_compiler=no
14620 fi
14621 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14622 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14623 -echo "${ECHO_T}$ac_header_compiler" >&6
14624 +
14625 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14626 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14627 +echo "${ECHO_T}$ac_header_compiler" >&6; }
14628
14629 # Is the header present?
14630 -echo "$as_me:$LINENO: checking regex.h presence" >&5
14631 -echo $ECHO_N "checking regex.h presence... $ECHO_C" >&6
14632 +{ echo "$as_me:$LINENO: checking regex.h presence" >&5
14633 +echo $ECHO_N "checking regex.h presence... $ECHO_C" >&6; }
14634 cat >conftest.$ac_ext <<_ACEOF
14635 /* confdefs.h. */
14636 _ACEOF
14637 @@ -26502,24 +26943,22 @@
14638 /* end confdefs.h. */
14639 #include <regex.h>
14640 _ACEOF
14641 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
14642 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14643 +if { (ac_try="$ac_cpp conftest.$ac_ext"
14644 +case "(($ac_try" in
14645 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14646 + *) ac_try_echo=$ac_try;;
14647 +esac
14648 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14649 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
14650 ac_status=$?
14651 grep -v '^ *+' conftest.er1 >conftest.err
14652 rm -f conftest.er1
14653 cat conftest.err >&5
14654 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14655 - (exit $ac_status); } >/dev/null; then
14656 - if test -s conftest.err; then
14657 - ac_cpp_err=$ac_c_preproc_warn_flag
14658 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14659 - else
14660 - ac_cpp_err=
14661 - fi
14662 -else
14663 - ac_cpp_err=yes
14664 -fi
14665 -if test -z "$ac_cpp_err"; then
14666 + (exit $ac_status); } >/dev/null && {
14667 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14668 + test ! -s conftest.err
14669 + }; then
14670 ac_header_preproc=yes
14671 else
14672 echo "$as_me: failed program was:" >&5
14673 @@ -26527,9 +26966,10 @@
14674
14675 ac_header_preproc=no
14676 fi
14677 +
14678 rm -f conftest.err conftest.$ac_ext
14679 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14680 -echo "${ECHO_T}$ac_header_preproc" >&6
14681 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14682 +echo "${ECHO_T}$ac_header_preproc" >&6; }
14683
14684 # So? What about this header?
14685 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14686 @@ -26553,25 +26993,23 @@
14687 echo "$as_me: WARNING: regex.h: proceeding with the preprocessor's result" >&2;}
14688 { echo "$as_me:$LINENO: WARNING: regex.h: in the future, the compiler will take precedence" >&5
14689 echo "$as_me: WARNING: regex.h: in the future, the compiler will take precedence" >&2;}
14690 - (
14691 - cat <<\_ASBOX
14692 + ( cat <<\_ASBOX
14693 ## ------------------------------------------------- ##
14694 ## Report this to gphoto-devel@lists.sourceforge.net ##
14695 ## ------------------------------------------------- ##
14696 _ASBOX
14697 - ) |
14698 - sed "s/^/$as_me: WARNING: /" >&2
14699 + ) | sed "s/^/$as_me: WARNING: /" >&2
14700 ;;
14701 esac
14702 -echo "$as_me:$LINENO: checking for regex.h" >&5
14703 -echo $ECHO_N "checking for regex.h... $ECHO_C" >&6
14704 +{ echo "$as_me:$LINENO: checking for regex.h" >&5
14705 +echo $ECHO_N "checking for regex.h... $ECHO_C" >&6; }
14706 if test "${ac_cv_header_regex_h+set}" = set; then
14707 echo $ECHO_N "(cached) $ECHO_C" >&6
14708 else
14709 ac_cv_header_regex_h=$ac_header_preproc
14710 fi
14711 -echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
14712 -echo "${ECHO_T}$ac_cv_header_regex_h" >&6
14713 +{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
14714 +echo "${ECHO_T}$ac_cv_header_regex_h" >&6; }
14715
14716 fi
14717 if test $ac_cv_header_regex_h = yes; then
14718 @@ -26597,17 +27035,17 @@
14719
14720 MDNS_LIBS=
14721 if test "${ac_cv_header_dns_sd_h+set}" = set; then
14722 - echo "$as_me:$LINENO: checking for dns_sd.h" >&5
14723 -echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6
14724 + { echo "$as_me:$LINENO: checking for dns_sd.h" >&5
14725 +echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6; }
14726 if test "${ac_cv_header_dns_sd_h+set}" = set; then
14727 echo $ECHO_N "(cached) $ECHO_C" >&6
14728 fi
14729 -echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5
14730 -echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6
14731 +{ echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5
14732 +echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6; }
14733 else
14734 # Is the header compilable?
14735 -echo "$as_me:$LINENO: checking dns_sd.h usability" >&5
14736 -echo $ECHO_N "checking dns_sd.h usability... $ECHO_C" >&6
14737 +{ echo "$as_me:$LINENO: checking dns_sd.h usability" >&5
14738 +echo $ECHO_N "checking dns_sd.h usability... $ECHO_C" >&6; }
14739 cat >conftest.$ac_ext <<_ACEOF
14740 /* confdefs.h. */
14741 _ACEOF
14742 @@ -26618,40 +27056,37 @@
14743 #include <dns_sd.h>
14744 _ACEOF
14745 rm -f conftest.$ac_objext
14746 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14747 - (eval $ac_compile) 2>conftest.er1
14748 +if { (ac_try="$ac_compile"
14749 +case "(($ac_try" in
14750 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14751 + *) ac_try_echo=$ac_try;;
14752 +esac
14753 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14754 + (eval "$ac_compile") 2>conftest.er1
14755 ac_status=$?
14756 grep -v '^ *+' conftest.er1 >conftest.err
14757 rm -f conftest.er1
14758 cat conftest.err >&5
14759 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14760 - (exit $ac_status); } &&
14761 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14762 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14763 - (eval $ac_try) 2>&5
14764 - ac_status=$?
14765 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14766 - (exit $ac_status); }; } &&
14767 - { ac_try='test -s conftest.$ac_objext'
14768 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14769 - (eval $ac_try) 2>&5
14770 - ac_status=$?
14771 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14772 - (exit $ac_status); }; }; then
14773 + (exit $ac_status); } && {
14774 + test -z "$ac_c_werror_flag" ||
14775 + test ! -s conftest.err
14776 + } && test -s conftest.$ac_objext; then
14777 ac_header_compiler=yes
14778 else
14779 echo "$as_me: failed program was:" >&5
14780 sed 's/^/| /' conftest.$ac_ext >&5
14781
14782 -ac_header_compiler=no
14783 + ac_header_compiler=no
14784 fi
14785 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14786 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14787 -echo "${ECHO_T}$ac_header_compiler" >&6
14788 +
14789 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14790 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14791 +echo "${ECHO_T}$ac_header_compiler" >&6; }
14792
14793 # Is the header present?
14794 -echo "$as_me:$LINENO: checking dns_sd.h presence" >&5
14795 -echo $ECHO_N "checking dns_sd.h presence... $ECHO_C" >&6
14796 +{ echo "$as_me:$LINENO: checking dns_sd.h presence" >&5
14797 +echo $ECHO_N "checking dns_sd.h presence... $ECHO_C" >&6; }
14798 cat >conftest.$ac_ext <<_ACEOF
14799 /* confdefs.h. */
14800 _ACEOF
14801 @@ -26660,24 +27095,22 @@
14802 /* end confdefs.h. */
14803 #include <dns_sd.h>
14804 _ACEOF
14805 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
14806 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14807 +if { (ac_try="$ac_cpp conftest.$ac_ext"
14808 +case "(($ac_try" in
14809 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14810 + *) ac_try_echo=$ac_try;;
14811 +esac
14812 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14813 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
14814 ac_status=$?
14815 grep -v '^ *+' conftest.er1 >conftest.err
14816 rm -f conftest.er1
14817 cat conftest.err >&5
14818 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14819 - (exit $ac_status); } >/dev/null; then
14820 - if test -s conftest.err; then
14821 - ac_cpp_err=$ac_c_preproc_warn_flag
14822 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14823 - else
14824 - ac_cpp_err=
14825 - fi
14826 -else
14827 - ac_cpp_err=yes
14828 -fi
14829 -if test -z "$ac_cpp_err"; then
14830 + (exit $ac_status); } >/dev/null && {
14831 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14832 + test ! -s conftest.err
14833 + }; then
14834 ac_header_preproc=yes
14835 else
14836 echo "$as_me: failed program was:" >&5
14837 @@ -26685,9 +27118,10 @@
14838
14839 ac_header_preproc=no
14840 fi
14841 +
14842 rm -f conftest.err conftest.$ac_ext
14843 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14844 -echo "${ECHO_T}$ac_header_preproc" >&6
14845 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14846 +echo "${ECHO_T}$ac_header_preproc" >&6; }
14847
14848 # So? What about this header?
14849 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14850 @@ -26711,31 +27145,29 @@
14851 echo "$as_me: WARNING: dns_sd.h: proceeding with the preprocessor's result" >&2;}
14852 { echo "$as_me:$LINENO: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&5
14853 echo "$as_me: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&2;}
14854 - (
14855 - cat <<\_ASBOX
14856 + ( cat <<\_ASBOX
14857 ## ------------------------------------------------- ##
14858 ## Report this to gphoto-devel@lists.sourceforge.net ##
14859 ## ------------------------------------------------- ##
14860 _ASBOX
14861 - ) |
14862 - sed "s/^/$as_me: WARNING: /" >&2
14863 + ) | sed "s/^/$as_me: WARNING: /" >&2
14864 ;;
14865 esac
14866 -echo "$as_me:$LINENO: checking for dns_sd.h" >&5
14867 -echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6
14868 +{ echo "$as_me:$LINENO: checking for dns_sd.h" >&5
14869 +echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6; }
14870 if test "${ac_cv_header_dns_sd_h+set}" = set; then
14871 echo $ECHO_N "(cached) $ECHO_C" >&6
14872 else
14873 ac_cv_header_dns_sd_h=$ac_header_preproc
14874 fi
14875 -echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5
14876 -echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6
14877 +{ echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5
14878 +echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6; }
14879
14880 fi
14881 if test $ac_cv_header_dns_sd_h = yes; then
14882
14883 - echo "$as_me:$LINENO: checking for DNSServiceResolve in -ldns_sd" >&5
14884 -echo $ECHO_N "checking for DNSServiceResolve in -ldns_sd... $ECHO_C" >&6
14885 + { echo "$as_me:$LINENO: checking for DNSServiceResolve in -ldns_sd" >&5
14886 +echo $ECHO_N "checking for DNSServiceResolve in -ldns_sd... $ECHO_C" >&6; }
14887 if test "${ac_cv_lib_dns_sd_DNSServiceResolve+set}" = set; then
14888 echo $ECHO_N "(cached) $ECHO_C" >&6
14889 else
14890 @@ -26748,55 +27180,53 @@
14891 cat >>conftest.$ac_ext <<_ACEOF
14892 /* end confdefs.h. */
14893
14894 -/* Override any gcc2 internal prototype to avoid an error. */
14895 +/* Override any GCC internal prototype to avoid an error.
14896 + Use char because int might match the return type of a GCC
14897 + builtin and then its argument prototype would still apply. */
14898 #ifdef __cplusplus
14899 extern "C"
14900 #endif
14901 -/* We use char because int might match the return type of a gcc2
14902 - builtin and then its argument prototype would still apply. */
14903 char DNSServiceResolve ();
14904 int
14905 main ()
14906 {
14907 -DNSServiceResolve ();
14908 +return DNSServiceResolve ();
14909 ;
14910 return 0;
14911 }
14912 _ACEOF
14913 rm -f conftest.$ac_objext conftest$ac_exeext
14914 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14915 - (eval $ac_link) 2>conftest.er1
14916 +if { (ac_try="$ac_link"
14917 +case "(($ac_try" in
14918 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14919 + *) ac_try_echo=$ac_try;;
14920 +esac
14921 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14922 + (eval "$ac_link") 2>conftest.er1
14923 ac_status=$?
14924 grep -v '^ *+' conftest.er1 >conftest.err
14925 rm -f conftest.er1
14926 cat conftest.err >&5
14927 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14928 - (exit $ac_status); } &&
14929 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14930 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14931 - (eval $ac_try) 2>&5
14932 - ac_status=$?
14933 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14934 - (exit $ac_status); }; } &&
14935 - { ac_try='test -s conftest$ac_exeext'
14936 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14937 - (eval $ac_try) 2>&5
14938 - ac_status=$?
14939 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14940 - (exit $ac_status); }; }; then
14941 + (exit $ac_status); } && {
14942 + test -z "$ac_c_werror_flag" ||
14943 + test ! -s conftest.err
14944 + } && test -s conftest$ac_exeext &&
14945 + $as_test_x conftest$ac_exeext; then
14946 ac_cv_lib_dns_sd_DNSServiceResolve=yes
14947 else
14948 echo "$as_me: failed program was:" >&5
14949 sed 's/^/| /' conftest.$ac_ext >&5
14950
14951 -ac_cv_lib_dns_sd_DNSServiceResolve=no
14952 + ac_cv_lib_dns_sd_DNSServiceResolve=no
14953 fi
14954 -rm -f conftest.err conftest.$ac_objext \
14955 +
14956 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14957 conftest$ac_exeext conftest.$ac_ext
14958 LIBS=$ac_check_lib_save_LIBS
14959 fi
14960 -echo "$as_me:$LINENO: result: $ac_cv_lib_dns_sd_DNSServiceResolve" >&5
14961 -echo "${ECHO_T}$ac_cv_lib_dns_sd_DNSServiceResolve" >&6
14962 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dns_sd_DNSServiceResolve" >&5
14963 +echo "${ECHO_T}$ac_cv_lib_dns_sd_DNSServiceResolve" >&6; }
14964 if test $ac_cv_lib_dns_sd_DNSServiceResolve = yes; then
14965
14966 MDNS_LIBS="-ldns_sd"
14967 @@ -26820,9 +27250,9 @@
14968 for ac_func in strerror snprintf vsnprintf
14969 do
14970 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
14971 -echo "$as_me:$LINENO: checking for $ac_func" >&5
14972 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
14973 -if eval "test \"\${$as_ac_var+set}\" = set"; then
14974 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
14975 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
14976 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
14977 echo $ECHO_N "(cached) $ECHO_C" >&6
14978 else
14979 cat >conftest.$ac_ext <<_ACEOF
14980 @@ -26848,67 +27278,60 @@
14981
14982 #undef $ac_func
14983
14984 -/* Override any gcc2 internal prototype to avoid an error. */
14985 +/* Override any GCC internal prototype to avoid an error.
14986 + Use char because int might match the return type of a GCC
14987 + builtin and then its argument prototype would still apply. */
14988 #ifdef __cplusplus
14989 extern "C"
14990 -{
14991 #endif
14992 -/* We use char because int might match the return type of a gcc2
14993 - builtin and then its argument prototype would still apply. */
14994 char $ac_func ();
14995 /* The GNU C library defines this for functions which it implements
14996 to always fail with ENOSYS. Some functions are actually named
14997 something starting with __ and the normal name is an alias. */
14998 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
14999 +#if defined __stub_$ac_func || defined __stub___$ac_func
15000 choke me
15001 -#else
15002 -char (*f) () = $ac_func;
15003 -#endif
15004 -#ifdef __cplusplus
15005 -}
15006 #endif
15007
15008 int
15009 main ()
15010 {
15011 -return f != $ac_func;
15012 +return $ac_func ();
15013 ;
15014 return 0;
15015 }
15016 _ACEOF
15017 rm -f conftest.$ac_objext conftest$ac_exeext
15018 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15019 - (eval $ac_link) 2>conftest.er1
15020 +if { (ac_try="$ac_link"
15021 +case "(($ac_try" in
15022 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15023 + *) ac_try_echo=$ac_try;;
15024 +esac
15025 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15026 + (eval "$ac_link") 2>conftest.er1
15027 ac_status=$?
15028 grep -v '^ *+' conftest.er1 >conftest.err
15029 rm -f conftest.er1
15030 cat conftest.err >&5
15031 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15032 - (exit $ac_status); } &&
15033 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15034 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15035 - (eval $ac_try) 2>&5
15036 - ac_status=$?
15037 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15038 - (exit $ac_status); }; } &&
15039 - { ac_try='test -s conftest$ac_exeext'
15040 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15041 - (eval $ac_try) 2>&5
15042 - ac_status=$?
15043 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15044 - (exit $ac_status); }; }; then
15045 + (exit $ac_status); } && {
15046 + test -z "$ac_c_werror_flag" ||
15047 + test ! -s conftest.err
15048 + } && test -s conftest$ac_exeext &&
15049 + $as_test_x conftest$ac_exeext; then
15050 eval "$as_ac_var=yes"
15051 else
15052 echo "$as_me: failed program was:" >&5
15053 sed 's/^/| /' conftest.$ac_ext >&5
15054
15055 -eval "$as_ac_var=no"
15056 + eval "$as_ac_var=no"
15057 fi
15058 -rm -f conftest.err conftest.$ac_objext \
15059 +
15060 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15061 conftest$ac_exeext conftest.$ac_ext
15062 fi
15063 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
15064 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
15065 +ac_res=`eval echo '${'$as_ac_var'}'`
15066 + { echo "$as_me:$LINENO: result: $ac_res" >&5
15067 +echo "${ECHO_T}$ac_res" >&6; }
15068 if test `eval echo '${'$as_ac_var'}'` = yes; then
15069 cat >>confdefs.h <<_ACEOF
15070 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
15071 @@ -26934,26 +27357,22 @@
15072 }
15073 _ACEOF
15074 rm -f conftest.$ac_objext
15075 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15076 - (eval $ac_compile) 2>conftest.er1
15077 +if { (ac_try="$ac_compile"
15078 +case "(($ac_try" in
15079 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15080 + *) ac_try_echo=$ac_try;;
15081 +esac
15082 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15083 + (eval "$ac_compile") 2>conftest.er1
15084 ac_status=$?
15085 grep -v '^ *+' conftest.er1 >conftest.err
15086 rm -f conftest.er1
15087 cat conftest.err >&5
15088 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15089 - (exit $ac_status); } &&
15090 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15091 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15092 - (eval $ac_try) 2>&5
15093 - ac_status=$?
15094 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15095 - (exit $ac_status); }; } &&
15096 - { ac_try='test -s conftest.$ac_objext'
15097 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15098 - (eval $ac_try) 2>&5
15099 - ac_status=$?
15100 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15101 - (exit $ac_status); }; }; then
15102 + (exit $ac_status); } && {
15103 + test -z "$ac_c_werror_flag" ||
15104 + test ! -s conftest.err
15105 + } && test -s conftest.$ac_objext; then
15106
15107 cat >>confdefs.h <<\_ACEOF
15108 #define HAVE_RTS_IOCTL 1
15109 @@ -26963,8 +27382,10 @@
15110 echo "$as_me: failed program was:" >&5
15111 sed 's/^/| /' conftest.$ac_ext >&5
15112
15113 +
15114 fi
15115 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15116 +
15117 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15118 cat >conftest.$ac_ext <<_ACEOF
15119 /* confdefs.h. */
15120 _ACEOF
15121 @@ -26981,26 +27402,22 @@
15122 }
15123 _ACEOF
15124 rm -f conftest.$ac_objext
15125 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15126 - (eval $ac_compile) 2>conftest.er1
15127 +if { (ac_try="$ac_compile"
15128 +case "(($ac_try" in
15129 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15130 + *) ac_try_echo=$ac_try;;
15131 +esac
15132 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15133 + (eval "$ac_compile") 2>conftest.er1
15134 ac_status=$?
15135 grep -v '^ *+' conftest.er1 >conftest.err
15136 rm -f conftest.er1
15137 cat conftest.err >&5
15138 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15139 - (exit $ac_status); } &&
15140 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15141 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15142 - (eval $ac_try) 2>&5
15143 - ac_status=$?
15144 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15145 - (exit $ac_status); }; } &&
15146 - { ac_try='test -s conftest.$ac_objext'
15147 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15148 - (eval $ac_try) 2>&5
15149 - ac_status=$?
15150 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15151 - (exit $ac_status); }; }; then
15152 + (exit $ac_status); } && {
15153 + test -z "$ac_c_werror_flag" ||
15154 + test ! -s conftest.err
15155 + } && test -s conftest.$ac_objext; then
15156
15157 cat >>confdefs.h <<\_ACEOF
15158 #define HAVE_RTS_IOCTL 1
15159 @@ -27010,8 +27427,10 @@
15160 echo "$as_me: failed program was:" >&5
15161 sed 's/^/| /' conftest.$ac_ext >&5
15162
15163 +
15164 fi
15165 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15166 +
15167 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15168 cat >conftest.$ac_ext <<_ACEOF
15169 /* confdefs.h. */
15170 _ACEOF
15171 @@ -27028,26 +27447,22 @@
15172 }
15173 _ACEOF
15174 rm -f conftest.$ac_objext
15175 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15176 - (eval $ac_compile) 2>conftest.er1
15177 +if { (ac_try="$ac_compile"
15178 +case "(($ac_try" in
15179 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15180 + *) ac_try_echo=$ac_try;;
15181 +esac
15182 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15183 + (eval "$ac_compile") 2>conftest.er1
15184 ac_status=$?
15185 grep -v '^ *+' conftest.er1 >conftest.err
15186 rm -f conftest.er1
15187 cat conftest.err >&5
15188 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15189 - (exit $ac_status); } &&
15190 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15191 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15192 - (eval $ac_try) 2>&5
15193 - ac_status=$?
15194 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15195 - (exit $ac_status); }; } &&
15196 - { ac_try='test -s conftest.$ac_objext'
15197 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15198 - (eval $ac_try) 2>&5
15199 - ac_status=$?
15200 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15201 - (exit $ac_status); }; }; then
15202 + (exit $ac_status); } && {
15203 + test -z "$ac_c_werror_flag" ||
15204 + test ! -s conftest.err
15205 + } && test -s conftest.$ac_objext; then
15206
15207 cat >>confdefs.h <<\_ACEOF
15208 #define HAVE_RTS_IOCTL 1
15209 @@ -27057,8 +27472,10 @@
15210 echo "$as_me: failed program was:" >&5
15211 sed 's/^/| /' conftest.$ac_ext >&5
15212
15213 +
15214 fi
15215 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15216 +
15217 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15218 cat >conftest.$ac_ext <<_ACEOF
15219 /* confdefs.h. */
15220 _ACEOF
15221 @@ -27075,26 +27492,22 @@
15222 }
15223 _ACEOF
15224 rm -f conftest.$ac_objext
15225 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15226 - (eval $ac_compile) 2>conftest.er1
15227 +if { (ac_try="$ac_compile"
15228 +case "(($ac_try" in
15229 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15230 + *) ac_try_echo=$ac_try;;
15231 +esac
15232 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15233 + (eval "$ac_compile") 2>conftest.er1
15234 ac_status=$?
15235 grep -v '^ *+' conftest.er1 >conftest.err
15236 rm -f conftest.er1
15237 cat conftest.err >&5
15238 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15239 - (exit $ac_status); } &&
15240 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15241 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15242 - (eval $ac_try) 2>&5
15243 - ac_status=$?
15244 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15245 - (exit $ac_status); }; } &&
15246 - { ac_try='test -s conftest.$ac_objext'
15247 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15248 - (eval $ac_try) 2>&5
15249 - ac_status=$?
15250 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15251 - (exit $ac_status); }; }; then
15252 + (exit $ac_status); } && {
15253 + test -z "$ac_c_werror_flag" ||
15254 + test ! -s conftest.err
15255 + } && test -s conftest.$ac_objext; then
15256
15257 cat >>confdefs.h <<\_ACEOF
15258 #define HAVE_RTS_IOCTL 1
15259 @@ -27104,22 +27517,24 @@
15260 echo "$as_me: failed program was:" >&5
15261 sed 's/^/| /' conftest.$ac_ext >&5
15262
15263 +
15264 fi
15265 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15266 +
15267 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15268
15269 # Check for va_copy()
15270 if test "${ac_cv_header_stdarg_h+set}" = set; then
15271 - echo "$as_me:$LINENO: checking for stdarg.h" >&5
15272 -echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
15273 + { echo "$as_me:$LINENO: checking for stdarg.h" >&5
15274 +echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6; }
15275 if test "${ac_cv_header_stdarg_h+set}" = set; then
15276 echo $ECHO_N "(cached) $ECHO_C" >&6
15277 fi
15278 -echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
15279 -echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
15280 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
15281 +echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6; }
15282 else
15283 # Is the header compilable?
15284 -echo "$as_me:$LINENO: checking stdarg.h usability" >&5
15285 -echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6
15286 +{ echo "$as_me:$LINENO: checking stdarg.h usability" >&5
15287 +echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6; }
15288 cat >conftest.$ac_ext <<_ACEOF
15289 /* confdefs.h. */
15290 _ACEOF
15291 @@ -27130,40 +27545,37 @@
15292 #include <stdarg.h>
15293 _ACEOF
15294 rm -f conftest.$ac_objext
15295 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15296 - (eval $ac_compile) 2>conftest.er1
15297 +if { (ac_try="$ac_compile"
15298 +case "(($ac_try" in
15299 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15300 + *) ac_try_echo=$ac_try;;
15301 +esac
15302 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15303 + (eval "$ac_compile") 2>conftest.er1
15304 ac_status=$?
15305 grep -v '^ *+' conftest.er1 >conftest.err
15306 rm -f conftest.er1
15307 cat conftest.err >&5
15308 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15309 - (exit $ac_status); } &&
15310 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15311 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15312 - (eval $ac_try) 2>&5
15313 - ac_status=$?
15314 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15315 - (exit $ac_status); }; } &&
15316 - { ac_try='test -s conftest.$ac_objext'
15317 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15318 - (eval $ac_try) 2>&5
15319 - ac_status=$?
15320 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15321 - (exit $ac_status); }; }; then
15322 + (exit $ac_status); } && {
15323 + test -z "$ac_c_werror_flag" ||
15324 + test ! -s conftest.err
15325 + } && test -s conftest.$ac_objext; then
15326 ac_header_compiler=yes
15327 else
15328 echo "$as_me: failed program was:" >&5
15329 sed 's/^/| /' conftest.$ac_ext >&5
15330
15331 -ac_header_compiler=no
15332 + ac_header_compiler=no
15333 fi
15334 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15335 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15336 -echo "${ECHO_T}$ac_header_compiler" >&6
15337 +
15338 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15339 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15340 +echo "${ECHO_T}$ac_header_compiler" >&6; }
15341
15342 # Is the header present?
15343 -echo "$as_me:$LINENO: checking stdarg.h presence" >&5
15344 -echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6
15345 +{ echo "$as_me:$LINENO: checking stdarg.h presence" >&5
15346 +echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6; }
15347 cat >conftest.$ac_ext <<_ACEOF
15348 /* confdefs.h. */
15349 _ACEOF
15350 @@ -27172,24 +27584,22 @@
15351 /* end confdefs.h. */
15352 #include <stdarg.h>
15353 _ACEOF
15354 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
15355 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
15356 +if { (ac_try="$ac_cpp conftest.$ac_ext"
15357 +case "(($ac_try" in
15358 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15359 + *) ac_try_echo=$ac_try;;
15360 +esac
15361 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15362 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
15363 ac_status=$?
15364 grep -v '^ *+' conftest.er1 >conftest.err
15365 rm -f conftest.er1
15366 cat conftest.err >&5
15367 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15368 - (exit $ac_status); } >/dev/null; then
15369 - if test -s conftest.err; then
15370 - ac_cpp_err=$ac_c_preproc_warn_flag
15371 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15372 - else
15373 - ac_cpp_err=
15374 - fi
15375 -else
15376 - ac_cpp_err=yes
15377 -fi
15378 -if test -z "$ac_cpp_err"; then
15379 + (exit $ac_status); } >/dev/null && {
15380 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15381 + test ! -s conftest.err
15382 + }; then
15383 ac_header_preproc=yes
15384 else
15385 echo "$as_me: failed program was:" >&5
15386 @@ -27197,9 +27607,10 @@
15387
15388 ac_header_preproc=no
15389 fi
15390 +
15391 rm -f conftest.err conftest.$ac_ext
15392 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15393 -echo "${ECHO_T}$ac_header_preproc" >&6
15394 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15395 +echo "${ECHO_T}$ac_header_preproc" >&6; }
15396
15397 # So? What about this header?
15398 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
15399 @@ -27223,25 +27634,23 @@
15400 echo "$as_me: WARNING: stdarg.h: proceeding with the preprocessor's result" >&2;}
15401 { echo "$as_me:$LINENO: WARNING: stdarg.h: in the future, the compiler will take precedence" >&5
15402 echo "$as_me: WARNING: stdarg.h: in the future, the compiler will take precedence" >&2;}
15403 - (
15404 - cat <<\_ASBOX
15405 + ( cat <<\_ASBOX
15406 ## ------------------------------------------------- ##
15407 ## Report this to gphoto-devel@lists.sourceforge.net ##
15408 ## ------------------------------------------------- ##
15409 _ASBOX
15410 - ) |
15411 - sed "s/^/$as_me: WARNING: /" >&2
15412 + ) | sed "s/^/$as_me: WARNING: /" >&2
15413 ;;
15414 esac
15415 -echo "$as_me:$LINENO: checking for stdarg.h" >&5
15416 -echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
15417 +{ echo "$as_me:$LINENO: checking for stdarg.h" >&5
15418 +echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6; }
15419 if test "${ac_cv_header_stdarg_h+set}" = set; then
15420 echo $ECHO_N "(cached) $ECHO_C" >&6
15421 else
15422 ac_cv_header_stdarg_h=$ac_header_preproc
15423 fi
15424 -echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
15425 -echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
15426 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
15427 +echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6; }
15428
15429 fi
15430 if test $ac_cv_header_stdarg_h = yes; then
15431 @@ -27281,26 +27690,23 @@
15432 }
15433 _ACEOF
15434 rm -f conftest.$ac_objext conftest$ac_exeext
15435 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15436 - (eval $ac_link) 2>conftest.er1
15437 +if { (ac_try="$ac_link"
15438 +case "(($ac_try" in
15439 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15440 + *) ac_try_echo=$ac_try;;
15441 +esac
15442 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15443 + (eval "$ac_link") 2>conftest.er1
15444 ac_status=$?
15445 grep -v '^ *+' conftest.er1 >conftest.err
15446 rm -f conftest.er1
15447 cat conftest.err >&5
15448 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15449 - (exit $ac_status); } &&
15450 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15451 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15452 - (eval $ac_try) 2>&5
15453 - ac_status=$?
15454 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15455 - (exit $ac_status); }; } &&
15456 - { ac_try='test -s conftest$ac_exeext'
15457 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15458 - (eval $ac_try) 2>&5
15459 - ac_status=$?
15460 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15461 - (exit $ac_status); }; }; then
15462 + (exit $ac_status); } && {
15463 + test -z "$ac_c_werror_flag" ||
15464 + test ! -s conftest.err
15465 + } && test -s conftest$ac_exeext &&
15466 + $as_test_x conftest$ac_exeext; then
15467
15468 have_va_copy="va_copy"
15469
15470 @@ -27330,26 +27736,23 @@
15471 }
15472 _ACEOF
15473 rm -f conftest.$ac_objext conftest$ac_exeext
15474 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15475 - (eval $ac_link) 2>conftest.er1
15476 +if { (ac_try="$ac_link"
15477 +case "(($ac_try" in
15478 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15479 + *) ac_try_echo=$ac_try;;
15480 +esac
15481 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15482 + (eval "$ac_link") 2>conftest.er1
15483 ac_status=$?
15484 grep -v '^ *+' conftest.er1 >conftest.err
15485 rm -f conftest.er1
15486 cat conftest.err >&5
15487 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15488 - (exit $ac_status); } &&
15489 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15490 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15491 - (eval $ac_try) 2>&5
15492 - ac_status=$?
15493 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15494 - (exit $ac_status); }; } &&
15495 - { ac_try='test -s conftest$ac_exeext'
15496 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15497 - (eval $ac_try) 2>&5
15498 - ac_status=$?
15499 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15500 - (exit $ac_status); }; }; then
15501 + (exit $ac_status); } && {
15502 + test -z "$ac_c_werror_flag" ||
15503 + test ! -s conftest.err
15504 + } && test -s conftest$ac_exeext &&
15505 + $as_test_x conftest$ac_exeext; then
15506
15507 have_va_copy="__va_copy"
15508
15509 @@ -27362,17 +27765,20 @@
15510 echo "$as_me: failed program was:" >&5
15511 sed 's/^/| /' conftest.$ac_ext >&5
15512
15513 +
15514 fi
15515 -rm -f conftest.err conftest.$ac_objext \
15516 +
15517 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15518 conftest$ac_exeext conftest.$ac_ext
15519
15520 fi
15521 -rm -f conftest.err conftest.$ac_objext \
15522 +
15523 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15524 conftest$ac_exeext conftest.$ac_ext
15525 -echo "$as_me:$LINENO: checking for va_copy() or replacement" >&5
15526 -echo $ECHO_N "checking for va_copy() or replacement... $ECHO_C" >&6
15527 -echo "$as_me:$LINENO: result: $have_va_copy" >&5
15528 -echo "${ECHO_T}$have_va_copy" >&6
15529 +{ echo "$as_me:$LINENO: checking for va_copy() or replacement" >&5
15530 +echo $ECHO_N "checking for va_copy() or replacement... $ECHO_C" >&6; }
15531 +{ echo "$as_me:$LINENO: result: $have_va_copy" >&5
15532 +echo "${ECHO_T}$have_va_copy" >&6; }
15533 if test "x$have_va_copy" != "xno"; then
15534
15535 cat >>confdefs.h <<\_ACEOF
15536 @@ -27389,10 +27795,9 @@
15537 try_ttylock=true
15538 try_lockdev=true
15539 try_resmgr=true
15540 -# Check whether --enable-serial or --disable-serial was given.
15541 +# Check whether --enable-serial was given.
15542 if test "${enable_serial+set}" = set; then
15543 - enableval="$enable_serial"
15544 -
15545 + enableval=$enable_serial;
15546 if test x$enableval = xno; then
15547 have_serial=false
15548 serial_msg=no
15549 @@ -27402,7 +27807,8 @@
15550 try_resmgr=false
15551 fi
15552
15553 -fi;
15554 +fi
15555 +
15556 if $have_serial; then
15557 IOLIB_SUBDIRS="$IOLIB_SUBDIRS serial"
15558
15559 @@ -27431,60 +27837,60 @@
15560 if $have_serial; then
15561
15562 # GP_SERLOCK([baudboy])
15563 -# Check whether --enable-baudboy or --disable-baudboy was given.
15564 +# Check whether --enable-baudboy was given.
15565 if test "${enable_baudboy+set}" = set; then
15566 - enableval="$enable_baudboy"
15567 -
15568 + enableval=$enable_baudboy;
15569 if test x$enableval = xno; then
15570 try_baudboy=false
15571 fi
15572
15573 -fi;
15574 +fi
15575 +
15576 # GP_SERLOCK([ttylock])
15577 -# Check whether --enable-ttylock or --disable-ttylock was given.
15578 +# Check whether --enable-ttylock was given.
15579 if test "${enable_ttylock+set}" = set; then
15580 - enableval="$enable_ttylock"
15581 -
15582 + enableval=$enable_ttylock;
15583 if test x$enableval = xno; then
15584 try_ttylock=false
15585 fi
15586
15587 -fi;
15588 +fi
15589 +
15590 # GP_SERLOCK([lockdev])
15591 -# Check whether --enable-lockdev or --disable-lockdev was given.
15592 +# Check whether --enable-lockdev was given.
15593 if test "${enable_lockdev+set}" = set; then
15594 - enableval="$enable_lockdev"
15595 -
15596 + enableval=$enable_lockdev;
15597 if test x$enableval = xno; then
15598 try_lockdev=false
15599 fi
15600
15601 -fi;
15602 +fi
15603 +
15604 # GP_SERLOCK([resmgr])
15605 -# Check whether --enable-resmgr or --disable-resmgr was given.
15606 +# Check whether --enable-resmgr was given.
15607 if test "${enable_resmgr+set}" = set; then
15608 - enableval="$enable_resmgr"
15609 -
15610 + enableval=$enable_resmgr;
15611 if test x$enableval = xno; then
15612 try_resmgr=false
15613 fi
15614
15615 -fi;
15616 +fi
15617 +
15618
15619 resmgr_msg=no
15620 if $try_resmgr; then
15621 if test "${ac_cv_header_resmgr_h+set}" = set; then
15622 - echo "$as_me:$LINENO: checking for resmgr.h" >&5
15623 -echo $ECHO_N "checking for resmgr.h... $ECHO_C" >&6
15624 + { echo "$as_me:$LINENO: checking for resmgr.h" >&5
15625 +echo $ECHO_N "checking for resmgr.h... $ECHO_C" >&6; }
15626 if test "${ac_cv_header_resmgr_h+set}" = set; then
15627 echo $ECHO_N "(cached) $ECHO_C" >&6
15628 fi
15629 -echo "$as_me:$LINENO: result: $ac_cv_header_resmgr_h" >&5
15630 -echo "${ECHO_T}$ac_cv_header_resmgr_h" >&6
15631 +{ echo "$as_me:$LINENO: result: $ac_cv_header_resmgr_h" >&5
15632 +echo "${ECHO_T}$ac_cv_header_resmgr_h" >&6; }
15633 else
15634 # Is the header compilable?
15635 -echo "$as_me:$LINENO: checking resmgr.h usability" >&5
15636 -echo $ECHO_N "checking resmgr.h usability... $ECHO_C" >&6
15637 +{ echo "$as_me:$LINENO: checking resmgr.h usability" >&5
15638 +echo $ECHO_N "checking resmgr.h usability... $ECHO_C" >&6; }
15639 cat >conftest.$ac_ext <<_ACEOF
15640 /* confdefs.h. */
15641 _ACEOF
15642 @@ -27495,40 +27901,37 @@
15643 #include <resmgr.h>
15644 _ACEOF
15645 rm -f conftest.$ac_objext
15646 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15647 - (eval $ac_compile) 2>conftest.er1
15648 +if { (ac_try="$ac_compile"
15649 +case "(($ac_try" in
15650 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15651 + *) ac_try_echo=$ac_try;;
15652 +esac
15653 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15654 + (eval "$ac_compile") 2>conftest.er1
15655 ac_status=$?
15656 grep -v '^ *+' conftest.er1 >conftest.err
15657 rm -f conftest.er1
15658 cat conftest.err >&5
15659 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15660 - (exit $ac_status); } &&
15661 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15662 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15663 - (eval $ac_try) 2>&5
15664 - ac_status=$?
15665 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15666 - (exit $ac_status); }; } &&
15667 - { ac_try='test -s conftest.$ac_objext'
15668 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15669 - (eval $ac_try) 2>&5
15670 - ac_status=$?
15671 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15672 - (exit $ac_status); }; }; then
15673 + (exit $ac_status); } && {
15674 + test -z "$ac_c_werror_flag" ||
15675 + test ! -s conftest.err
15676 + } && test -s conftest.$ac_objext; then
15677 ac_header_compiler=yes
15678 else
15679 echo "$as_me: failed program was:" >&5
15680 sed 's/^/| /' conftest.$ac_ext >&5
15681
15682 -ac_header_compiler=no
15683 + ac_header_compiler=no
15684 fi
15685 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15686 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15687 -echo "${ECHO_T}$ac_header_compiler" >&6
15688 +
15689 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15690 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15691 +echo "${ECHO_T}$ac_header_compiler" >&6; }
15692
15693 # Is the header present?
15694 -echo "$as_me:$LINENO: checking resmgr.h presence" >&5
15695 -echo $ECHO_N "checking resmgr.h presence... $ECHO_C" >&6
15696 +{ echo "$as_me:$LINENO: checking resmgr.h presence" >&5
15697 +echo $ECHO_N "checking resmgr.h presence... $ECHO_C" >&6; }
15698 cat >conftest.$ac_ext <<_ACEOF
15699 /* confdefs.h. */
15700 _ACEOF
15701 @@ -27537,24 +27940,22 @@
15702 /* end confdefs.h. */
15703 #include <resmgr.h>
15704 _ACEOF
15705 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
15706 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
15707 +if { (ac_try="$ac_cpp conftest.$ac_ext"
15708 +case "(($ac_try" in
15709 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15710 + *) ac_try_echo=$ac_try;;
15711 +esac
15712 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15713 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
15714 ac_status=$?
15715 grep -v '^ *+' conftest.er1 >conftest.err
15716 rm -f conftest.er1
15717 cat conftest.err >&5
15718 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15719 - (exit $ac_status); } >/dev/null; then
15720 - if test -s conftest.err; then
15721 - ac_cpp_err=$ac_c_preproc_warn_flag
15722 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15723 - else
15724 - ac_cpp_err=
15725 - fi
15726 -else
15727 - ac_cpp_err=yes
15728 -fi
15729 -if test -z "$ac_cpp_err"; then
15730 + (exit $ac_status); } >/dev/null && {
15731 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15732 + test ! -s conftest.err
15733 + }; then
15734 ac_header_preproc=yes
15735 else
15736 echo "$as_me: failed program was:" >&5
15737 @@ -27562,9 +27963,10 @@
15738
15739 ac_header_preproc=no
15740 fi
15741 +
15742 rm -f conftest.err conftest.$ac_ext
15743 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15744 -echo "${ECHO_T}$ac_header_preproc" >&6
15745 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15746 +echo "${ECHO_T}$ac_header_preproc" >&6; }
15747
15748 # So? What about this header?
15749 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
15750 @@ -27588,31 +27990,29 @@
15751 echo "$as_me: WARNING: resmgr.h: proceeding with the preprocessor's result" >&2;}
15752 { echo "$as_me:$LINENO: WARNING: resmgr.h: in the future, the compiler will take precedence" >&5
15753 echo "$as_me: WARNING: resmgr.h: in the future, the compiler will take precedence" >&2;}
15754 - (
15755 - cat <<\_ASBOX
15756 + ( cat <<\_ASBOX
15757 ## ------------------------------------------------- ##
15758 ## Report this to gphoto-devel@lists.sourceforge.net ##
15759 ## ------------------------------------------------- ##
15760 _ASBOX
15761 - ) |
15762 - sed "s/^/$as_me: WARNING: /" >&2
15763 + ) | sed "s/^/$as_me: WARNING: /" >&2
15764 ;;
15765 esac
15766 -echo "$as_me:$LINENO: checking for resmgr.h" >&5
15767 -echo $ECHO_N "checking for resmgr.h... $ECHO_C" >&6
15768 +{ echo "$as_me:$LINENO: checking for resmgr.h" >&5
15769 +echo $ECHO_N "checking for resmgr.h... $ECHO_C" >&6; }
15770 if test "${ac_cv_header_resmgr_h+set}" = set; then
15771 echo $ECHO_N "(cached) $ECHO_C" >&6
15772 else
15773 ac_cv_header_resmgr_h=$ac_header_preproc
15774 fi
15775 -echo "$as_me:$LINENO: result: $ac_cv_header_resmgr_h" >&5
15776 -echo "${ECHO_T}$ac_cv_header_resmgr_h" >&6
15777 +{ echo "$as_me:$LINENO: result: $ac_cv_header_resmgr_h" >&5
15778 +echo "${ECHO_T}$ac_cv_header_resmgr_h" >&6; }
15779
15780 fi
15781 if test $ac_cv_header_resmgr_h = yes; then
15782
15783 - echo "$as_me:$LINENO: checking for rsm_lock_device in -lresmgr" >&5
15784 -echo $ECHO_N "checking for rsm_lock_device in -lresmgr... $ECHO_C" >&6
15785 + { echo "$as_me:$LINENO: checking for rsm_lock_device in -lresmgr" >&5
15786 +echo $ECHO_N "checking for rsm_lock_device in -lresmgr... $ECHO_C" >&6; }
15787 if test "${ac_cv_lib_resmgr_rsm_lock_device+set}" = set; then
15788 echo $ECHO_N "(cached) $ECHO_C" >&6
15789 else
15790 @@ -27625,55 +28025,53 @@
15791 cat >>conftest.$ac_ext <<_ACEOF
15792 /* end confdefs.h. */
15793
15794 -/* Override any gcc2 internal prototype to avoid an error. */
15795 +/* Override any GCC internal prototype to avoid an error.
15796 + Use char because int might match the return type of a GCC
15797 + builtin and then its argument prototype would still apply. */
15798 #ifdef __cplusplus
15799 extern "C"
15800 #endif
15801 -/* We use char because int might match the return type of a gcc2
15802 - builtin and then its argument prototype would still apply. */
15803 char rsm_lock_device ();
15804 int
15805 main ()
15806 {
15807 -rsm_lock_device ();
15808 +return rsm_lock_device ();
15809 ;
15810 return 0;
15811 }
15812 _ACEOF
15813 rm -f conftest.$ac_objext conftest$ac_exeext
15814 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15815 - (eval $ac_link) 2>conftest.er1
15816 +if { (ac_try="$ac_link"
15817 +case "(($ac_try" in
15818 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15819 + *) ac_try_echo=$ac_try;;
15820 +esac
15821 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15822 + (eval "$ac_link") 2>conftest.er1
15823 ac_status=$?
15824 grep -v '^ *+' conftest.er1 >conftest.err
15825 rm -f conftest.er1
15826 cat conftest.err >&5
15827 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15828 - (exit $ac_status); } &&
15829 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15830 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15831 - (eval $ac_try) 2>&5
15832 - ac_status=$?
15833 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15834 - (exit $ac_status); }; } &&
15835 - { ac_try='test -s conftest$ac_exeext'
15836 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15837 - (eval $ac_try) 2>&5
15838 - ac_status=$?
15839 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15840 - (exit $ac_status); }; }; then
15841 + (exit $ac_status); } && {
15842 + test -z "$ac_c_werror_flag" ||
15843 + test ! -s conftest.err
15844 + } && test -s conftest$ac_exeext &&
15845 + $as_test_x conftest$ac_exeext; then
15846 ac_cv_lib_resmgr_rsm_lock_device=yes
15847 else
15848 echo "$as_me: failed program was:" >&5
15849 sed 's/^/| /' conftest.$ac_ext >&5
15850
15851 -ac_cv_lib_resmgr_rsm_lock_device=no
15852 + ac_cv_lib_resmgr_rsm_lock_device=no
15853 fi
15854 -rm -f conftest.err conftest.$ac_objext \
15855 +
15856 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15857 conftest$ac_exeext conftest.$ac_ext
15858 LIBS=$ac_check_lib_save_LIBS
15859 fi
15860 -echo "$as_me:$LINENO: result: $ac_cv_lib_resmgr_rsm_lock_device" >&5
15861 -echo "${ECHO_T}$ac_cv_lib_resmgr_rsm_lock_device" >&6
15862 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resmgr_rsm_lock_device" >&5
15863 +echo "${ECHO_T}$ac_cv_lib_resmgr_rsm_lock_device" >&6; }
15864 if test $ac_cv_lib_resmgr_rsm_lock_device = yes; then
15865
15866 resmgr_msg=yes
15867 @@ -27705,17 +28103,17 @@
15868 baudboy_msg=no
15869 if $try_baudboy; then
15870 if test "${ac_cv_header_baudboy_h+set}" = set; then
15871 - echo "$as_me:$LINENO: checking for baudboy.h" >&5
15872 -echo $ECHO_N "checking for baudboy.h... $ECHO_C" >&6
15873 + { echo "$as_me:$LINENO: checking for baudboy.h" >&5
15874 +echo $ECHO_N "checking for baudboy.h... $ECHO_C" >&6; }
15875 if test "${ac_cv_header_baudboy_h+set}" = set; then
15876 echo $ECHO_N "(cached) $ECHO_C" >&6
15877 fi
15878 -echo "$as_me:$LINENO: result: $ac_cv_header_baudboy_h" >&5
15879 -echo "${ECHO_T}$ac_cv_header_baudboy_h" >&6
15880 +{ echo "$as_me:$LINENO: result: $ac_cv_header_baudboy_h" >&5
15881 +echo "${ECHO_T}$ac_cv_header_baudboy_h" >&6; }
15882 else
15883 # Is the header compilable?
15884 -echo "$as_me:$LINENO: checking baudboy.h usability" >&5
15885 -echo $ECHO_N "checking baudboy.h usability... $ECHO_C" >&6
15886 +{ echo "$as_me:$LINENO: checking baudboy.h usability" >&5
15887 +echo $ECHO_N "checking baudboy.h usability... $ECHO_C" >&6; }
15888 cat >conftest.$ac_ext <<_ACEOF
15889 /* confdefs.h. */
15890 _ACEOF
15891 @@ -27726,40 +28124,37 @@
15892 #include <baudboy.h>
15893 _ACEOF
15894 rm -f conftest.$ac_objext
15895 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15896 - (eval $ac_compile) 2>conftest.er1
15897 +if { (ac_try="$ac_compile"
15898 +case "(($ac_try" in
15899 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15900 + *) ac_try_echo=$ac_try;;
15901 +esac
15902 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15903 + (eval "$ac_compile") 2>conftest.er1
15904 ac_status=$?
15905 grep -v '^ *+' conftest.er1 >conftest.err
15906 rm -f conftest.er1
15907 cat conftest.err >&5
15908 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15909 - (exit $ac_status); } &&
15910 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15911 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15912 - (eval $ac_try) 2>&5
15913 - ac_status=$?
15914 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15915 - (exit $ac_status); }; } &&
15916 - { ac_try='test -s conftest.$ac_objext'
15917 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15918 - (eval $ac_try) 2>&5
15919 - ac_status=$?
15920 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15921 - (exit $ac_status); }; }; then
15922 + (exit $ac_status); } && {
15923 + test -z "$ac_c_werror_flag" ||
15924 + test ! -s conftest.err
15925 + } && test -s conftest.$ac_objext; then
15926 ac_header_compiler=yes
15927 else
15928 echo "$as_me: failed program was:" >&5
15929 sed 's/^/| /' conftest.$ac_ext >&5
15930
15931 -ac_header_compiler=no
15932 + ac_header_compiler=no
15933 fi
15934 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15935 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15936 -echo "${ECHO_T}$ac_header_compiler" >&6
15937 +
15938 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15939 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15940 +echo "${ECHO_T}$ac_header_compiler" >&6; }
15941
15942 # Is the header present?
15943 -echo "$as_me:$LINENO: checking baudboy.h presence" >&5
15944 -echo $ECHO_N "checking baudboy.h presence... $ECHO_C" >&6
15945 +{ echo "$as_me:$LINENO: checking baudboy.h presence" >&5
15946 +echo $ECHO_N "checking baudboy.h presence... $ECHO_C" >&6; }
15947 cat >conftest.$ac_ext <<_ACEOF
15948 /* confdefs.h. */
15949 _ACEOF
15950 @@ -27768,24 +28163,22 @@
15951 /* end confdefs.h. */
15952 #include <baudboy.h>
15953 _ACEOF
15954 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
15955 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
15956 +if { (ac_try="$ac_cpp conftest.$ac_ext"
15957 +case "(($ac_try" in
15958 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15959 + *) ac_try_echo=$ac_try;;
15960 +esac
15961 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15962 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
15963 ac_status=$?
15964 grep -v '^ *+' conftest.er1 >conftest.err
15965 rm -f conftest.er1
15966 cat conftest.err >&5
15967 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15968 - (exit $ac_status); } >/dev/null; then
15969 - if test -s conftest.err; then
15970 - ac_cpp_err=$ac_c_preproc_warn_flag
15971 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15972 - else
15973 - ac_cpp_err=
15974 - fi
15975 -else
15976 - ac_cpp_err=yes
15977 -fi
15978 -if test -z "$ac_cpp_err"; then
15979 + (exit $ac_status); } >/dev/null && {
15980 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15981 + test ! -s conftest.err
15982 + }; then
15983 ac_header_preproc=yes
15984 else
15985 echo "$as_me: failed program was:" >&5
15986 @@ -27793,9 +28186,10 @@
15987
15988 ac_header_preproc=no
15989 fi
15990 +
15991 rm -f conftest.err conftest.$ac_ext
15992 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15993 -echo "${ECHO_T}$ac_header_preproc" >&6
15994 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15995 +echo "${ECHO_T}$ac_header_preproc" >&6; }
15996
15997 # So? What about this header?
15998 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
15999 @@ -27819,25 +28213,23 @@
16000 echo "$as_me: WARNING: baudboy.h: proceeding with the preprocessor's result" >&2;}
16001 { echo "$as_me:$LINENO: WARNING: baudboy.h: in the future, the compiler will take precedence" >&5
16002 echo "$as_me: WARNING: baudboy.h: in the future, the compiler will take precedence" >&2;}
16003 - (
16004 - cat <<\_ASBOX
16005 + ( cat <<\_ASBOX
16006 ## ------------------------------------------------- ##
16007 ## Report this to gphoto-devel@lists.sourceforge.net ##
16008 ## ------------------------------------------------- ##
16009 _ASBOX
16010 - ) |
16011 - sed "s/^/$as_me: WARNING: /" >&2
16012 + ) | sed "s/^/$as_me: WARNING: /" >&2
16013 ;;
16014 esac
16015 -echo "$as_me:$LINENO: checking for baudboy.h" >&5
16016 -echo $ECHO_N "checking for baudboy.h... $ECHO_C" >&6
16017 +{ echo "$as_me:$LINENO: checking for baudboy.h" >&5
16018 +echo $ECHO_N "checking for baudboy.h... $ECHO_C" >&6; }
16019 if test "${ac_cv_header_baudboy_h+set}" = set; then
16020 echo $ECHO_N "(cached) $ECHO_C" >&6
16021 else
16022 ac_cv_header_baudboy_h=$ac_header_preproc
16023 fi
16024 -echo "$as_me:$LINENO: result: $ac_cv_header_baudboy_h" >&5
16025 -echo "${ECHO_T}$ac_cv_header_baudboy_h" >&6
16026 +{ echo "$as_me:$LINENO: result: $ac_cv_header_baudboy_h" >&5
16027 +echo "${ECHO_T}$ac_cv_header_baudboy_h" >&6; }
16028
16029 fi
16030 if test $ac_cv_header_baudboy_h = yes; then
16031 @@ -27869,17 +28261,17 @@
16032 ttylock_msg=no
16033 if $try_ttylock; then
16034 if test "${ac_cv_header_lockdev_h+set}" = set; then
16035 - echo "$as_me:$LINENO: checking for lockdev.h" >&5
16036 -echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6
16037 + { echo "$as_me:$LINENO: checking for lockdev.h" >&5
16038 +echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6; }
16039 if test "${ac_cv_header_lockdev_h+set}" = set; then
16040 echo $ECHO_N "(cached) $ECHO_C" >&6
16041 fi
16042 -echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16043 -echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6
16044 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16045 +echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6; }
16046 else
16047 # Is the header compilable?
16048 -echo "$as_me:$LINENO: checking lockdev.h usability" >&5
16049 -echo $ECHO_N "checking lockdev.h usability... $ECHO_C" >&6
16050 +{ echo "$as_me:$LINENO: checking lockdev.h usability" >&5
16051 +echo $ECHO_N "checking lockdev.h usability... $ECHO_C" >&6; }
16052 cat >conftest.$ac_ext <<_ACEOF
16053 /* confdefs.h. */
16054 _ACEOF
16055 @@ -27890,40 +28282,37 @@
16056 #include <lockdev.h>
16057 _ACEOF
16058 rm -f conftest.$ac_objext
16059 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16060 - (eval $ac_compile) 2>conftest.er1
16061 +if { (ac_try="$ac_compile"
16062 +case "(($ac_try" in
16063 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16064 + *) ac_try_echo=$ac_try;;
16065 +esac
16066 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16067 + (eval "$ac_compile") 2>conftest.er1
16068 ac_status=$?
16069 grep -v '^ *+' conftest.er1 >conftest.err
16070 rm -f conftest.er1
16071 cat conftest.err >&5
16072 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16073 - (exit $ac_status); } &&
16074 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16075 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16076 - (eval $ac_try) 2>&5
16077 - ac_status=$?
16078 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16079 - (exit $ac_status); }; } &&
16080 - { ac_try='test -s conftest.$ac_objext'
16081 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16082 - (eval $ac_try) 2>&5
16083 - ac_status=$?
16084 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16085 - (exit $ac_status); }; }; then
16086 + (exit $ac_status); } && {
16087 + test -z "$ac_c_werror_flag" ||
16088 + test ! -s conftest.err
16089 + } && test -s conftest.$ac_objext; then
16090 ac_header_compiler=yes
16091 else
16092 echo "$as_me: failed program was:" >&5
16093 sed 's/^/| /' conftest.$ac_ext >&5
16094
16095 -ac_header_compiler=no
16096 + ac_header_compiler=no
16097 fi
16098 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16099 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
16100 -echo "${ECHO_T}$ac_header_compiler" >&6
16101 +
16102 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16103 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
16104 +echo "${ECHO_T}$ac_header_compiler" >&6; }
16105
16106 # Is the header present?
16107 -echo "$as_me:$LINENO: checking lockdev.h presence" >&5
16108 -echo $ECHO_N "checking lockdev.h presence... $ECHO_C" >&6
16109 +{ echo "$as_me:$LINENO: checking lockdev.h presence" >&5
16110 +echo $ECHO_N "checking lockdev.h presence... $ECHO_C" >&6; }
16111 cat >conftest.$ac_ext <<_ACEOF
16112 /* confdefs.h. */
16113 _ACEOF
16114 @@ -27932,24 +28321,22 @@
16115 /* end confdefs.h. */
16116 #include <lockdev.h>
16117 _ACEOF
16118 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
16119 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
16120 +if { (ac_try="$ac_cpp conftest.$ac_ext"
16121 +case "(($ac_try" in
16122 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16123 + *) ac_try_echo=$ac_try;;
16124 +esac
16125 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16126 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
16127 ac_status=$?
16128 grep -v '^ *+' conftest.er1 >conftest.err
16129 rm -f conftest.er1
16130 cat conftest.err >&5
16131 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16132 - (exit $ac_status); } >/dev/null; then
16133 - if test -s conftest.err; then
16134 - ac_cpp_err=$ac_c_preproc_warn_flag
16135 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
16136 - else
16137 - ac_cpp_err=
16138 - fi
16139 -else
16140 - ac_cpp_err=yes
16141 -fi
16142 -if test -z "$ac_cpp_err"; then
16143 + (exit $ac_status); } >/dev/null && {
16144 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
16145 + test ! -s conftest.err
16146 + }; then
16147 ac_header_preproc=yes
16148 else
16149 echo "$as_me: failed program was:" >&5
16150 @@ -27957,9 +28344,10 @@
16151
16152 ac_header_preproc=no
16153 fi
16154 +
16155 rm -f conftest.err conftest.$ac_ext
16156 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
16157 -echo "${ECHO_T}$ac_header_preproc" >&6
16158 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
16159 +echo "${ECHO_T}$ac_header_preproc" >&6; }
16160
16161 # So? What about this header?
16162 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
16163 @@ -27983,31 +28371,29 @@
16164 echo "$as_me: WARNING: lockdev.h: proceeding with the preprocessor's result" >&2;}
16165 { echo "$as_me:$LINENO: WARNING: lockdev.h: in the future, the compiler will take precedence" >&5
16166 echo "$as_me: WARNING: lockdev.h: in the future, the compiler will take precedence" >&2;}
16167 - (
16168 - cat <<\_ASBOX
16169 + ( cat <<\_ASBOX
16170 ## ------------------------------------------------- ##
16171 ## Report this to gphoto-devel@lists.sourceforge.net ##
16172 ## ------------------------------------------------- ##
16173 _ASBOX
16174 - ) |
16175 - sed "s/^/$as_me: WARNING: /" >&2
16176 + ) | sed "s/^/$as_me: WARNING: /" >&2
16177 ;;
16178 esac
16179 -echo "$as_me:$LINENO: checking for lockdev.h" >&5
16180 -echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6
16181 +{ echo "$as_me:$LINENO: checking for lockdev.h" >&5
16182 +echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6; }
16183 if test "${ac_cv_header_lockdev_h+set}" = set; then
16184 echo $ECHO_N "(cached) $ECHO_C" >&6
16185 else
16186 ac_cv_header_lockdev_h=$ac_header_preproc
16187 fi
16188 -echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16189 -echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6
16190 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16191 +echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6; }
16192
16193 fi
16194
16195
16196 - echo "$as_me:$LINENO: checking for ttylock.h" >&5
16197 -echo $ECHO_N "checking for ttylock.h... $ECHO_C" >&6
16198 + { echo "$as_me:$LINENO: checking for ttylock.h" >&5
16199 +echo $ECHO_N "checking for ttylock.h... $ECHO_C" >&6; }
16200 if test "${ac_cv_header_ttylock_h+set}" = set; then
16201 echo $ECHO_N "(cached) $ECHO_C" >&6
16202 else
16203 @@ -28025,37 +28411,34 @@
16204 #include <ttylock.h>
16205 _ACEOF
16206 rm -f conftest.$ac_objext
16207 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16208 - (eval $ac_compile) 2>conftest.er1
16209 +if { (ac_try="$ac_compile"
16210 +case "(($ac_try" in
16211 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16212 + *) ac_try_echo=$ac_try;;
16213 +esac
16214 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16215 + (eval "$ac_compile") 2>conftest.er1
16216 ac_status=$?
16217 grep -v '^ *+' conftest.er1 >conftest.err
16218 rm -f conftest.er1
16219 cat conftest.err >&5
16220 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16221 - (exit $ac_status); } &&
16222 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16223 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16224 - (eval $ac_try) 2>&5
16225 - ac_status=$?
16226 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16227 - (exit $ac_status); }; } &&
16228 - { ac_try='test -s conftest.$ac_objext'
16229 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16230 - (eval $ac_try) 2>&5
16231 - ac_status=$?
16232 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16233 - (exit $ac_status); }; }; then
16234 + (exit $ac_status); } && {
16235 + test -z "$ac_c_werror_flag" ||
16236 + test ! -s conftest.err
16237 + } && test -s conftest.$ac_objext; then
16238 ac_cv_header_ttylock_h=yes
16239 else
16240 echo "$as_me: failed program was:" >&5
16241 sed 's/^/| /' conftest.$ac_ext >&5
16242
16243 -ac_cv_header_ttylock_h=no
16244 + ac_cv_header_ttylock_h=no
16245 fi
16246 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16247 +
16248 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16249 fi
16250 -echo "$as_me:$LINENO: result: $ac_cv_header_ttylock_h" >&5
16251 -echo "${ECHO_T}$ac_cv_header_ttylock_h" >&6
16252 +{ echo "$as_me:$LINENO: result: $ac_cv_header_ttylock_h" >&5
16253 +echo "${ECHO_T}$ac_cv_header_ttylock_h" >&6; }
16254 if test $ac_cv_header_ttylock_h = yes; then
16255
16256 lockdev_result="no"
16257 @@ -28075,26 +28458,23 @@
16258 }
16259 _ACEOF
16260 rm -f conftest.$ac_objext conftest$ac_exeext
16261 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16262 - (eval $ac_link) 2>conftest.er1
16263 +if { (ac_try="$ac_link"
16264 +case "(($ac_try" in
16265 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16266 + *) ac_try_echo=$ac_try;;
16267 +esac
16268 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16269 + (eval "$ac_link") 2>conftest.er1
16270 ac_status=$?
16271 grep -v '^ *+' conftest.er1 >conftest.err
16272 rm -f conftest.er1
16273 cat conftest.err >&5
16274 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16275 - (exit $ac_status); } &&
16276 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16277 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16278 - (eval $ac_try) 2>&5
16279 - ac_status=$?
16280 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16281 - (exit $ac_status); }; } &&
16282 - { ac_try='test -s conftest$ac_exeext'
16283 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16284 - (eval $ac_try) 2>&5
16285 - ac_status=$?
16286 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16287 - (exit $ac_status); }; }; then
16288 + (exit $ac_status); } && {
16289 + test -z "$ac_c_werror_flag" ||
16290 + test ! -s conftest.err
16291 + } && test -s conftest$ac_exeext &&
16292 + $as_test_x conftest$ac_exeext; then
16293
16294 lockdev_result="no"
16295
16296 @@ -28121,26 +28501,23 @@
16297 }
16298 _ACEOF
16299 rm -f conftest.$ac_objext conftest$ac_exeext
16300 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16301 - (eval $ac_link) 2>conftest.er1
16302 +if { (ac_try="$ac_link"
16303 +case "(($ac_try" in
16304 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16305 + *) ac_try_echo=$ac_try;;
16306 +esac
16307 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16308 + (eval "$ac_link") 2>conftest.er1
16309 ac_status=$?
16310 grep -v '^ *+' conftest.er1 >conftest.err
16311 rm -f conftest.er1
16312 cat conftest.err >&5
16313 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16314 - (exit $ac_status); } &&
16315 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16316 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16317 - (eval $ac_try) 2>&5
16318 - ac_status=$?
16319 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16320 - (exit $ac_status); }; } &&
16321 - { ac_try='test -s conftest$ac_exeext'
16322 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16323 - (eval $ac_try) 2>&5
16324 - ac_status=$?
16325 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16326 - (exit $ac_status); }; }; then
16327 + (exit $ac_status); } && {
16328 + test -z "$ac_c_werror_flag" ||
16329 + test ! -s conftest.err
16330 + } && test -s conftest$ac_exeext &&
16331 + $as_test_x conftest$ac_exeext; then
16332
16333 lockdev_result="yes"
16334
16335 @@ -28156,21 +28533,25 @@
16336 echo "$as_me: failed program was:" >&5
16337 sed 's/^/| /' conftest.$ac_ext >&5
16338
16339 +
16340 fi
16341 -rm -f conftest.err conftest.$ac_objext \
16342 +
16343 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16344 conftest$ac_exeext conftest.$ac_ext
16345
16346 else
16347 echo "$as_me: failed program was:" >&5
16348 sed 's/^/| /' conftest.$ac_ext >&5
16349
16350 +
16351 fi
16352 -rm -f conftest.err conftest.$ac_objext \
16353 +
16354 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16355 conftest$ac_exeext conftest.$ac_ext
16356 - echo "$as_me:$LINENO: checking if ttylock needs lockdev" >&5
16357 -echo $ECHO_N "checking if ttylock needs lockdev... $ECHO_C" >&6
16358 - echo "$as_me:$LINENO: result: ${lockdev_result}" >&5
16359 -echo "${ECHO_T}${lockdev_result}" >&6
16360 + { echo "$as_me:$LINENO: checking if ttylock needs lockdev" >&5
16361 +echo $ECHO_N "checking if ttylock needs lockdev... $ECHO_C" >&6; }
16362 + { echo "$as_me:$LINENO: result: ${lockdev_result}" >&5
16363 +echo "${ECHO_T}${lockdev_result}" >&6; }
16364
16365 fi
16366
16367 @@ -28189,8 +28570,8 @@
16368
16369 lockdev_msg=no
16370 if $try_lockdev; then
16371 - echo "$as_me:$LINENO: checking for dev_lock in -llockdev" >&5
16372 -echo $ECHO_N "checking for dev_lock in -llockdev... $ECHO_C" >&6
16373 + { echo "$as_me:$LINENO: checking for dev_lock in -llockdev" >&5
16374 +echo $ECHO_N "checking for dev_lock in -llockdev... $ECHO_C" >&6; }
16375 if test "${ac_cv_lib_lockdev_dev_lock+set}" = set; then
16376 echo $ECHO_N "(cached) $ECHO_C" >&6
16377 else
16378 @@ -28203,69 +28584,67 @@
16379 cat >>conftest.$ac_ext <<_ACEOF
16380 /* end confdefs.h. */
16381
16382 -/* Override any gcc2 internal prototype to avoid an error. */
16383 +/* Override any GCC internal prototype to avoid an error.
16384 + Use char because int might match the return type of a GCC
16385 + builtin and then its argument prototype would still apply. */
16386 #ifdef __cplusplus
16387 extern "C"
16388 #endif
16389 -/* We use char because int might match the return type of a gcc2
16390 - builtin and then its argument prototype would still apply. */
16391 char dev_lock ();
16392 int
16393 main ()
16394 {
16395 -dev_lock ();
16396 +return dev_lock ();
16397 ;
16398 return 0;
16399 }
16400 _ACEOF
16401 rm -f conftest.$ac_objext conftest$ac_exeext
16402 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16403 - (eval $ac_link) 2>conftest.er1
16404 +if { (ac_try="$ac_link"
16405 +case "(($ac_try" in
16406 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16407 + *) ac_try_echo=$ac_try;;
16408 +esac
16409 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16410 + (eval "$ac_link") 2>conftest.er1
16411 ac_status=$?
16412 grep -v '^ *+' conftest.er1 >conftest.err
16413 rm -f conftest.er1
16414 cat conftest.err >&5
16415 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16416 - (exit $ac_status); } &&
16417 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16418 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16419 - (eval $ac_try) 2>&5
16420 - ac_status=$?
16421 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16422 - (exit $ac_status); }; } &&
16423 - { ac_try='test -s conftest$ac_exeext'
16424 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16425 - (eval $ac_try) 2>&5
16426 - ac_status=$?
16427 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16428 - (exit $ac_status); }; }; then
16429 + (exit $ac_status); } && {
16430 + test -z "$ac_c_werror_flag" ||
16431 + test ! -s conftest.err
16432 + } && test -s conftest$ac_exeext &&
16433 + $as_test_x conftest$ac_exeext; then
16434 ac_cv_lib_lockdev_dev_lock=yes
16435 else
16436 echo "$as_me: failed program was:" >&5
16437 sed 's/^/| /' conftest.$ac_ext >&5
16438
16439 -ac_cv_lib_lockdev_dev_lock=no
16440 + ac_cv_lib_lockdev_dev_lock=no
16441 fi
16442 -rm -f conftest.err conftest.$ac_objext \
16443 +
16444 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16445 conftest$ac_exeext conftest.$ac_ext
16446 LIBS=$ac_check_lib_save_LIBS
16447 fi
16448 -echo "$as_me:$LINENO: result: $ac_cv_lib_lockdev_dev_lock" >&5
16449 -echo "${ECHO_T}$ac_cv_lib_lockdev_dev_lock" >&6
16450 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lockdev_dev_lock" >&5
16451 +echo "${ECHO_T}$ac_cv_lib_lockdev_dev_lock" >&6; }
16452 if test $ac_cv_lib_lockdev_dev_lock = yes; then
16453
16454 if test "${ac_cv_header_lockdev_h+set}" = set; then
16455 - echo "$as_me:$LINENO: checking for lockdev.h" >&5
16456 -echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6
16457 + { echo "$as_me:$LINENO: checking for lockdev.h" >&5
16458 +echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6; }
16459 if test "${ac_cv_header_lockdev_h+set}" = set; then
16460 echo $ECHO_N "(cached) $ECHO_C" >&6
16461 fi
16462 -echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16463 -echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6
16464 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16465 +echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6; }
16466 else
16467 # Is the header compilable?
16468 -echo "$as_me:$LINENO: checking lockdev.h usability" >&5
16469 -echo $ECHO_N "checking lockdev.h usability... $ECHO_C" >&6
16470 +{ echo "$as_me:$LINENO: checking lockdev.h usability" >&5
16471 +echo $ECHO_N "checking lockdev.h usability... $ECHO_C" >&6; }
16472 cat >conftest.$ac_ext <<_ACEOF
16473 /* confdefs.h. */
16474 _ACEOF
16475 @@ -28276,40 +28655,37 @@
16476 #include <lockdev.h>
16477 _ACEOF
16478 rm -f conftest.$ac_objext
16479 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16480 - (eval $ac_compile) 2>conftest.er1
16481 +if { (ac_try="$ac_compile"
16482 +case "(($ac_try" in
16483 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16484 + *) ac_try_echo=$ac_try;;
16485 +esac
16486 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16487 + (eval "$ac_compile") 2>conftest.er1
16488 ac_status=$?
16489 grep -v '^ *+' conftest.er1 >conftest.err
16490 rm -f conftest.er1
16491 cat conftest.err >&5
16492 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16493 - (exit $ac_status); } &&
16494 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16495 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16496 - (eval $ac_try) 2>&5
16497 - ac_status=$?
16498 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16499 - (exit $ac_status); }; } &&
16500 - { ac_try='test -s conftest.$ac_objext'
16501 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16502 - (eval $ac_try) 2>&5
16503 - ac_status=$?
16504 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16505 - (exit $ac_status); }; }; then
16506 + (exit $ac_status); } && {
16507 + test -z "$ac_c_werror_flag" ||
16508 + test ! -s conftest.err
16509 + } && test -s conftest.$ac_objext; then
16510 ac_header_compiler=yes
16511 else
16512 echo "$as_me: failed program was:" >&5
16513 sed 's/^/| /' conftest.$ac_ext >&5
16514
16515 -ac_header_compiler=no
16516 + ac_header_compiler=no
16517 fi
16518 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16519 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
16520 -echo "${ECHO_T}$ac_header_compiler" >&6
16521 +
16522 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16523 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
16524 +echo "${ECHO_T}$ac_header_compiler" >&6; }
16525
16526 # Is the header present?
16527 -echo "$as_me:$LINENO: checking lockdev.h presence" >&5
16528 -echo $ECHO_N "checking lockdev.h presence... $ECHO_C" >&6
16529 +{ echo "$as_me:$LINENO: checking lockdev.h presence" >&5
16530 +echo $ECHO_N "checking lockdev.h presence... $ECHO_C" >&6; }
16531 cat >conftest.$ac_ext <<_ACEOF
16532 /* confdefs.h. */
16533 _ACEOF
16534 @@ -28318,24 +28694,22 @@
16535 /* end confdefs.h. */
16536 #include <lockdev.h>
16537 _ACEOF
16538 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
16539 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
16540 +if { (ac_try="$ac_cpp conftest.$ac_ext"
16541 +case "(($ac_try" in
16542 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16543 + *) ac_try_echo=$ac_try;;
16544 +esac
16545 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16546 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
16547 ac_status=$?
16548 grep -v '^ *+' conftest.er1 >conftest.err
16549 rm -f conftest.er1
16550 cat conftest.err >&5
16551 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16552 - (exit $ac_status); } >/dev/null; then
16553 - if test -s conftest.err; then
16554 - ac_cpp_err=$ac_c_preproc_warn_flag
16555 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
16556 - else
16557 - ac_cpp_err=
16558 - fi
16559 -else
16560 - ac_cpp_err=yes
16561 -fi
16562 -if test -z "$ac_cpp_err"; then
16563 + (exit $ac_status); } >/dev/null && {
16564 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
16565 + test ! -s conftest.err
16566 + }; then
16567 ac_header_preproc=yes
16568 else
16569 echo "$as_me: failed program was:" >&5
16570 @@ -28343,9 +28717,10 @@
16571
16572 ac_header_preproc=no
16573 fi
16574 +
16575 rm -f conftest.err conftest.$ac_ext
16576 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
16577 -echo "${ECHO_T}$ac_header_preproc" >&6
16578 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
16579 +echo "${ECHO_T}$ac_header_preproc" >&6; }
16580
16581 # So? What about this header?
16582 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
16583 @@ -28369,25 +28744,23 @@
16584 echo "$as_me: WARNING: lockdev.h: proceeding with the preprocessor's result" >&2;}
16585 { echo "$as_me:$LINENO: WARNING: lockdev.h: in the future, the compiler will take precedence" >&5
16586 echo "$as_me: WARNING: lockdev.h: in the future, the compiler will take precedence" >&2;}
16587 - (
16588 - cat <<\_ASBOX
16589 + ( cat <<\_ASBOX
16590 ## ------------------------------------------------- ##
16591 ## Report this to gphoto-devel@lists.sourceforge.net ##
16592 ## ------------------------------------------------- ##
16593 _ASBOX
16594 - ) |
16595 - sed "s/^/$as_me: WARNING: /" >&2
16596 + ) | sed "s/^/$as_me: WARNING: /" >&2
16597 ;;
16598 esac
16599 -echo "$as_me:$LINENO: checking for lockdev.h" >&5
16600 -echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6
16601 +{ echo "$as_me:$LINENO: checking for lockdev.h" >&5
16602 +echo $ECHO_N "checking for lockdev.h... $ECHO_C" >&6; }
16603 if test "${ac_cv_header_lockdev_h+set}" = set; then
16604 echo $ECHO_N "(cached) $ECHO_C" >&6
16605 else
16606 ac_cv_header_lockdev_h=$ac_header_preproc
16607 fi
16608 -echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16609 -echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6
16610 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lockdev_h" >&5
16611 +echo "${ECHO_T}$ac_cv_header_lockdev_h" >&6; }
16612
16613 fi
16614 if test $ac_cv_header_lockdev_h = yes; then
16615 @@ -28437,20 +28810,20 @@
16616
16617 export PKG_CONFIG_PATH
16618
16619 -echo "$as_me:$LINENO: checking PKG_CONFIG_PATH" >&5
16620 -echo $ECHO_N "checking PKG_CONFIG_PATH... $ECHO_C" >&6
16621 +{ echo "$as_me:$LINENO: checking PKG_CONFIG_PATH" >&5
16622 +echo $ECHO_N "checking PKG_CONFIG_PATH... $ECHO_C" >&6; }
16623 if test "x${PKG_CONFIG_PATH}" = "x"; then
16624 - echo "$as_me:$LINENO: result: empty" >&5
16625 -echo "${ECHO_T}empty" >&6
16626 + { echo "$as_me:$LINENO: result: empty" >&5
16627 +echo "${ECHO_T}empty" >&6; }
16628 else
16629 - echo "$as_me:$LINENO: result: ${PKG_CONFIG_PATH}" >&5
16630 -echo "${ECHO_T}${PKG_CONFIG_PATH}" >&6
16631 + { echo "$as_me:$LINENO: result: ${PKG_CONFIG_PATH}" >&5
16632 +echo "${ECHO_T}${PKG_CONFIG_PATH}" >&6; }
16633 fi
16634
16635 # Extract the first word of "pkg-config", so it can be a program name with args.
16636 set dummy pkg-config; ac_word=$2
16637 -echo "$as_me:$LINENO: checking for $ac_word" >&5
16638 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
16639 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
16640 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
16641 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
16642 echo $ECHO_N "(cached) $ECHO_C" >&6
16643 else
16644 @@ -28465,28 +28838,29 @@
16645 IFS=$as_save_IFS
16646 test -z "$as_dir" && as_dir=.
16647 for ac_exec_ext in '' $ac_executable_extensions; do
16648 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16649 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16650 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
16651 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16652 break 2
16653 fi
16654 done
16655 done
16656 +IFS=$as_save_IFS
16657
16658 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="false"
16659 ;;
16660 esac
16661 fi
16662 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
16663 -
16664 if test -n "$PKG_CONFIG"; then
16665 - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
16666 -echo "${ECHO_T}$PKG_CONFIG" >&6
16667 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
16668 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
16669 else
16670 - echo "$as_me:$LINENO: result: no" >&5
16671 -echo "${ECHO_T}no" >&6
16672 + { echo "$as_me:$LINENO: result: no" >&5
16673 +echo "${ECHO_T}no" >&6; }
16674 fi
16675
16676 +
16677 if test "$PKG_CONFIG" = "false"; then
16678 { { echo "$as_me:$LINENO: error:
16679 *** Build requires pkg-config
16680 @@ -28507,8 +28881,8 @@
16681 { (exit 1); exit 1; }; }
16682 fi
16683
16684 -echo "$as_me:$LINENO: checking for dynamic library extension" >&5
16685 -echo $ECHO_N "checking for dynamic library extension... $ECHO_C" >&6
16686 +{ echo "$as_me:$LINENO: checking for dynamic library extension" >&5
16687 +echo $ECHO_N "checking for dynamic library extension... $ECHO_C" >&6; }
16688 soext=""
16689 case "$host" in
16690 *linux*) soext=".so" ;;
16691 @@ -28520,8 +28894,8 @@
16692 esac
16693 if test "x$soext" = "x"; then
16694 soext=".so"
16695 - echo "$as_me:$LINENO: result: ${soext}" >&5
16696 -echo "${ECHO_T}${soext}" >&6
16697 + { echo "$as_me:$LINENO: result: ${soext}" >&5
16698 +echo "${ECHO_T}${soext}" >&6; }
16699 { echo "$as_me:$LINENO: WARNING:
16700 Host system \"${host}\" not recognized, defaulting to \"${soext}\".
16701 " >&5
16702 @@ -28529,8 +28903,8 @@
16703 Host system \"${host}\" not recognized, defaulting to \"${soext}\".
16704 " >&2;}
16705 else
16706 - echo "$as_me:$LINENO: result: ${soext}" >&5
16707 -echo "${ECHO_T}${soext}" >&6
16708 + { echo "$as_me:$LINENO: result: ${soext}" >&5
16709 +echo "${ECHO_T}${soext}" >&6; }
16710 fi
16711
16712
16713 @@ -28539,8 +28913,8 @@
16714 if test -n "$ac_tool_prefix"; then
16715 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
16716 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
16717 -echo "$as_me:$LINENO: checking for $ac_word" >&5
16718 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
16719 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
16720 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
16721 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
16722 echo $ECHO_N "(cached) $ECHO_C" >&6
16723 else
16724 @@ -28555,34 +28929,35 @@
16725 IFS=$as_save_IFS
16726 test -z "$as_dir" && as_dir=.
16727 for ac_exec_ext in '' $ac_executable_extensions; do
16728 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16729 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16730 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
16731 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16732 break 2
16733 fi
16734 done
16735 done
16736 +IFS=$as_save_IFS
16737
16738 ;;
16739 esac
16740 fi
16741 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
16742 -
16743 if test -n "$PKG_CONFIG"; then
16744 - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
16745 -echo "${ECHO_T}$PKG_CONFIG" >&6
16746 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
16747 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
16748 else
16749 - echo "$as_me:$LINENO: result: no" >&5
16750 -echo "${ECHO_T}no" >&6
16751 + { echo "$as_me:$LINENO: result: no" >&5
16752 +echo "${ECHO_T}no" >&6; }
16753 fi
16754
16755 +
16756 fi
16757 if test -z "$ac_cv_path_PKG_CONFIG"; then
16758 ac_pt_PKG_CONFIG=$PKG_CONFIG
16759 # Extract the first word of "pkg-config", so it can be a program name with args.
16760 set dummy pkg-config; ac_word=$2
16761 -echo "$as_me:$LINENO: checking for $ac_word" >&5
16762 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
16763 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
16764 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
16765 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
16766 echo $ECHO_N "(cached) $ECHO_C" >&6
16767 else
16768 @@ -28597,28 +28972,42 @@
16769 IFS=$as_save_IFS
16770 test -z "$as_dir" && as_dir=.
16771 for ac_exec_ext in '' $ac_executable_extensions; do
16772 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16773 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16774 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
16775 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16776 break 2
16777 fi
16778 done
16779 done
16780 +IFS=$as_save_IFS
16781
16782 ;;
16783 esac
16784 fi
16785 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
16786 -
16787 if test -n "$ac_pt_PKG_CONFIG"; then
16788 - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
16789 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
16790 + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
16791 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
16792 else
16793 - echo "$as_me:$LINENO: result: no" >&5
16794 -echo "${ECHO_T}no" >&6
16795 + { echo "$as_me:$LINENO: result: no" >&5
16796 +echo "${ECHO_T}no" >&6; }
16797 fi
16798
16799 - PKG_CONFIG=$ac_pt_PKG_CONFIG
16800 + if test "x$ac_pt_PKG_CONFIG" = x; then
16801 + PKG_CONFIG=""
16802 + else
16803 + case $cross_compiling:$ac_tool_warned in
16804 +yes:)
16805 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
16806 +whose name does not start with the host triplet. If you think this
16807 +configuration is useful to you, please write to autoconf@gnu.org." >&5
16808 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
16809 +whose name does not start with the host triplet. If you think this
16810 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
16811 +ac_tool_warned=yes ;;
16812 +esac
16813 + PKG_CONFIG=$ac_pt_PKG_CONFIG
16814 + fi
16815 else
16816 PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
16817 fi
16818 @@ -28626,14 +29015,14 @@
16819 fi
16820 if test -n "$PKG_CONFIG"; then
16821 _pkg_min_version=0.9.0
16822 - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
16823 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
16824 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
16825 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
16826 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
16827 - echo "$as_me:$LINENO: result: yes" >&5
16828 -echo "${ECHO_T}yes" >&6
16829 + { echo "$as_me:$LINENO: result: yes" >&5
16830 +echo "${ECHO_T}yes" >&6; }
16831 else
16832 - echo "$as_me:$LINENO: result: no" >&5
16833 -echo "${ECHO_T}no" >&6
16834 + { echo "$as_me:$LINENO: result: no" >&5
16835 +echo "${ECHO_T}no" >&6; }
16836 PKG_CONFIG=""
16837 fi
16838
16839 @@ -28646,27 +29035,27 @@
16840 # http://libusb.sourceforge.net/
16841
16842 # ----------------------------------------------------------------------
16843 -echo "$as_me:$LINENO: checking for libusb to use" >&5
16844 -echo $ECHO_N "checking for libusb to use... $ECHO_C" >&6
16845 +{ echo "$as_me:$LINENO: checking for libusb to use" >&5
16846 +echo $ECHO_N "checking for libusb to use... $ECHO_C" >&6; }
16847 userdef_LIBUSB=no
16848 have_LIBUSB=no
16849 if test "x${LIBUSB_LIBS}" = "x" && test "x${LIBUSB_CFLAGS}" = "x"; then
16850 try_LIBUSB=auto
16851
16852 -# Check whether --with-libusb or --without-libusb was given.
16853 +# Check whether --with-libusb was given.
16854 if test "${with_libusb+set}" = set; then
16855 - withval="$with_libusb"
16856 - try_LIBUSB="$withval"
16857 -fi;
16858 + withval=$with_libusb; try_LIBUSB="$withval"
16859 +fi
16860 +
16861 if test "x${try_LIBUSB}" = "xauto"; then try_LIBUSB=autodetect; fi
16862 - echo "$as_me:$LINENO: result: ${try_LIBUSB}" >&5
16863 -echo "${ECHO_T}${try_LIBUSB}" >&6
16864 + { echo "$as_me:$LINENO: result: ${try_LIBUSB}" >&5
16865 +echo "${ECHO_T}${try_LIBUSB}" >&6; }
16866 if test "x${try_LIBUSB}" = "xautodetect"; then
16867 if test "x${have_LIBUSB}" = "xno"; then
16868
16869 pkg_failed=no
16870 -echo "$as_me:$LINENO: checking for LIBUSB" >&5
16871 -echo $ECHO_N "checking for LIBUSB... $ECHO_C" >&6
16872 +{ echo "$as_me:$LINENO: checking for LIBUSB" >&5
16873 +echo $ECHO_N "checking for LIBUSB... $ECHO_C" >&6; }
16874
16875 if test -n "$PKG_CONFIG"; then
16876 if test -n "$LIBUSB_CFLAGS"; then
16877 @@ -28728,20 +29117,20 @@
16878 else
16879 LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS
16880 LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS
16881 - echo "$as_me:$LINENO: result: yes" >&5
16882 -echo "${ECHO_T}yes" >&6
16883 + { echo "$as_me:$LINENO: result: yes" >&5
16884 +echo "${ECHO_T}yes" >&6; }
16885 have_LIBUSB=yes
16886 fi
16887 fi
16888 if test "x${have_LIBUSB}" = "xno"; then
16889 - echo "$as_me:$LINENO: checking libusb config program" >&5
16890 -echo $ECHO_N "checking libusb config program... $ECHO_C" >&6
16891 - echo "$as_me:$LINENO: result: libusb-config" >&5
16892 -echo "${ECHO_T}libusb-config" >&6
16893 + { echo "$as_me:$LINENO: checking libusb config program" >&5
16894 +echo $ECHO_N "checking libusb config program... $ECHO_C" >&6; }
16895 + { echo "$as_me:$LINENO: result: libusb-config" >&5
16896 +echo "${ECHO_T}libusb-config" >&6; }
16897 # Extract the first word of "gp_lib_config", so it can be a program name with args.
16898 set dummy libusb-config; ac_word=$2
16899 -echo "$as_me:$LINENO: checking for $ac_word" >&5
16900 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
16901 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
16902 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
16903 if test "${ac_cv_path_LIBUSB_CONFIG_PROG+set}" = set; then
16904 echo $ECHO_N "(cached) $ECHO_C" >&6
16905 else
16906 @@ -28756,32 +29145,33 @@
16907 IFS=$as_save_IFS
16908 test -z "$as_dir" && as_dir=.
16909 for ac_exec_ext in '' $ac_executable_extensions; do
16910 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16911 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16912 ac_cv_path_LIBUSB_CONFIG_PROG="$as_dir/$ac_word$ac_exec_ext"
16913 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16914 break 2
16915 fi
16916 done
16917 done
16918 +IFS=$as_save_IFS
16919
16920 ;;
16921 esac
16922 fi
16923 LIBUSB_CONFIG_PROG=$ac_cv_path_LIBUSB_CONFIG_PROG
16924 -
16925 if test -n "$LIBUSB_CONFIG_PROG"; then
16926 - echo "$as_me:$LINENO: result: $LIBUSB_CONFIG_PROG" >&5
16927 -echo "${ECHO_T}$LIBUSB_CONFIG_PROG" >&6
16928 + { echo "$as_me:$LINENO: result: $LIBUSB_CONFIG_PROG" >&5
16929 +echo "${ECHO_T}$LIBUSB_CONFIG_PROG" >&6; }
16930 else
16931 - echo "$as_me:$LINENO: result: no" >&5
16932 -echo "${ECHO_T}no" >&6
16933 + { echo "$as_me:$LINENO: result: no" >&5
16934 +echo "${ECHO_T}no" >&6; }
16935 fi
16936
16937 +
16938 if test -n "${LIBUSB_CONFIG_PROG}" &&
16939 test "${LIBUSB_CONFIG_PROG}" != "none"; then
16940
16941 - echo "$as_me:$LINENO: checking for libusb version according to libusb-config" >&5
16942 -echo $ECHO_N "checking for libusb version according to libusb-config... $ECHO_C" >&6
16943 + { echo "$as_me:$LINENO: checking for libusb version according to libusb-config" >&5
16944 +echo $ECHO_N "checking for libusb version according to libusb-config... $ECHO_C" >&6; }
16945 _LIBUSB_COMPN="-lt"
16946 # split requested version number using m4 regexps
16947 _LIBUSB_REQ_1="0"
16948 @@ -28794,37 +29184,37 @@
16949 _LIBUSB_VER_2="$(echo "${_LIBUSB_VERSION}" | sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/g')"
16950 _LIBUSB_VER_3="$(echo "${_LIBUSB_VERSION}" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/g')"
16951 _LIBUSB_VER_4="$(echo "${_LIBUSB_VERSION}" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)\(.*\)/\4/g')"
16952 - echo "$as_me:$LINENO: result: ${_LIBUSB_VERSION}" >&5
16953 -echo "${ECHO_T}${_LIBUSB_VERSION}" >&6
16954 + { echo "$as_me:$LINENO: result: ${_LIBUSB_VERSION}" >&5
16955 +echo "${ECHO_T}${_LIBUSB_VERSION}" >&6; }
16956 _tmp=false
16957 if test "${_LIBUSB_VER_1}" "${_LIBUSB_COMPN}" "${_LIBUSB_REQ_1}"; then _tmp=true;
16958 elif test "${_LIBUSB_VER_2}" "${_LIBUSB_COMPN}" "${_LIBUSB_REQ_2}"; then _tmp=true;
16959 elif test "${_LIBUSB_VER_3}" "${_LIBUSB_COMPN}" "${_LIBUSB_REQ_3}"; then _tmp=true;
16960 fi
16961 - echo "$as_me:$LINENO: checking if libusb version matching requirement >= 0.1.5" >&5
16962 -echo $ECHO_N "checking if libusb version matching requirement >= 0.1.5... $ECHO_C" >&6
16963 + { echo "$as_me:$LINENO: checking if libusb version matching requirement >= 0.1.5" >&5
16964 +echo $ECHO_N "checking if libusb version matching requirement >= 0.1.5... $ECHO_C" >&6; }
16965 if "${_tmp}"; then
16966 - echo "$as_me:$LINENO: result: no" >&5
16967 -echo "${ECHO_T}no" >&6
16968 + { echo "$as_me:$LINENO: result: no" >&5
16969 +echo "${ECHO_T}no" >&6; }
16970 { { echo "$as_me:$LINENO: error: Version requirement libusb >= 0.1.5 not met." >&5
16971 echo "$as_me: error: Version requirement libusb >= 0.1.5 not met." >&2;}
16972 { (exit 1); exit 1; }; }
16973 else
16974 - echo "$as_me:$LINENO: result: yes" >&5
16975 -echo "${ECHO_T}yes" >&6
16976 + { echo "$as_me:$LINENO: result: yes" >&5
16977 +echo "${ECHO_T}yes" >&6; }
16978 fi
16979 - echo "$as_me:$LINENO: checking for libusb parameters from libusb-config" >&5
16980 -echo $ECHO_N "checking for libusb parameters from libusb-config... $ECHO_C" >&6
16981 + { echo "$as_me:$LINENO: checking for libusb parameters from libusb-config" >&5
16982 +echo $ECHO_N "checking for libusb parameters from libusb-config... $ECHO_C" >&6; }
16983 LIBUSB_LIBS="$(${LIBUSB_CONFIG_PROG} --libs || echo "*error*")"
16984 LIBUSB_CFLAGSS="$(${LIBUSB_CONFIG_PROG} --cflags || echo "*error*")"
16985 if test "x${LIBUSB_LIBS}" = "*error*" ||
16986 test "x${LIBUSB_CFLAGS}" = "*error*"; then
16987 - echo "$as_me:$LINENO: result: error" >&5
16988 -echo "${ECHO_T}error" >&6
16989 + { echo "$as_me:$LINENO: result: error" >&5
16990 +echo "${ECHO_T}error" >&6; }
16991 else
16992 have_LIBUSB=yes
16993 - echo "$as_me:$LINENO: result: ok" >&5
16994 -echo "${ECHO_T}ok" >&6
16995 + { echo "$as_me:$LINENO: result: ok" >&5
16996 +echo "${ECHO_T}ok" >&6; }
16997 fi
16998 fi
16999 fi
17000 @@ -28836,13 +29226,13 @@
17001 LIBUSB_CFLAGS="-I${try_LIBUSB}/include"
17002 fi
17003 elif test "x${LIBUSB_LIBS}" != "x" && test "x${LIBUSB_CFLAGS}" != "x"; then
17004 - echo "$as_me:$LINENO: result: user-defined" >&5
17005 -echo "${ECHO_T}user-defined" >&6
17006 + { echo "$as_me:$LINENO: result: user-defined" >&5
17007 +echo "${ECHO_T}user-defined" >&6; }
17008 userdef_LIBUSB=yes
17009 have_LIBUSB=yes
17010 else
17011 - echo "$as_me:$LINENO: result: broken call" >&5
17012 -echo "${ECHO_T}broken call" >&6
17013 + { echo "$as_me:$LINENO: result: broken call" >&5
17014 +echo "${ECHO_T}broken call" >&6; }
17015 { { echo "$as_me:$LINENO: error:
17016 * Fatal:
17017 * When calling configure for ${PACKAGE_TARNAME}
17018 @@ -28869,17 +29259,17 @@
17019 CPPFLAGS_save="$CPPFLAGS"
17020 CPPFLAGS="${LIBUSB_CFLAGS}"
17021 if test "${ac_cv_header_usb_h+set}" = set; then
17022 - echo "$as_me:$LINENO: checking for usb.h" >&5
17023 -echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
17024 + { echo "$as_me:$LINENO: checking for usb.h" >&5
17025 +echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; }
17026 if test "${ac_cv_header_usb_h+set}" = set; then
17027 echo $ECHO_N "(cached) $ECHO_C" >&6
17028 fi
17029 -echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
17030 -echo "${ECHO_T}$ac_cv_header_usb_h" >&6
17031 +{ echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
17032 +echo "${ECHO_T}$ac_cv_header_usb_h" >&6; }
17033 else
17034 # Is the header compilable?
17035 -echo "$as_me:$LINENO: checking usb.h usability" >&5
17036 -echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6
17037 +{ echo "$as_me:$LINENO: checking usb.h usability" >&5
17038 +echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6; }
17039 cat >conftest.$ac_ext <<_ACEOF
17040 /* confdefs.h. */
17041 _ACEOF
17042 @@ -28890,40 +29280,37 @@
17043 #include <usb.h>
17044 _ACEOF
17045 rm -f conftest.$ac_objext
17046 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17047 - (eval $ac_compile) 2>conftest.er1
17048 +if { (ac_try="$ac_compile"
17049 +case "(($ac_try" in
17050 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17051 + *) ac_try_echo=$ac_try;;
17052 +esac
17053 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17054 + (eval "$ac_compile") 2>conftest.er1
17055 ac_status=$?
17056 grep -v '^ *+' conftest.er1 >conftest.err
17057 rm -f conftest.er1
17058 cat conftest.err >&5
17059 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17060 - (exit $ac_status); } &&
17061 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17062 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17063 - (eval $ac_try) 2>&5
17064 - ac_status=$?
17065 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17066 - (exit $ac_status); }; } &&
17067 - { ac_try='test -s conftest.$ac_objext'
17068 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17069 - (eval $ac_try) 2>&5
17070 - ac_status=$?
17071 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17072 - (exit $ac_status); }; }; then
17073 + (exit $ac_status); } && {
17074 + test -z "$ac_c_werror_flag" ||
17075 + test ! -s conftest.err
17076 + } && test -s conftest.$ac_objext; then
17077 ac_header_compiler=yes
17078 else
17079 echo "$as_me: failed program was:" >&5
17080 sed 's/^/| /' conftest.$ac_ext >&5
17081
17082 -ac_header_compiler=no
17083 + ac_header_compiler=no
17084 fi
17085 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17086 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
17087 -echo "${ECHO_T}$ac_header_compiler" >&6
17088 +
17089 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17090 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
17091 +echo "${ECHO_T}$ac_header_compiler" >&6; }
17092
17093 # Is the header present?
17094 -echo "$as_me:$LINENO: checking usb.h presence" >&5
17095 -echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6
17096 +{ echo "$as_me:$LINENO: checking usb.h presence" >&5
17097 +echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6; }
17098 cat >conftest.$ac_ext <<_ACEOF
17099 /* confdefs.h. */
17100 _ACEOF
17101 @@ -28932,24 +29319,22 @@
17102 /* end confdefs.h. */
17103 #include <usb.h>
17104 _ACEOF
17105 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
17106 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
17107 +if { (ac_try="$ac_cpp conftest.$ac_ext"
17108 +case "(($ac_try" in
17109 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17110 + *) ac_try_echo=$ac_try;;
17111 +esac
17112 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17113 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
17114 ac_status=$?
17115 grep -v '^ *+' conftest.er1 >conftest.err
17116 rm -f conftest.er1
17117 cat conftest.err >&5
17118 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17119 - (exit $ac_status); } >/dev/null; then
17120 - if test -s conftest.err; then
17121 - ac_cpp_err=$ac_c_preproc_warn_flag
17122 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
17123 - else
17124 - ac_cpp_err=
17125 - fi
17126 -else
17127 - ac_cpp_err=yes
17128 -fi
17129 -if test -z "$ac_cpp_err"; then
17130 + (exit $ac_status); } >/dev/null && {
17131 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
17132 + test ! -s conftest.err
17133 + }; then
17134 ac_header_preproc=yes
17135 else
17136 echo "$as_me: failed program was:" >&5
17137 @@ -28957,9 +29342,10 @@
17138
17139 ac_header_preproc=no
17140 fi
17141 +
17142 rm -f conftest.err conftest.$ac_ext
17143 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
17144 -echo "${ECHO_T}$ac_header_preproc" >&6
17145 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
17146 +echo "${ECHO_T}$ac_header_preproc" >&6; }
17147
17148 # So? What about this header?
17149 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
17150 @@ -28983,25 +29369,23 @@
17151 echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
17152 { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5
17153 echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;}
17154 - (
17155 - cat <<\_ASBOX
17156 + ( cat <<\_ASBOX
17157 ## ------------------------------------------------- ##
17158 ## Report this to gphoto-devel@lists.sourceforge.net ##
17159 ## ------------------------------------------------- ##
17160 _ASBOX
17161 - ) |
17162 - sed "s/^/$as_me: WARNING: /" >&2
17163 + ) | sed "s/^/$as_me: WARNING: /" >&2
17164 ;;
17165 esac
17166 -echo "$as_me:$LINENO: checking for usb.h" >&5
17167 -echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
17168 +{ echo "$as_me:$LINENO: checking for usb.h" >&5
17169 +echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; }
17170 if test "${ac_cv_header_usb_h+set}" = set; then
17171 echo $ECHO_N "(cached) $ECHO_C" >&6
17172 else
17173 ac_cv_header_usb_h=$ac_header_preproc
17174 fi
17175 -echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
17176 -echo "${ECHO_T}$ac_cv_header_usb_h" >&6
17177 +{ echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
17178 +echo "${ECHO_T}$ac_cv_header_usb_h" >&6; }
17179
17180 fi
17181 if test $ac_cv_header_usb_h = yes; then
17182 @@ -29014,8 +29398,8 @@
17183 CPPFLAGS="$CPPFLAGS_save"
17184 fi
17185 if test "x${userdef_LIBUSB}" = "xno" && test "x${have_LIBUSB}" = "xyes"; then
17186 - echo "$as_me:$LINENO: checking for function usb_busses in libusb" >&5
17187 -echo $ECHO_N "checking for function usb_busses in libusb... $ECHO_C" >&6
17188 + { echo "$as_me:$LINENO: checking for function usb_busses in libusb" >&5
17189 +echo $ECHO_N "checking for function usb_busses in libusb... $ECHO_C" >&6; }
17190 LIBS_save="$LIBS"
17191 LIBS="${LIBUSB_LIBS}"
17192 cat >conftest.$ac_ext <<_ACEOF
17193 @@ -29025,54 +29409,52 @@
17194 cat >>conftest.$ac_ext <<_ACEOF
17195 /* end confdefs.h. */
17196
17197 -/* Override any gcc2 internal prototype to avoid an error. */
17198 +/* Override any GCC internal prototype to avoid an error.
17199 + Use char because int might match the return type of a GCC
17200 + builtin and then its argument prototype would still apply. */
17201 #ifdef __cplusplus
17202 extern "C"
17203 #endif
17204 -/* We use char because int might match the return type of a gcc2
17205 - builtin and then its argument prototype would still apply. */
17206 char usb_busses ();
17207 int
17208 main ()
17209 {
17210 -usb_busses ();
17211 +return usb_busses ();
17212 ;
17213 return 0;
17214 }
17215 _ACEOF
17216 rm -f conftest.$ac_objext conftest$ac_exeext
17217 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17218 - (eval $ac_link) 2>conftest.er1
17219 +if { (ac_try="$ac_link"
17220 +case "(($ac_try" in
17221 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17222 + *) ac_try_echo=$ac_try;;
17223 +esac
17224 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17225 + (eval "$ac_link") 2>conftest.er1
17226 ac_status=$?
17227 grep -v '^ *+' conftest.er1 >conftest.err
17228 rm -f conftest.er1
17229 cat conftest.err >&5
17230 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17231 - (exit $ac_status); } &&
17232 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17233 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17234 - (eval $ac_try) 2>&5
17235 - ac_status=$?
17236 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17237 - (exit $ac_status); }; } &&
17238 - { ac_try='test -s conftest$ac_exeext'
17239 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17240 - (eval $ac_try) 2>&5
17241 - ac_status=$?
17242 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17243 - (exit $ac_status); }; }; then
17244 + (exit $ac_status); } && {
17245 + test -z "$ac_c_werror_flag" ||
17246 + test ! -s conftest.err
17247 + } && test -s conftest$ac_exeext &&
17248 + $as_test_x conftest$ac_exeext; then
17249 :
17250 else
17251 echo "$as_me: failed program was:" >&5
17252 sed 's/^/| /' conftest.$ac_ext >&5
17253
17254 -have_LIBUSB=no
17255 + have_LIBUSB=no
17256 fi
17257 -rm -f conftest.err conftest.$ac_objext \
17258 +
17259 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17260 conftest$ac_exeext conftest.$ac_ext
17261 LIBS="$LIBS_save"
17262 - echo "$as_me:$LINENO: result: ${have_LIBUSB}" >&5
17263 -echo "${ECHO_T}${have_LIBUSB}" >&6
17264 + { echo "$as_me:$LINENO: result: ${have_LIBUSB}" >&5
17265 +echo "${ECHO_T}${have_LIBUSB}" >&6; }
17266 fi
17267
17268 if test "x${try_LIBUSB}" != "xno" && test "x${have_LIBUSB}" = "xno"; then
17269 @@ -29133,14 +29515,14 @@
17270 fi
17271 gp_config_msg="${gp_config_msg} ${gp_config_msg_lhs} yes
17272 "
17273 - echo "$as_me:$LINENO: checking libusb library flags" >&5
17274 -echo $ECHO_N "checking libusb library flags... $ECHO_C" >&6
17275 - echo "$as_me:$LINENO: result: ${LIBUSB_LIBS}" >&5
17276 -echo "${ECHO_T}${LIBUSB_LIBS}" >&6
17277 - echo "$as_me:$LINENO: checking libusb cpp flags" >&5
17278 -echo $ECHO_N "checking libusb cpp flags... $ECHO_C" >&6
17279 - echo "$as_me:$LINENO: result: ${LIBUSB_CFLAGS}" >&5
17280 -echo "${ECHO_T}${LIBUSB_CFLAGS}" >&6
17281 + { echo "$as_me:$LINENO: checking libusb library flags" >&5
17282 +echo $ECHO_N "checking libusb library flags... $ECHO_C" >&6; }
17283 + { echo "$as_me:$LINENO: result: ${LIBUSB_LIBS}" >&5
17284 +echo "${ECHO_T}${LIBUSB_LIBS}" >&6; }
17285 + { echo "$as_me:$LINENO: checking libusb cpp flags" >&5
17286 +echo $ECHO_N "checking libusb cpp flags... $ECHO_C" >&6; }
17287 + { echo "$as_me:$LINENO: result: ${LIBUSB_CFLAGS}" >&5
17288 +echo "${ECHO_T}${LIBUSB_CFLAGS}" >&6; }
17289 else
17290
17291 gp_config_msg_len="$(expr "libusb" : '.*')"
17292 @@ -29154,84 +29536,6 @@
17293 fi
17294
17295
17296 -
17297 -pkg_failed=no
17298 -echo "$as_me:$LINENO: checking for HAL" >&5
17299 -echo $ECHO_N "checking for HAL... $ECHO_C" >&6
17300 -
17301 -if test -n "$PKG_CONFIG"; then
17302 - if test -n "$HAL_CFLAGS"; then
17303 - pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
17304 - else
17305 - if test -n "$PKG_CONFIG" && \
17306 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.31 hal >= 0.5.0\"") >&5
17307 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.31 hal >= 0.5.0") 2>&5
17308 - ac_status=$?
17309 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17310 - (exit $ac_status); }; then
17311 - pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.31 hal >= 0.5.0" 2>/dev/null`
17312 -else
17313 - pkg_failed=yes
17314 -fi
17315 - fi
17316 -else
17317 - pkg_failed=untried
17318 -fi
17319 -if test -n "$PKG_CONFIG"; then
17320 - if test -n "$HAL_LIBS"; then
17321 - pkg_cv_HAL_LIBS="$HAL_LIBS"
17322 - else
17323 - if test -n "$PKG_CONFIG" && \
17324 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.31 hal >= 0.5.0\"") >&5
17325 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.31 hal >= 0.5.0") 2>&5
17326 - ac_status=$?
17327 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17328 - (exit $ac_status); }; then
17329 - pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.31 hal >= 0.5.0" 2>/dev/null`
17330 -else
17331 - pkg_failed=yes
17332 -fi
17333 - fi
17334 -else
17335 - pkg_failed=untried
17336 -fi
17337 -
17338 -
17339 -
17340 -if test $pkg_failed = yes; then
17341 -
17342 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
17343 - _pkg_short_errors_supported=yes
17344 -else
17345 - _pkg_short_errors_supported=no
17346 -fi
17347 - if test $_pkg_short_errors_supported = yes; then
17348 - HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 0.31 hal >= 0.5.0"`
17349 - else
17350 - HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 0.31 hal >= 0.5.0"`
17351 - fi
17352 - # Put the nasty error message in config.log where it belongs
17353 - echo "$HAL_PKG_ERRORS" >&5
17354 -
17355 - have_hal=false
17356 -elif test $pkg_failed = untried; then
17357 - have_hal=false
17358 -else
17359 - HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
17360 - HAL_LIBS=$pkg_cv_HAL_LIBS
17361 - echo "$as_me:$LINENO: result: yes" >&5
17362 -echo "${ECHO_T}yes" >&6
17363 - have_hal=true
17364 -fi
17365 -if test "x$have_hal" = "xtrue"; then
17366 -
17367 -
17368 -
17369 -cat >>confdefs.h <<\_ACEOF
17370 -#define HAVE_HAL 1
17371 -_ACEOF
17372 -
17373 -fi
17374 IOLIB_SUBDIRS="$IOLIB_SUBDIRS disk"
17375
17376 IOLIB_SUBDIRS="$IOLIB_SUBDIRS ptpip"
17377 @@ -29246,8 +29550,8 @@
17378 AM_CPPFLAGS="$AM_CPPFLAGS -DIOLIBS=\\\"${iolibdir}\\\""
17379
17380
17381 -echo "$as_me:$LINENO: checking for re_compile_pattern" >&5
17382 -echo $ECHO_N "checking for re_compile_pattern... $ECHO_C" >&6
17383 +{ echo "$as_me:$LINENO: checking for re_compile_pattern" >&5
17384 +echo $ECHO_N "checking for re_compile_pattern... $ECHO_C" >&6; }
17385 if test "${ac_cv_func_re_compile_pattern+set}" = set; then
17386 echo $ECHO_N "(cached) $ECHO_C" >&6
17387 else
17388 @@ -29274,67 +29578,59 @@
17389
17390 #undef re_compile_pattern
17391
17392 -/* Override any gcc2 internal prototype to avoid an error. */
17393 +/* Override any GCC internal prototype to avoid an error.
17394 + Use char because int might match the return type of a GCC
17395 + builtin and then its argument prototype would still apply. */
17396 #ifdef __cplusplus
17397 extern "C"
17398 -{
17399 #endif
17400 -/* We use char because int might match the return type of a gcc2
17401 - builtin and then its argument prototype would still apply. */
17402 char re_compile_pattern ();
17403 /* The GNU C library defines this for functions which it implements
17404 to always fail with ENOSYS. Some functions are actually named
17405 something starting with __ and the normal name is an alias. */
17406 -#if defined (__stub_re_compile_pattern) || defined (__stub___re_compile_pattern)
17407 +#if defined __stub_re_compile_pattern || defined __stub___re_compile_pattern
17408 choke me
17409 -#else
17410 -char (*f) () = re_compile_pattern;
17411 -#endif
17412 -#ifdef __cplusplus
17413 -}
17414 #endif
17415
17416 int
17417 main ()
17418 {
17419 -return f != re_compile_pattern;
17420 +return re_compile_pattern ();
17421 ;
17422 return 0;
17423 }
17424 _ACEOF
17425 rm -f conftest.$ac_objext conftest$ac_exeext
17426 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17427 - (eval $ac_link) 2>conftest.er1
17428 +if { (ac_try="$ac_link"
17429 +case "(($ac_try" in
17430 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17431 + *) ac_try_echo=$ac_try;;
17432 +esac
17433 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17434 + (eval "$ac_link") 2>conftest.er1
17435 ac_status=$?
17436 grep -v '^ *+' conftest.er1 >conftest.err
17437 rm -f conftest.er1
17438 cat conftest.err >&5
17439 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17440 - (exit $ac_status); } &&
17441 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17442 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17443 - (eval $ac_try) 2>&5
17444 - ac_status=$?
17445 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17446 - (exit $ac_status); }; } &&
17447 - { ac_try='test -s conftest$ac_exeext'
17448 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17449 - (eval $ac_try) 2>&5
17450 - ac_status=$?
17451 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17452 - (exit $ac_status); }; }; then
17453 + (exit $ac_status); } && {
17454 + test -z "$ac_c_werror_flag" ||
17455 + test ! -s conftest.err
17456 + } && test -s conftest$ac_exeext &&
17457 + $as_test_x conftest$ac_exeext; then
17458 ac_cv_func_re_compile_pattern=yes
17459 else
17460 echo "$as_me: failed program was:" >&5
17461 sed 's/^/| /' conftest.$ac_ext >&5
17462
17463 -ac_cv_func_re_compile_pattern=no
17464 + ac_cv_func_re_compile_pattern=no
17465 fi
17466 -rm -f conftest.err conftest.$ac_objext \
17467 +
17468 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17469 conftest$ac_exeext conftest.$ac_ext
17470 fi
17471 -echo "$as_me:$LINENO: result: $ac_cv_func_re_compile_pattern" >&5
17472 -echo "${ECHO_T}$ac_cv_func_re_compile_pattern" >&6
17473 +{ echo "$as_me:$LINENO: result: $ac_cv_func_re_compile_pattern" >&5
17474 +echo "${ECHO_T}$ac_cv_func_re_compile_pattern" >&6; }
17475 if test $ac_cv_func_re_compile_pattern = yes; then
17476
17477 cat >>confdefs.h <<\_ACEOF
17478 @@ -29346,10 +29642,9 @@
17479
17480
17481
17482 -# Check whether --enable-debug or --disable-debug was given.
17483 +# Check whether --enable-debug was given.
17484 if test "${enable_debug+set}" = set; then
17485 - enableval="$enable_debug"
17486 -
17487 + enableval=$enable_debug;
17488 if test "$enableval" = "no"; then
17489
17490 cat >>confdefs.h <<\_ACEOF
17491 @@ -29358,7 +29653,8 @@
17492
17493 fi
17494
17495 -fi;
17496 +fi
17497 +
17498
17499
17500 # ----------------------------------------------------------------------
17501 @@ -29372,50 +29668,50 @@
17502
17503
17504
17505 -# Check whether --with-doc-dir or --without-doc-dir was given.
17506 +# Check whether --with-doc-dir was given.
17507 if test "${with_doc_dir+set}" = set; then
17508 - withval="$with_doc_dir"
17509 + withval=$with_doc_dir;
17510 +fi
17511
17512 -fi;
17513
17514 # check for the main ("root") documentation directory
17515 -echo "$as_me:$LINENO: checking main docdir" >&5
17516 -echo $ECHO_N "checking main docdir... $ECHO_C" >&6
17517 +{ echo "$as_me:$LINENO: checking main docdir" >&5
17518 +echo $ECHO_N "checking main docdir... $ECHO_C" >&6; }
17519
17520 if test "x${with_doc_dir}" != "x"
17521 then # docdir is given as parameter
17522 docdir="${with_doc_dir}"
17523 - echo "$as_me:$LINENO: result: ${docdir} (from parameter)" >&5
17524 -echo "${ECHO_T}${docdir} (from parameter)" >&6
17525 + { echo "$as_me:$LINENO: result: ${docdir} (from parameter)" >&5
17526 +echo "${ECHO_T}${docdir} (from parameter)" >&6; }
17527 else # otherwise invent a docdir hopefully compatible with system policy
17528 if test -d "/usr/share/doc"
17529 then
17530 maindocdir='${prefix}/share/doc'
17531 - echo "$as_me:$LINENO: result: ${maindocdir} (FHS style)" >&5
17532 -echo "${ECHO_T}${maindocdir} (FHS style)" >&6
17533 + { echo "$as_me:$LINENO: result: ${maindocdir} (FHS style)" >&5
17534 +echo "${ECHO_T}${maindocdir} (FHS style)" >&6; }
17535 elif test -d "/usr/doc"
17536 then
17537 maindocdir='${prefix}/doc'
17538 - echo "$as_me:$LINENO: result: ${maindocdir} (old style)" >&5
17539 -echo "${ECHO_T}${maindocdir} (old style)" >&6
17540 + { echo "$as_me:$LINENO: result: ${maindocdir} (old style)" >&5
17541 +echo "${ECHO_T}${maindocdir} (old style)" >&6; }
17542 else
17543 maindocdir='${datadir}/doc'
17544 - echo "$as_me:$LINENO: result: ${maindocdir} (default value)" >&5
17545 -echo "${ECHO_T}${maindocdir} (default value)" >&6
17546 + { echo "$as_me:$LINENO: result: ${maindocdir} (default value)" >&5
17547 +echo "${ECHO_T}${maindocdir} (default value)" >&6; }
17548 fi
17549 - echo "$as_me:$LINENO: checking package docdir" >&5
17550 -echo $ECHO_N "checking package docdir... $ECHO_C" >&6
17551 + { echo "$as_me:$LINENO: checking package docdir" >&5
17552 +echo $ECHO_N "checking package docdir... $ECHO_C" >&6; }
17553 # check whether to include package version into documentation path
17554 # FIXME: doesn't work properly.
17555 if ls -d /usr/{share/,}doc/make-0-9* > /dev/null 2>&1
17556 then
17557 docdir="${maindocdir}/${PACKAGE}-${VERSION}"
17558 - echo "$as_me:$LINENO: result: ${docdir} (redhat style)" >&5
17559 -echo "${ECHO_T}${docdir} (redhat style)" >&6
17560 + { echo "$as_me:$LINENO: result: ${docdir} (redhat style)" >&5
17561 +echo "${ECHO_T}${docdir} (redhat style)" >&6; }
17562 else
17563 docdir="${maindocdir}/${PACKAGE}"
17564 - echo "$as_me:$LINENO: result: ${docdir} (default style)" >&5
17565 -echo "${ECHO_T}${docdir} (default style)" >&6
17566 + { echo "$as_me:$LINENO: result: ${docdir} (default style)" >&5
17567 +echo "${ECHO_T}${docdir} (default style)" >&6; }
17568 fi
17569 fi
17570
17571 @@ -29431,20 +29727,20 @@
17572 try_gtkdoc=false
17573 gtkdoc_msg="no (not requested)"
17574 have_gtkdoc=false
17575 -# Check whether --enable-docs or --disable-docs was given.
17576 +# Check whether --enable-docs was given.
17577 if test "${enable_docs+set}" = set; then
17578 - enableval="$enable_docs"
17579 -
17580 + enableval=$enable_docs;
17581 if test x$enableval = xyes; then
17582 try_gtkdoc=true
17583 fi
17584
17585 -fi;
17586 +fi
17587 +
17588 if $try_gtkdoc; then
17589 # Extract the first word of "gtkdoc-mkdb", so it can be a program name with args.
17590 set dummy gtkdoc-mkdb; ac_word=$2
17591 -echo "$as_me:$LINENO: checking for $ac_word" >&5
17592 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
17593 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
17594 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
17595 if test "${ac_cv_path_GTKDOC+set}" = set; then
17596 echo $ECHO_N "(cached) $ECHO_C" >&6
17597 else
17598 @@ -29459,27 +29755,28 @@
17599 IFS=$as_save_IFS
17600 test -z "$as_dir" && as_dir=.
17601 for ac_exec_ext in '' $ac_executable_extensions; do
17602 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17603 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17604 ac_cv_path_GTKDOC="$as_dir/$ac_word$ac_exec_ext"
17605 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17606 break 2
17607 fi
17608 done
17609 done
17610 +IFS=$as_save_IFS
17611
17612 ;;
17613 esac
17614 fi
17615 GTKDOC=$ac_cv_path_GTKDOC
17616 -
17617 if test -n "$GTKDOC"; then
17618 - echo "$as_me:$LINENO: result: $GTKDOC" >&5
17619 -echo "${ECHO_T}$GTKDOC" >&6
17620 + { echo "$as_me:$LINENO: result: $GTKDOC" >&5
17621 +echo "${ECHO_T}$GTKDOC" >&6; }
17622 else
17623 - echo "$as_me:$LINENO: result: no" >&5
17624 -echo "${ECHO_T}no" >&6
17625 + { echo "$as_me:$LINENO: result: no" >&5
17626 +echo "${ECHO_T}no" >&6; }
17627 fi
17628
17629 +
17630 if test -n "${GTKDOC}"; then
17631 have_gtkdoc=true
17632 gtkdoc_msg="yes"
17633 @@ -29514,22 +29811,22 @@
17634 # user-defined location.
17635 # ---------------------------------------------------------------------------
17636
17637 -# Check whether --with-html-dir or --without-html-dir was given.
17638 +# Check whether --with-html-dir was given.
17639 if test "${with_html_dir+set}" = set; then
17640 - withval="$with_html_dir"
17641 + withval=$with_html_dir;
17642 +fi
17643
17644 -fi;
17645
17646 -echo "$as_me:$LINENO: checking for html dir" >&5
17647 -echo $ECHO_N "checking for html dir... $ECHO_C" >&6
17648 +{ echo "$as_me:$LINENO: checking for html dir" >&5
17649 +echo $ECHO_N "checking for html dir... $ECHO_C" >&6; }
17650 if test "x${with_html_dir}" = "x" ; then
17651 htmldir="${docdir}/html"
17652 - echo "$as_me:$LINENO: result: ${htmldir} (default)" >&5
17653 -echo "${ECHO_T}${htmldir} (default)" >&6
17654 + { echo "$as_me:$LINENO: result: ${htmldir} (default)" >&5
17655 +echo "${ECHO_T}${htmldir} (default)" >&6; }
17656 else
17657 htmldir="${with_html_dir}"
17658 - echo "$as_me:$LINENO: result: ${htmldir} (from parameter)" >&5
17659 -echo "${ECHO_T}${htmldir} (from parameter)" >&6
17660 + { echo "$as_me:$LINENO: result: ${htmldir} (from parameter)" >&5
17661 +echo "${ECHO_T}${htmldir} (from parameter)" >&6; }
17662 fi
17663
17664 apidocdir="${htmldir}/api"
17665 @@ -29553,7 +29850,7 @@
17666 # ---------------------------------------------------------------------------
17667 # Create output files
17668 # ---------------------------------------------------------------------------
17669 - ac_config_files="$ac_config_files Makefile po/Makefile.in libgphoto2_port/Makefile serial/Makefile usb/Makefile disk/Makefile ptpip/Makefile gphoto2-port-config test/Makefile doc/Makefile m4/Makefile"
17670 +ac_config_files="$ac_config_files Makefile po/Makefile.in libgphoto2_port/Makefile serial/Makefile usb/Makefile disk/Makefile ptpip/Makefile gphoto2-port-config test/Makefile doc/Makefile m4/Makefile"
17671
17672 cat >confcache <<\_ACEOF
17673 # This file is a shell script that caches the results of configure
17674 @@ -29573,39 +29870,58 @@
17675
17676 # The following way of writing the cache mishandles newlines in values,
17677 # but we know of no workaround that is simple, portable, and efficient.
17678 -# So, don't put newlines in cache variables' values.
17679 +# So, we kill variables containing newlines.
17680 # Ultrix sh set writes to stderr and can't be redirected directly,
17681 # and sets the high bit in the cache file unless we assign to the vars.
17682 -{
17683 +(
17684 + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
17685 + eval ac_val=\$$ac_var
17686 + case $ac_val in #(
17687 + *${as_nl}*)
17688 + case $ac_var in #(
17689 + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
17690 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
17691 + esac
17692 + case $ac_var in #(
17693 + _ | IFS | as_nl) ;; #(
17694 + *) $as_unset $ac_var ;;
17695 + esac ;;
17696 + esac
17697 + done
17698 +
17699 (set) 2>&1 |
17700 - case `(ac_space=' '; set | grep ac_space) 2>&1` in
17701 - *ac_space=\ *)
17702 + case $as_nl`(ac_space=' '; set) 2>&1` in #(
17703 + *${as_nl}ac_space=\ *)
17704 # `set' does not quote correctly, so add quotes (double-quote
17705 # substitution turns \\\\ into \\, and sed turns \\ into \).
17706 sed -n \
17707 "s/'/'\\\\''/g;
17708 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
17709 - ;;
17710 + ;; #(
17711 *)
17712 # `set' quotes correctly as required by POSIX, so do not add quotes.
17713 - sed -n \
17714 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
17715 + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
17716 ;;
17717 - esac;
17718 -} |
17719 + esac |
17720 + sort
17721 +) |
17722 sed '
17723 + /^ac_cv_env_/b end
17724 t clear
17725 - : clear
17726 + :clear
17727 s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
17728 t end
17729 - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
17730 - : end' >>confcache
17731 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
17732 - if test -w $cache_file; then
17733 - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
17734 + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
17735 + :end' >>confcache
17736 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
17737 + if test -w "$cache_file"; then
17738 + test "x$cache_file" != "x/dev/null" &&
17739 + { echo "$as_me:$LINENO: updating cache $cache_file" >&5
17740 +echo "$as_me: updating cache $cache_file" >&6;}
17741 cat confcache >$cache_file
17742 else
17743 - echo "not updating unwritable cache $cache_file"
17744 + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
17745 +echo "$as_me: not updating unwritable cache $cache_file" >&6;}
17746 fi
17747 fi
17748 rm -f confcache
17749 @@ -29614,32 +29930,18 @@
17750 # Let make expand exec_prefix.
17751 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
17752
17753 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
17754 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
17755 -# trailing colons and then remove the whole line if VPATH becomes empty
17756 -# (actually we leave an empty line to preserve line numbers).
17757 -if test "x$srcdir" = x.; then
17758 - ac_vpsub='/^[ ]*VPATH[ ]*=/{
17759 -s/:*\$(srcdir):*/:/;
17760 -s/:*\${srcdir}:*/:/;
17761 -s/:*@srcdir@:*/:/;
17762 -s/^\([^=]*=[ ]*\):*/\1/;
17763 -s/:*$//;
17764 -s/^[^=]*=[ ]*$//;
17765 -}'
17766 -fi
17767 -
17768 DEFS=-DHAVE_CONFIG_H
17769
17770 ac_libobjs=
17771 ac_ltlibobjs=
17772 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
17773 # 1. Remove the extension, and $U if already installed.
17774 - ac_i=`echo "$ac_i" |
17775 - sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
17776 - # 2. Add them.
17777 - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
17778 - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
17779 + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
17780 + ac_i=`echo "$ac_i" | sed "$ac_script"`
17781 + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
17782 + # will be set to the directory where LIBOBJS objects are built.
17783 + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
17784 + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
17785 done
17786 LIBOBJS=$ac_libobjs
17787
17788 @@ -29719,17 +30021,45 @@
17789 ## M4sh Initialization. ##
17790 ## --------------------- ##
17791
17792 -# Be Bourne compatible
17793 +# Be more Bourne compatible
17794 +DUALCASE=1; export DUALCASE # for MKS sh
17795 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
17796 emulate sh
17797 NULLCMD=:
17798 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
17799 # is contrary to our usage. Disable this feature.
17800 alias -g '${1+"$@"}'='"$@"'
17801 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
17802 - set -o posix
17803 + setopt NO_GLOB_SUBST
17804 +else
17805 + case `(set -o) 2>/dev/null` in
17806 + *posix*) set -o posix ;;
17807 +esac
17808 +
17809 +fi
17810 +
17811 +
17812 +
17813 +
17814 +# PATH needs CR
17815 +# Avoid depending upon Character Ranges.
17816 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
17817 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
17818 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
17819 +as_cr_digits='0123456789'
17820 +as_cr_alnum=$as_cr_Letters$as_cr_digits
17821 +
17822 +# The user is always right.
17823 +if test "${PATH_SEPARATOR+set}" != set; then
17824 + echo "#! /bin/sh" >conf$$.sh
17825 + echo "exit 0" >>conf$$.sh
17826 + chmod +x conf$$.sh
17827 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
17828 + PATH_SEPARATOR=';'
17829 + else
17830 + PATH_SEPARATOR=:
17831 + fi
17832 + rm -f conf$$.sh
17833 fi
17834 -DUALCASE=1; export DUALCASE # for MKS sh
17835
17836 # Support unset when possible.
17837 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
17838 @@ -29739,8 +30069,43 @@
17839 fi
17840
17841
17842 +# IFS
17843 +# We need space, tab and new line, in precisely that order. Quoting is
17844 +# there to prevent editors from complaining about space-tab.
17845 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
17846 +# splitting by setting IFS to empty value.)
17847 +as_nl='
17848 +'
17849 +IFS=" "" $as_nl"
17850 +
17851 +# Find who we are. Look in the path if we contain no directory separator.
17852 +case $0 in
17853 + *[\\/]* ) as_myself=$0 ;;
17854 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17855 +for as_dir in $PATH
17856 +do
17857 + IFS=$as_save_IFS
17858 + test -z "$as_dir" && as_dir=.
17859 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
17860 +done
17861 +IFS=$as_save_IFS
17862 +
17863 + ;;
17864 +esac
17865 +# We did not find ourselves, most probably we were run as `sh COMMAND'
17866 +# in which case we are not to be found in the path.
17867 +if test "x$as_myself" = x; then
17868 + as_myself=$0
17869 +fi
17870 +if test ! -f "$as_myself"; then
17871 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
17872 + { (exit 1); exit 1; }
17873 +fi
17874 +
17875 # Work around bugs in pre-3.0 UWIN ksh.
17876 -$as_unset ENV MAIL MAILPATH
17877 +for as_var in ENV MAIL MAILPATH
17878 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
17879 +done
17880 PS1='$ '
17881 PS2='> '
17882 PS4='+ '
17883 @@ -29754,18 +30119,19 @@
17884 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
17885 eval $as_var=C; export $as_var
17886 else
17887 - $as_unset $as_var
17888 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
17889 fi
17890 done
17891
17892 # Required to use basename.
17893 -if expr a : '\(a\)' >/dev/null 2>&1; then
17894 +if expr a : '\(a\)' >/dev/null 2>&1 &&
17895 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
17896 as_expr=expr
17897 else
17898 as_expr=false
17899 fi
17900
17901 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
17902 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
17903 as_basename=basename
17904 else
17905 as_basename=false
17906 @@ -29773,159 +30139,120 @@
17907
17908
17909 # Name of the executable.
17910 -as_me=`$as_basename "$0" ||
17911 +as_me=`$as_basename -- "$0" ||
17912 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
17913 X"$0" : 'X\(//\)$' \| \
17914 - X"$0" : 'X\(/\)$' \| \
17915 - . : '\(.\)' 2>/dev/null ||
17916 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
17917 echo X/"$0" |
17918 - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
17919 - /^X\/\(\/\/\)$/{ s//\1/; q; }
17920 - /^X\/\(\/\).*/{ s//\1/; q; }
17921 - s/.*/./; q'`
17922 + sed '/^.*\/\([^/][^/]*\)\/*$/{
17923 + s//\1/
17924 + q
17925 + }
17926 + /^X\/\(\/\/\)$/{
17927 + s//\1/
17928 + q
17929 + }
17930 + /^X\/\(\/\).*/{
17931 + s//\1/
17932 + q
17933 + }
17934 + s/.*/./; q'`
17935
17936 +# CDPATH.
17937 +$as_unset CDPATH
17938
17939 -# PATH needs CR, and LINENO needs CR and PATH.
17940 -# Avoid depending upon Character Ranges.
17941 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
17942 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
17943 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
17944 -as_cr_digits='0123456789'
17945 -as_cr_alnum=$as_cr_Letters$as_cr_digits
17946 -
17947 -# The user is always right.
17948 -if test "${PATH_SEPARATOR+set}" != set; then
17949 - echo "#! /bin/sh" >conf$$.sh
17950 - echo "exit 0" >>conf$$.sh
17951 - chmod +x conf$$.sh
17952 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
17953 - PATH_SEPARATOR=';'
17954 - else
17955 - PATH_SEPARATOR=:
17956 - fi
17957 - rm -f conf$$.sh
17958 -fi
17959
17960
17961 as_lineno_1=$LINENO
17962 as_lineno_2=$LINENO
17963 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
17964 test "x$as_lineno_1" != "x$as_lineno_2" &&
17965 - test "x$as_lineno_3" = "x$as_lineno_2" || {
17966 - # Find who we are. Look in the path if we contain no path at all
17967 - # relative or not.
17968 - case $0 in
17969 - *[\\/]* ) as_myself=$0 ;;
17970 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17971 -for as_dir in $PATH
17972 -do
17973 - IFS=$as_save_IFS
17974 - test -z "$as_dir" && as_dir=.
17975 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
17976 -done
17977 -
17978 - ;;
17979 - esac
17980 - # We did not find ourselves, most probably we were run as `sh COMMAND'
17981 - # in which case we are not to be found in the path.
17982 - if test "x$as_myself" = x; then
17983 - as_myself=$0
17984 - fi
17985 - if test ! -f "$as_myself"; then
17986 - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
17987 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
17988 - { (exit 1); exit 1; }; }
17989 - fi
17990 - case $CONFIG_SHELL in
17991 - '')
17992 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17993 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
17994 -do
17995 - IFS=$as_save_IFS
17996 - test -z "$as_dir" && as_dir=.
17997 - for as_base in sh bash ksh sh5; do
17998 - case $as_dir in
17999 - /*)
18000 - if ("$as_dir/$as_base" -c '
18001 - as_lineno_1=$LINENO
18002 - as_lineno_2=$LINENO
18003 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
18004 - test "x$as_lineno_1" != "x$as_lineno_2" &&
18005 - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
18006 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
18007 - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
18008 - CONFIG_SHELL=$as_dir/$as_base
18009 - export CONFIG_SHELL
18010 - exec "$CONFIG_SHELL" "$0" ${1+"$@"}
18011 - fi;;
18012 - esac
18013 - done
18014 -done
18015 -;;
18016 - esac
18017 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
18018
18019 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
18020 # uniformly replaced by the line number. The first 'sed' inserts a
18021 - # line-number line before each line; the second 'sed' does the real
18022 - # work. The second script uses 'N' to pair each line-number line
18023 - # with the numbered line, and appends trailing '-' during
18024 - # substitution so that $LINENO is not a special case at line end.
18025 + # line-number line after each line using $LINENO; the second 'sed'
18026 + # does the real work. The second script uses 'N' to pair each
18027 + # line-number line with the line containing $LINENO, and appends
18028 + # trailing '-' during substitution so that $LINENO is not a special
18029 + # case at line end.
18030 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
18031 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
18032 - sed '=' <$as_myself |
18033 + # scripts with optimization help from Paolo Bonzini. Blame Lee
18034 + # E. McMahon (1931-1989) for sed's syntax. :-)
18035 + sed -n '
18036 + p
18037 + /[$]LINENO/=
18038 + ' <$as_myself |
18039 sed '
18040 + s/[$]LINENO.*/&-/
18041 + t lineno
18042 + b
18043 + :lineno
18044 N
18045 - s,$,-,
18046 - : loop
18047 - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
18048 + :loop
18049 + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
18050 t loop
18051 - s,-$,,
18052 - s,^['$as_cr_digits']*\n,,
18053 + s/-\n.*//
18054 ' >$as_me.lineno &&
18055 - chmod +x $as_me.lineno ||
18056 - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
18057 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
18058 + chmod +x "$as_me.lineno" ||
18059 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
18060 { (exit 1); exit 1; }; }
18061
18062 # Don't try to exec as it changes $[0], causing all sort of problems
18063 # (the dirname of $[0] is not the place where we might find the
18064 - # original and so on. Autoconf is especially sensible to this).
18065 - . ./$as_me.lineno
18066 + # original and so on. Autoconf is especially sensitive to this).
18067 + . "./$as_me.lineno"
18068 # Exit status is that of the last command.
18069 exit
18070 }
18071
18072
18073 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
18074 - *c*,-n*) ECHO_N= ECHO_C='
18075 -' ECHO_T=' ' ;;
18076 - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
18077 - *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
18078 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
18079 + as_dirname=dirname
18080 +else
18081 + as_dirname=false
18082 +fi
18083 +
18084 +ECHO_C= ECHO_N= ECHO_T=
18085 +case `echo -n x` in
18086 +-n*)
18087 + case `echo 'x\c'` in
18088 + *c*) ECHO_T=' ';; # ECHO_T is single tab character.
18089 + *) ECHO_C='\c';;
18090 + esac;;
18091 +*)
18092 + ECHO_N='-n';;
18093 esac
18094
18095 -if expr a : '\(a\)' >/dev/null 2>&1; then
18096 +if expr a : '\(a\)' >/dev/null 2>&1 &&
18097 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
18098 as_expr=expr
18099 else
18100 as_expr=false
18101 fi
18102
18103 rm -f conf$$ conf$$.exe conf$$.file
18104 +if test -d conf$$.dir; then
18105 + rm -f conf$$.dir/conf$$.file
18106 +else
18107 + rm -f conf$$.dir
18108 + mkdir conf$$.dir
18109 +fi
18110 echo >conf$$.file
18111 if ln -s conf$$.file conf$$ 2>/dev/null; then
18112 - # We could just check for DJGPP; but this test a) works b) is more generic
18113 - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
18114 - if test -f conf$$.exe; then
18115 - # Don't use ln at all; we don't have any links
18116 + as_ln_s='ln -s'
18117 + # ... but there are two gotchas:
18118 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
18119 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
18120 + # In both cases, we have to default to `cp -p'.
18121 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
18122 as_ln_s='cp -p'
18123 - else
18124 - as_ln_s='ln -s'
18125 - fi
18126 elif ln conf$$.file conf$$ 2>/dev/null; then
18127 as_ln_s=ln
18128 else
18129 as_ln_s='cp -p'
18130 fi
18131 -rm -f conf$$ conf$$.exe conf$$.file
18132 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
18133 +rmdir conf$$.dir 2>/dev/null
18134
18135 if mkdir -p . 2>/dev/null; then
18136 as_mkdir_p=:
18137 @@ -29934,7 +30261,28 @@
18138 as_mkdir_p=false
18139 fi
18140
18141 -as_executable_p="test -f"
18142 +if test -x / >/dev/null 2>&1; then
18143 + as_test_x='test -x'
18144 +else
18145 + if ls -dL / >/dev/null 2>&1; then
18146 + as_ls_L_option=L
18147 + else
18148 + as_ls_L_option=
18149 + fi
18150 + as_test_x='
18151 + eval sh -c '\''
18152 + if test -d "$1"; then
18153 + test -d "$1/.";
18154 + else
18155 + case $1 in
18156 + -*)set "./$1";;
18157 + esac;
18158 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
18159 + ???[sx]*):;;*)false;;esac;fi
18160 + '\'' sh
18161 + '
18162 +fi
18163 +as_executable_p=$as_test_x
18164
18165 # Sed expression to map a string onto a valid CPP name.
18166 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
18167 @@ -29943,31 +30291,14 @@
18168 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
18169
18170
18171 -# IFS
18172 -# We need space, tab and new line, in precisely that order.
18173 -as_nl='
18174 -'
18175 -IFS=" $as_nl"
18176 -
18177 -# CDPATH.
18178 -$as_unset CDPATH
18179 -
18180 exec 6>&1
18181
18182 -# Open the log real soon, to keep \$[0] and so on meaningful, and to
18183 +# Save the log message, to keep $[0] and so on meaningful, and to
18184 # report actual input values of CONFIG_FILES etc. instead of their
18185 -# values after options handling. Logging --version etc. is OK.
18186 -exec 5>>config.log
18187 -{
18188 - echo
18189 - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
18190 -## Running $as_me. ##
18191 -_ASBOX
18192 -} >&5
18193 -cat >&5 <<_CSEOF
18194 -
18195 +# values after options handling.
18196 +ac_log="
18197 This file was extended by libgphoto2_port $as_me 0.6.1, which was
18198 -generated by GNU Autoconf 2.59. Invocation command line was
18199 +generated by GNU Autoconf 2.61. Invocation command line was
18200
18201 CONFIG_FILES = $CONFIG_FILES
18202 CONFIG_HEADERS = $CONFIG_HEADERS
18203 @@ -29975,30 +30306,20 @@
18204 CONFIG_COMMANDS = $CONFIG_COMMANDS
18205 $ $0 $@
18206
18207 -_CSEOF
18208 -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
18209 -echo >&5
18210 +on `(hostname || uname -n) 2>/dev/null | sed 1q`
18211 +"
18212 +
18213 _ACEOF
18214
18215 +cat >>$CONFIG_STATUS <<_ACEOF
18216 # Files that config.status was made for.
18217 -if test -n "$ac_config_files"; then
18218 - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
18219 -fi
18220 +config_files="$ac_config_files"
18221 +config_headers="$ac_config_headers"
18222 +config_commands="$ac_config_commands"
18223
18224 -if test -n "$ac_config_headers"; then
18225 - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
18226 -fi
18227 -
18228 -if test -n "$ac_config_links"; then
18229 - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
18230 -fi
18231 -
18232 -if test -n "$ac_config_commands"; then
18233 - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
18234 -fi
18235 +_ACEOF
18236
18237 cat >>$CONFIG_STATUS <<\_ACEOF
18238 -
18239 ac_cs_usage="\
18240 \`$as_me' instantiates files from templates according to the
18241 current configuration.
18242 @@ -30006,7 +30327,7 @@
18243 Usage: $0 [OPTIONS] [FILE]...
18244
18245 -h, --help print this help, then exit
18246 - -V, --version print version number, then exit
18247 + -V, --version print version number and configuration settings, then exit
18248 -q, --quiet do not print progress messages
18249 -d, --debug don't remove temporary files
18250 --recheck update $as_me by reconfiguring in the same conditions
18251 @@ -30025,19 +30346,21 @@
18252 $config_commands
18253
18254 Report bugs to <bug-autoconf@gnu.org>."
18255 -_ACEOF
18256
18257 +_ACEOF
18258 cat >>$CONFIG_STATUS <<_ACEOF
18259 ac_cs_version="\\
18260 libgphoto2_port config.status 0.6.1
18261 -configured by $0, generated by GNU Autoconf 2.59,
18262 - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
18263 +configured by $0, generated by GNU Autoconf 2.61,
18264 + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
18265
18266 -Copyright (C) 2003 Free Software Foundation, Inc.
18267 +Copyright (C) 2006 Free Software Foundation, Inc.
18268 This config.status script is free software; the Free Software Foundation
18269 gives unlimited permission to copy, distribute and modify it."
18270 -srcdir=$srcdir
18271 -INSTALL="$INSTALL"
18272 +
18273 +ac_pwd='$ac_pwd'
18274 +srcdir='$srcdir'
18275 +INSTALL='$INSTALL'
18276 _ACEOF
18277
18278 cat >>$CONFIG_STATUS <<\_ACEOF
18279 @@ -30048,39 +30371,24 @@
18280 do
18281 case $1 in
18282 --*=*)
18283 - ac_option=`expr "x$1" : 'x\([^=]*\)='`
18284 - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
18285 + ac_option=`expr "X$1" : 'X\([^=]*\)='`
18286 + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
18287 ac_shift=:
18288 ;;
18289 - -*)
18290 + *)
18291 ac_option=$1
18292 ac_optarg=$2
18293 ac_shift=shift
18294 ;;
18295 - *) # This is not an option, so the user has probably given explicit
18296 - # arguments.
18297 - ac_option=$1
18298 - ac_need_defaults=false;;
18299 esac
18300
18301 case $ac_option in
18302 # Handling of the options.
18303 -_ACEOF
18304 -cat >>$CONFIG_STATUS <<\_ACEOF
18305 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
18306 ac_cs_recheck=: ;;
18307 - --version | --vers* | -V )
18308 - echo "$ac_cs_version"; exit 0 ;;
18309 - --he | --h)
18310 - # Conflict between --help and --header
18311 - { { echo "$as_me:$LINENO: error: ambiguous option: $1
18312 -Try \`$0 --help' for more information." >&5
18313 -echo "$as_me: error: ambiguous option: $1
18314 -Try \`$0 --help' for more information." >&2;}
18315 - { (exit 1); exit 1; }; };;
18316 - --help | --hel | -h )
18317 - echo "$ac_cs_usage"; exit 0 ;;
18318 - --debug | --d* | -d )
18319 + --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
18320 + echo "$ac_cs_version"; exit ;;
18321 + --debug | --debu | --deb | --de | --d | -d )
18322 debug=: ;;
18323 --file | --fil | --fi | --f )
18324 $ac_shift
18325 @@ -30090,18 +30398,24 @@
18326 $ac_shift
18327 CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
18328 ac_need_defaults=false;;
18329 + --he | --h)
18330 + # Conflict between --help and --header
18331 + { echo "$as_me: error: ambiguous option: $1
18332 +Try \`$0 --help' for more information." >&2
18333 + { (exit 1); exit 1; }; };;
18334 + --help | --hel | -h )
18335 + echo "$ac_cs_usage"; exit ;;
18336 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
18337 | -silent | --silent | --silen | --sile | --sil | --si | --s)
18338 ac_cs_silent=: ;;
18339
18340 # This is an error.
18341 - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
18342 -Try \`$0 --help' for more information." >&5
18343 -echo "$as_me: error: unrecognized option: $1
18344 -Try \`$0 --help' for more information." >&2;}
18345 + -*) { echo "$as_me: error: unrecognized option: $1
18346 +Try \`$0 --help' for more information." >&2
18347 { (exit 1); exit 1; }; } ;;
18348
18349 - *) ac_config_targets="$ac_config_targets $1" ;;
18350 + *) ac_config_targets="$ac_config_targets $1"
18351 + ac_need_defaults=false ;;
18352
18353 esac
18354 shift
18355 @@ -30117,17 +30431,28 @@
18356 _ACEOF
18357 cat >>$CONFIG_STATUS <<_ACEOF
18358 if \$ac_cs_recheck; then
18359 - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
18360 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
18361 + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
18362 + CONFIG_SHELL=$SHELL
18363 + export CONFIG_SHELL
18364 + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
18365 fi
18366
18367 _ACEOF
18368 +cat >>$CONFIG_STATUS <<\_ACEOF
18369 +exec 5>>config.log
18370 +{
18371 + echo
18372 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
18373 +## Running $as_me. ##
18374 +_ASBOX
18375 + echo "$ac_log"
18376 +} >&5
18377
18378 +_ACEOF
18379 cat >>$CONFIG_STATUS <<_ACEOF
18380 #
18381 -# INIT-COMMANDS section.
18382 +# INIT-COMMANDS
18383 #
18384 -
18385 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
18386 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
18387 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
18388 @@ -30146,34 +30471,35 @@
18389
18390 _ACEOF
18391
18392 -
18393 -
18394 cat >>$CONFIG_STATUS <<\_ACEOF
18395 +
18396 +# Handling of arguments.
18397 for ac_config_target in $ac_config_targets
18398 do
18399 - case "$ac_config_target" in
18400 - # Handling of arguments.
18401 - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
18402 - "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
18403 - "libgphoto2_port/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgphoto2_port/Makefile" ;;
18404 - "serial/Makefile" ) CONFIG_FILES="$CONFIG_FILES serial/Makefile" ;;
18405 - "usb/Makefile" ) CONFIG_FILES="$CONFIG_FILES usb/Makefile" ;;
18406 - "disk/Makefile" ) CONFIG_FILES="$CONFIG_FILES disk/Makefile" ;;
18407 - "ptpip/Makefile" ) CONFIG_FILES="$CONFIG_FILES ptpip/Makefile" ;;
18408 - "gphoto2-port-config" ) CONFIG_FILES="$CONFIG_FILES gphoto2-port-config" ;;
18409 - "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
18410 - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
18411 - "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
18412 - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
18413 - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
18414 - "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
18415 - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
18416 + case $ac_config_target in
18417 + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
18418 + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
18419 + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
18420 + "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
18421 + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
18422 + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
18423 + "libgphoto2_port/Makefile") CONFIG_FILES="$CONFIG_FILES libgphoto2_port/Makefile" ;;
18424 + "serial/Makefile") CONFIG_FILES="$CONFIG_FILES serial/Makefile" ;;
18425 + "usb/Makefile") CONFIG_FILES="$CONFIG_FILES usb/Makefile" ;;
18426 + "disk/Makefile") CONFIG_FILES="$CONFIG_FILES disk/Makefile" ;;
18427 + "ptpip/Makefile") CONFIG_FILES="$CONFIG_FILES ptpip/Makefile" ;;
18428 + "gphoto2-port-config") CONFIG_FILES="$CONFIG_FILES gphoto2-port-config" ;;
18429 + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
18430 + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
18431 + "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
18432 +
18433 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
18434 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
18435 { (exit 1); exit 1; }; };;
18436 esac
18437 done
18438
18439 +
18440 # If the user did not use the arguments to specify the items to instantiate,
18441 # then the envvar interface is used. Set only those that are not.
18442 # We use the long form for the default assignment because of an extremely
18443 @@ -30185,665 +30511,643 @@
18444 fi
18445
18446 # Have a temporary directory for convenience. Make it in the build tree
18447 -# simply because there is no reason to put it here, and in addition,
18448 +# simply because there is no reason against having it here, and in addition,
18449 # creating and moving files from /tmp can sometimes cause problems.
18450 -# Create a temporary directory, and hook for its removal unless debugging.
18451 +# Hook for its removal unless debugging.
18452 +# Note that there is a small window in which the directory will not be cleaned:
18453 +# after its creation but before its name has been assigned to `$tmp'.
18454 $debug ||
18455 {
18456 - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
18457 + tmp=
18458 + trap 'exit_status=$?
18459 + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
18460 +' 0
18461 trap '{ (exit 1); exit 1; }' 1 2 13 15
18462 }
18463 -
18464 # Create a (secure) tmp directory for tmp files.
18465
18466 {
18467 - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
18468 + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
18469 test -n "$tmp" && test -d "$tmp"
18470 } ||
18471 {
18472 - tmp=./confstat$$-$RANDOM
18473 - (umask 077 && mkdir $tmp)
18474 + tmp=./conf$$-$RANDOM
18475 + (umask 077 && mkdir "$tmp")
18476 } ||
18477 {
18478 echo "$me: cannot create a temporary directory in ." >&2
18479 { (exit 1); exit 1; }
18480 }
18481
18482 -_ACEOF
18483 -
18484 -cat >>$CONFIG_STATUS <<_ACEOF
18485 -
18486 #
18487 -# CONFIG_FILES section.
18488 +# Set up the sed scripts for CONFIG_FILES section.
18489 #
18490
18491 # No need to generate the scripts if there are no CONFIG_FILES.
18492 # This happens for instance when ./config.status config.h
18493 -if test -n "\$CONFIG_FILES"; then
18494 - # Protect against being on the right side of a sed subst in config.status.
18495 - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
18496 - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
18497 -s,@SHELL@,$SHELL,;t t
18498 -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
18499 -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
18500 -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
18501 -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
18502 -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
18503 -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
18504 -s,@exec_prefix@,$exec_prefix,;t t
18505 -s,@prefix@,$prefix,;t t
18506 -s,@program_transform_name@,$program_transform_name,;t t
18507 -s,@bindir@,$bindir,;t t
18508 -s,@sbindir@,$sbindir,;t t
18509 -s,@libexecdir@,$libexecdir,;t t
18510 -s,@datadir@,$datadir,;t t
18511 -s,@sysconfdir@,$sysconfdir,;t t
18512 -s,@sharedstatedir@,$sharedstatedir,;t t
18513 -s,@localstatedir@,$localstatedir,;t t
18514 -s,@libdir@,$libdir,;t t
18515 -s,@includedir@,$includedir,;t t
18516 -s,@oldincludedir@,$oldincludedir,;t t
18517 -s,@infodir@,$infodir,;t t
18518 -s,@mandir@,$mandir,;t t
18519 -s,@build_alias@,$build_alias,;t t
18520 -s,@host_alias@,$host_alias,;t t
18521 -s,@target_alias@,$target_alias,;t t
18522 -s,@DEFS@,$DEFS,;t t
18523 -s,@ECHO_C@,$ECHO_C,;t t
18524 -s,@ECHO_N@,$ECHO_N,;t t
18525 -s,@ECHO_T@,$ECHO_T,;t t
18526 -s,@LIBS@,$LIBS,;t t
18527 -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
18528 -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
18529 -s,@INSTALL_DATA@,$INSTALL_DATA,;t t
18530 -s,@CYGPATH_W@,$CYGPATH_W,;t t
18531 -s,@PACKAGE@,$PACKAGE,;t t
18532 -s,@VERSION@,$VERSION,;t t
18533 -s,@ACLOCAL@,$ACLOCAL,;t t
18534 -s,@AUTOCONF@,$AUTOCONF,;t t
18535 -s,@AUTOMAKE@,$AUTOMAKE,;t t
18536 -s,@AUTOHEADER@,$AUTOHEADER,;t t
18537 -s,@MAKEINFO@,$MAKEINFO,;t t
18538 -s,@install_sh@,$install_sh,;t t
18539 -s,@STRIP@,$STRIP,;t t
18540 -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
18541 -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
18542 -s,@mkdir_p@,$mkdir_p,;t t
18543 -s,@AWK@,$AWK,;t t
18544 -s,@SET_MAKE@,$SET_MAKE,;t t
18545 -s,@am__leading_dot@,$am__leading_dot,;t t
18546 -s,@AMTAR@,$AMTAR,;t t
18547 -s,@am__tar@,$am__tar,;t t
18548 -s,@am__untar@,$am__untar,;t t
18549 -s,@LIBGPHOTO2_PORT_AGE@,$LIBGPHOTO2_PORT_AGE,;t t
18550 -s,@LIBGPHOTO2_PORT_REVISION@,$LIBGPHOTO2_PORT_REVISION,;t t
18551 -s,@LIBGPHOTO2_PORT_CURRENT@,$LIBGPHOTO2_PORT_CURRENT,;t t
18552 -s,@LIBGPHOTO2_PORT_CURRENT_MIN@,$LIBGPHOTO2_PORT_CURRENT_MIN,;t t
18553 -s,@LIBGPHOTO2_PORT_VERSION_INFO@,$LIBGPHOTO2_PORT_VERSION_INFO,;t t
18554 -s,@CC@,$CC,;t t
18555 -s,@CFLAGS@,$CFLAGS,;t t
18556 -s,@LDFLAGS@,$LDFLAGS,;t t
18557 -s,@CPPFLAGS@,$CPPFLAGS,;t t
18558 -s,@ac_ct_CC@,$ac_ct_CC,;t t
18559 -s,@EXEEXT@,$EXEEXT,;t t
18560 -s,@OBJEXT@,$OBJEXT,;t t
18561 -s,@DEPDIR@,$DEPDIR,;t t
18562 -s,@am__include@,$am__include,;t t
18563 -s,@am__quote@,$am__quote,;t t
18564 -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
18565 -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
18566 -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
18567 -s,@CCDEPMODE@,$CCDEPMODE,;t t
18568 -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
18569 -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
18570 -s,@CPP@,$CPP,;t t
18571 -s,@EGREP@,$EGREP,;t t
18572 -s,@INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t
18573 -s,@INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
18574 -s,@CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
18575 -s,@CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
18576 -s,@build@,$build,;t t
18577 -s,@build_cpu@,$build_cpu,;t t
18578 -s,@build_vendor@,$build_vendor,;t t
18579 -s,@build_os@,$build_os,;t t
18580 -s,@host@,$host,;t t
18581 -s,@host_cpu@,$host_cpu,;t t
18582 -s,@host_vendor@,$host_vendor,;t t
18583 -s,@host_os@,$host_os,;t t
18584 -s,@LIBADD_DL@,$LIBADD_DL,;t t
18585 -s,@LIBLTDL@,$LIBLTDL,;t t
18586 -s,@INCLTDL@,$INCLTDL,;t t
18587 -s,@subdirs@,$subdirs,;t t
18588 -s,@LN_S@,$LN_S,;t t
18589 -s,@ECHO@,$ECHO,;t t
18590 -s,@AR@,$AR,;t t
18591 -s,@ac_ct_AR@,$ac_ct_AR,;t t
18592 -s,@RANLIB@,$RANLIB,;t t
18593 -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
18594 -s,@DLLTOOL@,$DLLTOOL,;t t
18595 -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
18596 -s,@AS@,$AS,;t t
18597 -s,@ac_ct_AS@,$ac_ct_AS,;t t
18598 -s,@OBJDUMP@,$OBJDUMP,;t t
18599 -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
18600 -s,@CXX@,$CXX,;t t
18601 -s,@CXXFLAGS@,$CXXFLAGS,;t t
18602 -s,@ac_ct_CXX@,$ac_ct_CXX,;t t
18603 -s,@CXXDEPMODE@,$CXXDEPMODE,;t t
18604 -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
18605 -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
18606 -s,@CXXCPP@,$CXXCPP,;t t
18607 -s,@F77@,$F77,;t t
18608 -s,@FFLAGS@,$FFLAGS,;t t
18609 -s,@ac_ct_F77@,$ac_ct_F77,;t t
18610 -s,@LIBTOOL@,$LIBTOOL,;t t
18611 -s,@LTDLINCL@,$LTDLINCL,;t t
18612 -s,@URL_GPHOTO_HOME@,$URL_GPHOTO_HOME,;t t
18613 -s,@URL_GPHOTO_PROJECT@,$URL_GPHOTO_PROJECT,;t t
18614 -s,@URL_DIGICAM_LIST@,$URL_DIGICAM_LIST,;t t
18615 -s,@URL_JPHOTO_HOME@,$URL_JPHOTO_HOME,;t t
18616 -s,@URL_USB_MASSSTORAGE@,$URL_USB_MASSSTORAGE,;t t
18617 -s,@MAIL_GPHOTO_DEVEL@,$MAIL_GPHOTO_DEVEL,;t t
18618 -s,@MAIL_GPHOTO_USER@,$MAIL_GPHOTO_USER,;t t
18619 -s,@MAIL_GPHOTO_TRANSLATION@,$MAIL_GPHOTO_TRANSLATION,;t t
18620 -s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
18621 -s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
18622 -s,@USE_NLS@,$USE_NLS,;t t
18623 -s,@MSGFMT@,$MSGFMT,;t t
18624 -s,@GMSGFMT@,$GMSGFMT,;t t
18625 -s,@XGETTEXT@,$XGETTEXT,;t t
18626 -s,@MSGMERGE@,$MSGMERGE,;t t
18627 -s,@LIBICONV@,$LIBICONV,;t t
18628 -s,@LTLIBICONV@,$LTLIBICONV,;t t
18629 -s,@INTLLIBS@,$INTLLIBS,;t t
18630 -s,@LIBINTL@,$LIBINTL,;t t
18631 -s,@LTLIBINTL@,$LTLIBINTL,;t t
18632 -s,@POSUB@,$POSUB,;t t
18633 -s,@localedir@,$localedir,;t t
18634 -s,@MDNS_LIBS@,$MDNS_LIBS,;t t
18635 -s,@SERIAL_LIBS@,$SERIAL_LIBS,;t t
18636 -s,@PKG_CONFIG@,$PKG_CONFIG,;t t
18637 -s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t
18638 -s,@LIBUSB_CFLAGS@,$LIBUSB_CFLAGS,;t t
18639 -s,@LIBUSB_LIBS@,$LIBUSB_LIBS,;t t
18640 -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
18641 -s,@LIBUSB_CONFIG_PROG@,$LIBUSB_CONFIG_PROG,;t t
18642 -s,@HAVE_LIBUSB_TRUE@,$HAVE_LIBUSB_TRUE,;t t
18643 -s,@HAVE_LIBUSB_FALSE@,$HAVE_LIBUSB_FALSE,;t t
18644 -s,@HAL_CFLAGS@,$HAL_CFLAGS,;t t
18645 -s,@HAL_LIBS@,$HAL_LIBS,;t t
18646 -s,@IOLIB_SUBDIRS@,$IOLIB_SUBDIRS,;t t
18647 -s,@iolibdir@,$iolibdir,;t t
18648 -s,@docdir@,$docdir,;t t
18649 -s,@GTKDOC@,$GTKDOC,;t t
18650 -s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t
18651 -s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t
18652 -s,@htmldir@,$htmldir,;t t
18653 -s,@apidocdir}@,$apidocdir},;t t
18654 -s,@AM_CPPFLAGS@,$AM_CPPFLAGS,;t t
18655 -s,@AM_LDFLAGS@,$AM_LDFLAGS,;t t
18656 -s,@LIBOBJS@,$LIBOBJS,;t t
18657 -s,@LTLIBOBJS@,$LTLIBOBJS,;t t
18658 -CEOF
18659 -
18660 -_ACEOF
18661 -
18662 - cat >>$CONFIG_STATUS <<\_ACEOF
18663 - # Split the substitutions into bite-sized pieces for seds with
18664 - # small command number limits, like on Digital OSF/1 and HP-UX.
18665 - ac_max_sed_lines=48
18666 - ac_sed_frag=1 # Number of current file.
18667 - ac_beg=1 # First line for current file.
18668 - ac_end=$ac_max_sed_lines # Line after last line for current file.
18669 - ac_more_lines=:
18670 - ac_sed_cmds=
18671 - while $ac_more_lines; do
18672 - if test $ac_beg -gt 1; then
18673 - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
18674 - else
18675 - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
18676 - fi
18677 - if test ! -s $tmp/subs.frag; then
18678 - ac_more_lines=false
18679 - else
18680 - # The purpose of the label and of the branching condition is to
18681 - # speed up the sed processing (if there are no `@' at all, there
18682 - # is no need to browse any of the substitutions).
18683 - # These are the two extra sed commands mentioned above.
18684 - (echo ':t
18685 - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
18686 - if test -z "$ac_sed_cmds"; then
18687 - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
18688 - else
18689 - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
18690 - fi
18691 - ac_sed_frag=`expr $ac_sed_frag + 1`
18692 - ac_beg=$ac_end
18693 - ac_end=`expr $ac_end + $ac_max_sed_lines`
18694 - fi
18695 - done
18696 - if test -z "$ac_sed_cmds"; then
18697 - ac_sed_cmds=cat
18698 +if test -n "$CONFIG_FILES"; then
18699 +
18700 +_ACEOF
18701 +
18702 +
18703 +
18704 +ac_delim='%!_!# '
18705 +for ac_last_try in false false false false false :; do
18706 + cat >conf$$subs.sed <<_ACEOF
18707 +SHELL!$SHELL$ac_delim
18708 +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
18709 +PACKAGE_NAME!$PACKAGE_NAME$ac_delim
18710 +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
18711 +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
18712 +PACKAGE_STRING!$PACKAGE_STRING$ac_delim
18713 +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
18714 +exec_prefix!$exec_prefix$ac_delim
18715 +prefix!$prefix$ac_delim
18716 +program_transform_name!$program_transform_name$ac_delim
18717 +bindir!$bindir$ac_delim
18718 +sbindir!$sbindir$ac_delim
18719 +libexecdir!$libexecdir$ac_delim
18720 +datarootdir!$datarootdir$ac_delim
18721 +datadir!$datadir$ac_delim
18722 +sysconfdir!$sysconfdir$ac_delim
18723 +sharedstatedir!$sharedstatedir$ac_delim
18724 +localstatedir!$localstatedir$ac_delim
18725 +includedir!$includedir$ac_delim
18726 +oldincludedir!$oldincludedir$ac_delim
18727 +docdir!$docdir$ac_delim
18728 +infodir!$infodir$ac_delim
18729 +htmldir!$htmldir$ac_delim
18730 +dvidir!$dvidir$ac_delim
18731 +pdfdir!$pdfdir$ac_delim
18732 +psdir!$psdir$ac_delim
18733 +libdir!$libdir$ac_delim
18734 +localedir!$localedir$ac_delim
18735 +mandir!$mandir$ac_delim
18736 +DEFS!$DEFS$ac_delim
18737 +ECHO_C!$ECHO_C$ac_delim
18738 +ECHO_N!$ECHO_N$ac_delim
18739 +ECHO_T!$ECHO_T$ac_delim
18740 +LIBS!$LIBS$ac_delim
18741 +build_alias!$build_alias$ac_delim
18742 +host_alias!$host_alias$ac_delim
18743 +target_alias!$target_alias$ac_delim
18744 +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
18745 +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
18746 +INSTALL_DATA!$INSTALL_DATA$ac_delim
18747 +CYGPATH_W!$CYGPATH_W$ac_delim
18748 +PACKAGE!$PACKAGE$ac_delim
18749 +VERSION!$VERSION$ac_delim
18750 +ACLOCAL!$ACLOCAL$ac_delim
18751 +AUTOCONF!$AUTOCONF$ac_delim
18752 +AUTOMAKE!$AUTOMAKE$ac_delim
18753 +AUTOHEADER!$AUTOHEADER$ac_delim
18754 +MAKEINFO!$MAKEINFO$ac_delim
18755 +install_sh!$install_sh$ac_delim
18756 +STRIP!$STRIP$ac_delim
18757 +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
18758 +mkdir_p!$mkdir_p$ac_delim
18759 +AWK!$AWK$ac_delim
18760 +SET_MAKE!$SET_MAKE$ac_delim
18761 +am__leading_dot!$am__leading_dot$ac_delim
18762 +AMTAR!$AMTAR$ac_delim
18763 +am__tar!$am__tar$ac_delim
18764 +am__untar!$am__untar$ac_delim
18765 +LIBGPHOTO2_PORT_AGE!$LIBGPHOTO2_PORT_AGE$ac_delim
18766 +LIBGPHOTO2_PORT_REVISION!$LIBGPHOTO2_PORT_REVISION$ac_delim
18767 +LIBGPHOTO2_PORT_CURRENT!$LIBGPHOTO2_PORT_CURRENT$ac_delim
18768 +LIBGPHOTO2_PORT_CURRENT_MIN!$LIBGPHOTO2_PORT_CURRENT_MIN$ac_delim
18769 +LIBGPHOTO2_PORT_VERSION_INFO!$LIBGPHOTO2_PORT_VERSION_INFO$ac_delim
18770 +CC!$CC$ac_delim
18771 +CFLAGS!$CFLAGS$ac_delim
18772 +LDFLAGS!$LDFLAGS$ac_delim
18773 +CPPFLAGS!$CPPFLAGS$ac_delim
18774 +ac_ct_CC!$ac_ct_CC$ac_delim
18775 +EXEEXT!$EXEEXT$ac_delim
18776 +OBJEXT!$OBJEXT$ac_delim
18777 +DEPDIR!$DEPDIR$ac_delim
18778 +am__include!$am__include$ac_delim
18779 +am__quote!$am__quote$ac_delim
18780 +AMDEP_TRUE!$AMDEP_TRUE$ac_delim
18781 +AMDEP_FALSE!$AMDEP_FALSE$ac_delim
18782 +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
18783 +CCDEPMODE!$CCDEPMODE$ac_delim
18784 +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
18785 +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
18786 +CPP!$CPP$ac_delim
18787 +GREP!$GREP$ac_delim
18788 +EGREP!$EGREP$ac_delim
18789 +INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim
18790 +INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim
18791 +CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim
18792 +CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim
18793 +build!$build$ac_delim
18794 +build_cpu!$build_cpu$ac_delim
18795 +build_vendor!$build_vendor$ac_delim
18796 +build_os!$build_os$ac_delim
18797 +host!$host$ac_delim
18798 +host_cpu!$host_cpu$ac_delim
18799 +host_vendor!$host_vendor$ac_delim
18800 +host_os!$host_os$ac_delim
18801 +LIBADD_DL!$LIBADD_DL$ac_delim
18802 +LIBLTDL!$LIBLTDL$ac_delim
18803 +INCLTDL!$INCLTDL$ac_delim
18804 +_ACEOF
18805 +
18806 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
18807 + break
18808 + elif $ac_last_try; then
18809 + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18810 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18811 + { (exit 1); exit 1; }; }
18812 + else
18813 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18814 fi
18815 -fi # test -n "$CONFIG_FILES"
18816 +done
18817 +
18818 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
18819 +if test -n "$ac_eof"; then
18820 + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
18821 + ac_eof=`expr $ac_eof + 1`
18822 +fi
18823
18824 +cat >>$CONFIG_STATUS <<_ACEOF
18825 +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
18826 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
18827 _ACEOF
18828 +sed '
18829 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
18830 +s/^/s,@/; s/!/@,|#_!!_#|/
18831 +:n
18832 +t n
18833 +s/'"$ac_delim"'$/,g/; t
18834 +s/$/\\/; p
18835 +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
18836 +' >>$CONFIG_STATUS <conf$$subs.sed
18837 +rm -f conf$$subs.sed
18838 +cat >>$CONFIG_STATUS <<_ACEOF
18839 +CEOF$ac_eof
18840 +_ACEOF
18841 +
18842 +
18843 +ac_delim='%!_!# '
18844 +for ac_last_try in false false false false false :; do
18845 + cat >conf$$subs.sed <<_ACEOF
18846 +subdirs!$subdirs$ac_delim
18847 +LN_S!$LN_S$ac_delim
18848 +ECHO!$ECHO$ac_delim
18849 +AR!$AR$ac_delim
18850 +RANLIB!$RANLIB$ac_delim
18851 +DLLTOOL!$DLLTOOL$ac_delim
18852 +AS!$AS$ac_delim
18853 +OBJDUMP!$OBJDUMP$ac_delim
18854 +CXX!$CXX$ac_delim
18855 +CXXFLAGS!$CXXFLAGS$ac_delim
18856 +ac_ct_CXX!$ac_ct_CXX$ac_delim
18857 +CXXDEPMODE!$CXXDEPMODE$ac_delim
18858 +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
18859 +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
18860 +CXXCPP!$CXXCPP$ac_delim
18861 +F77!$F77$ac_delim
18862 +FFLAGS!$FFLAGS$ac_delim
18863 +ac_ct_F77!$ac_ct_F77$ac_delim
18864 +LIBTOOL!$LIBTOOL$ac_delim
18865 +LTDLINCL!$LTDLINCL$ac_delim
18866 +URL_GPHOTO_HOME!$URL_GPHOTO_HOME$ac_delim
18867 +URL_GPHOTO_PROJECT!$URL_GPHOTO_PROJECT$ac_delim
18868 +URL_DIGICAM_LIST!$URL_DIGICAM_LIST$ac_delim
18869 +URL_JPHOTO_HOME!$URL_JPHOTO_HOME$ac_delim
18870 +URL_USB_MASSSTORAGE!$URL_USB_MASSSTORAGE$ac_delim
18871 +MAIL_GPHOTO_DEVEL!$MAIL_GPHOTO_DEVEL$ac_delim
18872 +MAIL_GPHOTO_USER!$MAIL_GPHOTO_USER$ac_delim
18873 +MAIL_GPHOTO_TRANSLATION!$MAIL_GPHOTO_TRANSLATION$ac_delim
18874 +GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
18875 +MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
18876 +USE_NLS!$USE_NLS$ac_delim
18877 +MSGFMT!$MSGFMT$ac_delim
18878 +GMSGFMT!$GMSGFMT$ac_delim
18879 +XGETTEXT!$XGETTEXT$ac_delim
18880 +MSGMERGE!$MSGMERGE$ac_delim
18881 +LIBICONV!$LIBICONV$ac_delim
18882 +LTLIBICONV!$LTLIBICONV$ac_delim
18883 +INTLLIBS!$INTLLIBS$ac_delim
18884 +LIBINTL!$LIBINTL$ac_delim
18885 +LTLIBINTL!$LTLIBINTL$ac_delim
18886 +POSUB!$POSUB$ac_delim
18887 +MDNS_LIBS!$MDNS_LIBS$ac_delim
18888 +SERIAL_LIBS!$SERIAL_LIBS$ac_delim
18889 +PKG_CONFIG!$PKG_CONFIG$ac_delim
18890 +PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
18891 +LIBUSB_CFLAGS!$LIBUSB_CFLAGS$ac_delim
18892 +LIBUSB_LIBS!$LIBUSB_LIBS$ac_delim
18893 +LIBUSB_CONFIG_PROG!$LIBUSB_CONFIG_PROG$ac_delim
18894 +HAVE_LIBUSB_TRUE!$HAVE_LIBUSB_TRUE$ac_delim
18895 +HAVE_LIBUSB_FALSE!$HAVE_LIBUSB_FALSE$ac_delim
18896 +IOLIB_SUBDIRS!$IOLIB_SUBDIRS$ac_delim
18897 +iolibdir!$iolibdir$ac_delim
18898 +GTKDOC!$GTKDOC$ac_delim
18899 +ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
18900 +ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
18901 +apidocdir}!$apidocdir}$ac_delim
18902 +AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
18903 +AM_LDFLAGS!$AM_LDFLAGS$ac_delim
18904 +LIBOBJS!$LIBOBJS$ac_delim
18905 +LTLIBOBJS!$LTLIBOBJS$ac_delim
18906 +_ACEOF
18907 +
18908 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
18909 + break
18910 + elif $ac_last_try; then
18911 + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18912 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18913 + { (exit 1); exit 1; }; }
18914 + else
18915 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18916 + fi
18917 +done
18918 +
18919 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
18920 +if test -n "$ac_eof"; then
18921 + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
18922 + ac_eof=`expr $ac_eof + 1`
18923 +fi
18924 +
18925 +cat >>$CONFIG_STATUS <<_ACEOF
18926 +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
18927 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
18928 +_ACEOF
18929 +sed '
18930 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
18931 +s/^/s,@/; s/!/@,|#_!!_#|/
18932 +:n
18933 +t n
18934 +s/'"$ac_delim"'$/,g/; t
18935 +s/$/\\/; p
18936 +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
18937 +' >>$CONFIG_STATUS <conf$$subs.sed
18938 +rm -f conf$$subs.sed
18939 +cat >>$CONFIG_STATUS <<_ACEOF
18940 +:end
18941 +s/|#_!!_#|//g
18942 +CEOF$ac_eof
18943 +_ACEOF
18944 +
18945 +
18946 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
18947 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
18948 +# trailing colons and then remove the whole line if VPATH becomes empty
18949 +# (actually we leave an empty line to preserve line numbers).
18950 +if test "x$srcdir" = x.; then
18951 + ac_vpsub='/^[ ]*VPATH[ ]*=/{
18952 +s/:*\$(srcdir):*/:/
18953 +s/:*\${srcdir}:*/:/
18954 +s/:*@srcdir@:*/:/
18955 +s/^\([^=]*=[ ]*\):*/\1/
18956 +s/:*$//
18957 +s/^[^=]*=[ ]*$//
18958 +}'
18959 +fi
18960 +
18961 cat >>$CONFIG_STATUS <<\_ACEOF
18962 -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
18963 - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
18964 - case $ac_file in
18965 - - | *:- | *:-:* ) # input from stdin
18966 - cat >$tmp/stdin
18967 - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
18968 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
18969 - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
18970 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
18971 - * ) ac_file_in=$ac_file.in ;;
18972 +fi # test -n "$CONFIG_FILES"
18973 +
18974 +
18975 +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
18976 +do
18977 + case $ac_tag in
18978 + :[FHLC]) ac_mode=$ac_tag; continue;;
18979 + esac
18980 + case $ac_mode$ac_tag in
18981 + :[FHL]*:*);;
18982 + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
18983 +echo "$as_me: error: Invalid tag $ac_tag." >&2;}
18984 + { (exit 1); exit 1; }; };;
18985 + :[FH]-) ac_tag=-:-;;
18986 + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
18987 + esac
18988 + ac_save_IFS=$IFS
18989 + IFS=:
18990 + set x $ac_tag
18991 + IFS=$ac_save_IFS
18992 + shift
18993 + ac_file=$1
18994 + shift
18995 +
18996 + case $ac_mode in
18997 + :L) ac_source=$1;;
18998 + :[FH])
18999 + ac_file_inputs=
19000 + for ac_f
19001 + do
19002 + case $ac_f in
19003 + -) ac_f="$tmp/stdin";;
19004 + *) # Look for the file first in the build tree, then in the source tree
19005 + # (if the path is not absolute). The absolute path cannot be DOS-style,
19006 + # because $ac_f cannot contain `:'.
19007 + test -f "$ac_f" ||
19008 + case $ac_f in
19009 + [\\/$]*) false;;
19010 + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
19011 + esac ||
19012 + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
19013 +echo "$as_me: error: cannot find input file: $ac_f" >&2;}
19014 + { (exit 1); exit 1; }; };;
19015 + esac
19016 + ac_file_inputs="$ac_file_inputs $ac_f"
19017 + done
19018 +
19019 + # Let's still pretend it is `configure' which instantiates (i.e., don't
19020 + # use $as_me), people would be surprised to read:
19021 + # /* config.h. Generated by config.status. */
19022 + configure_input="Generated from "`IFS=:
19023 + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
19024 + if test x"$ac_file" != x-; then
19025 + configure_input="$ac_file. $configure_input"
19026 + { echo "$as_me:$LINENO: creating $ac_file" >&5
19027 +echo "$as_me: creating $ac_file" >&6;}
19028 + fi
19029 +
19030 + case $ac_tag in
19031 + *:-:* | *:-) cat >"$tmp/stdin";;
19032 + esac
19033 + ;;
19034 esac
19035
19036 - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
19037 - ac_dir=`(dirname "$ac_file") 2>/dev/null ||
19038 + ac_dir=`$as_dirname -- "$ac_file" ||
19039 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19040 X"$ac_file" : 'X\(//\)[^/]' \| \
19041 X"$ac_file" : 'X\(//\)$' \| \
19042 - X"$ac_file" : 'X\(/\)' \| \
19043 - . : '\(.\)' 2>/dev/null ||
19044 + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
19045 echo X"$ac_file" |
19046 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19047 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19048 - /^X\(\/\/\)$/{ s//\1/; q; }
19049 - /^X\(\/\).*/{ s//\1/; q; }
19050 - s/.*/./; q'`
19051 - { if $as_mkdir_p; then
19052 - mkdir -p "$ac_dir"
19053 - else
19054 - as_dir="$ac_dir"
19055 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
19056 + s//\1/
19057 + q
19058 + }
19059 + /^X\(\/\/\)[^/].*/{
19060 + s//\1/
19061 + q
19062 + }
19063 + /^X\(\/\/\)$/{
19064 + s//\1/
19065 + q
19066 + }
19067 + /^X\(\/\).*/{
19068 + s//\1/
19069 + q
19070 + }
19071 + s/.*/./; q'`
19072 + { as_dir="$ac_dir"
19073 + case $as_dir in #(
19074 + -*) as_dir=./$as_dir;;
19075 + esac
19076 + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
19077 as_dirs=
19078 - while test ! -d "$as_dir"; do
19079 - as_dirs="$as_dir $as_dirs"
19080 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
19081 + while :; do
19082 + case $as_dir in #(
19083 + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
19084 + *) as_qdir=$as_dir;;
19085 + esac
19086 + as_dirs="'$as_qdir' $as_dirs"
19087 + as_dir=`$as_dirname -- "$as_dir" ||
19088 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19089 X"$as_dir" : 'X\(//\)[^/]' \| \
19090 X"$as_dir" : 'X\(//\)$' \| \
19091 - X"$as_dir" : 'X\(/\)' \| \
19092 - . : '\(.\)' 2>/dev/null ||
19093 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
19094 echo X"$as_dir" |
19095 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19096 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19097 - /^X\(\/\/\)$/{ s//\1/; q; }
19098 - /^X\(\/\).*/{ s//\1/; q; }
19099 - s/.*/./; q'`
19100 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
19101 + s//\1/
19102 + q
19103 + }
19104 + /^X\(\/\/\)[^/].*/{
19105 + s//\1/
19106 + q
19107 + }
19108 + /^X\(\/\/\)$/{
19109 + s//\1/
19110 + q
19111 + }
19112 + /^X\(\/\).*/{
19113 + s//\1/
19114 + q
19115 + }
19116 + s/.*/./; q'`
19117 + test -d "$as_dir" && break
19118 done
19119 - test ! -n "$as_dirs" || mkdir $as_dirs
19120 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
19121 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
19122 + test -z "$as_dirs" || eval "mkdir $as_dirs"
19123 + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
19124 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
19125 { (exit 1); exit 1; }; }; }
19126 -
19127 ac_builddir=.
19128
19129 -if test "$ac_dir" != .; then
19130 +case "$ac_dir" in
19131 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
19132 +*)
19133 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
19134 - # A "../" for each directory in $ac_dir_suffix.
19135 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
19136 -else
19137 - ac_dir_suffix= ac_top_builddir=
19138 -fi
19139 + # A ".." for each directory in $ac_dir_suffix.
19140 + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
19141 + case $ac_top_builddir_sub in
19142 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
19143 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
19144 + esac ;;
19145 +esac
19146 +ac_abs_top_builddir=$ac_pwd
19147 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
19148 +# for backward compatibility:
19149 +ac_top_builddir=$ac_top_build_prefix
19150
19151 case $srcdir in
19152 - .) # No --srcdir option. We are building in place.
19153 + .) # We are building in place.
19154 ac_srcdir=.
19155 - if test -z "$ac_top_builddir"; then
19156 - ac_top_srcdir=.
19157 - else
19158 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
19159 - fi ;;
19160 - [\\/]* | ?:[\\/]* ) # Absolute path.
19161 + ac_top_srcdir=$ac_top_builddir_sub
19162 + ac_abs_top_srcdir=$ac_pwd ;;
19163 + [\\/]* | ?:[\\/]* ) # Absolute name.
19164 ac_srcdir=$srcdir$ac_dir_suffix;
19165 - ac_top_srcdir=$srcdir ;;
19166 - *) # Relative path.
19167 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
19168 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
19169 + ac_top_srcdir=$srcdir
19170 + ac_abs_top_srcdir=$srcdir ;;
19171 + *) # Relative name.
19172 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
19173 + ac_top_srcdir=$ac_top_build_prefix$srcdir
19174 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
19175 esac
19176 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
19177
19178 -# Do not use `cd foo && pwd` to compute absolute paths, because
19179 -# the directories may not exist.
19180 -case `pwd` in
19181 -.) ac_abs_builddir="$ac_dir";;
19182 -*)
19183 - case "$ac_dir" in
19184 - .) ac_abs_builddir=`pwd`;;
19185 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
19186 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
19187 - esac;;
19188 -esac
19189 -case $ac_abs_builddir in
19190 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
19191 -*)
19192 - case ${ac_top_builddir}. in
19193 - .) ac_abs_top_builddir=$ac_abs_builddir;;
19194 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
19195 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
19196 - esac;;
19197 -esac
19198 -case $ac_abs_builddir in
19199 -.) ac_abs_srcdir=$ac_srcdir;;
19200 -*)
19201 - case $ac_srcdir in
19202 - .) ac_abs_srcdir=$ac_abs_builddir;;
19203 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
19204 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
19205 - esac;;
19206 -esac
19207 -case $ac_abs_builddir in
19208 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
19209 -*)
19210 - case $ac_top_srcdir in
19211 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
19212 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
19213 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
19214 - esac;;
19215 -esac
19216
19217 + case $ac_mode in
19218 + :F)
19219 + #
19220 + # CONFIG_FILE
19221 + #
19222
19223 case $INSTALL in
19224 [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
19225 - *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
19226 + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
19227 esac
19228 +_ACEOF
19229
19230 - # Let's still pretend it is `configure' which instantiates (i.e., don't
19231 - # use $as_me), people would be surprised to read:
19232 - # /* config.h. Generated by config.status. */
19233 - if test x"$ac_file" = x-; then
19234 - configure_input=
19235 - else
19236 - configure_input="$ac_file. "
19237 - fi
19238 - configure_input=$configure_input"Generated from `echo $ac_file_in |
19239 - sed 's,.*/,,'` by configure."
19240 -
19241 - # First look for the input files in the build tree, otherwise in the
19242 - # src tree.
19243 - ac_file_inputs=`IFS=:
19244 - for f in $ac_file_in; do
19245 - case $f in
19246 - -) echo $tmp/stdin ;;
19247 - [\\/$]*)
19248 - # Absolute (can't be DOS-style, as IFS=:)
19249 - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
19250 -echo "$as_me: error: cannot find input file: $f" >&2;}
19251 - { (exit 1); exit 1; }; }
19252 - echo "$f";;
19253 - *) # Relative
19254 - if test -f "$f"; then
19255 - # Build tree
19256 - echo "$f"
19257 - elif test -f "$srcdir/$f"; then
19258 - # Source tree
19259 - echo "$srcdir/$f"
19260 - else
19261 - # /dev/null tree
19262 - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
19263 -echo "$as_me: error: cannot find input file: $f" >&2;}
19264 - { (exit 1); exit 1; }; }
19265 - fi;;
19266 - esac
19267 - done` || { (exit 1); exit 1; }
19268 -
19269 - if test x"$ac_file" != x-; then
19270 - { echo "$as_me:$LINENO: creating $ac_file" >&5
19271 -echo "$as_me: creating $ac_file" >&6;}
19272 - rm -f "$ac_file"
19273 - fi
19274 +cat >>$CONFIG_STATUS <<\_ACEOF
19275 +# If the template does not know about datarootdir, expand it.
19276 +# FIXME: This hack should be removed a few years after 2.60.
19277 +ac_datarootdir_hack=; ac_datarootdir_seen=
19278 +
19279 +case `sed -n '/datarootdir/ {
19280 + p
19281 + q
19282 +}
19283 +/@datadir@/p
19284 +/@docdir@/p
19285 +/@infodir@/p
19286 +/@localedir@/p
19287 +/@mandir@/p
19288 +' $ac_file_inputs` in
19289 +*datarootdir*) ac_datarootdir_seen=yes;;
19290 +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
19291 + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
19292 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
19293 _ACEOF
19294 cat >>$CONFIG_STATUS <<_ACEOF
19295 + ac_datarootdir_hack='
19296 + s&@datadir@&$datadir&g
19297 + s&@docdir@&$docdir&g
19298 + s&@infodir@&$infodir&g
19299 + s&@localedir@&$localedir&g
19300 + s&@mandir@&$mandir&g
19301 + s&\\\${datarootdir}&$datarootdir&g' ;;
19302 +esac
19303 +_ACEOF
19304 +
19305 +# Neutralize VPATH when `$srcdir' = `.'.
19306 +# Shell code in configure.ac might set extrasub.
19307 +# FIXME: do we really want to maintain this feature?
19308 +cat >>$CONFIG_STATUS <<_ACEOF
19309 sed "$ac_vpsub
19310 $extrasub
19311 _ACEOF
19312 cat >>$CONFIG_STATUS <<\_ACEOF
19313 :t
19314 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
19315 -s,@configure_input@,$configure_input,;t t
19316 -s,@srcdir@,$ac_srcdir,;t t
19317 -s,@abs_srcdir@,$ac_abs_srcdir,;t t
19318 -s,@top_srcdir@,$ac_top_srcdir,;t t
19319 -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
19320 -s,@builddir@,$ac_builddir,;t t
19321 -s,@abs_builddir@,$ac_abs_builddir,;t t
19322 -s,@top_builddir@,$ac_top_builddir,;t t
19323 -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
19324 -s,@INSTALL@,$ac_INSTALL,;t t
19325 -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
19326 - rm -f $tmp/stdin
19327 - if test x"$ac_file" != x-; then
19328 - mv $tmp/out $ac_file
19329 - else
19330 - cat $tmp/out
19331 - rm -f $tmp/out
19332 - fi
19333 -
19334 -done
19335 -_ACEOF
19336 -cat >>$CONFIG_STATUS <<\_ACEOF
19337 -
19338 -#
19339 -# CONFIG_HEADER section.
19340 -#
19341 -
19342 -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
19343 -# NAME is the cpp macro being defined and VALUE is the value it is being given.
19344 -#
19345 -# ac_d sets the value in "#define NAME VALUE" lines.
19346 -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
19347 -ac_dB='[ ].*$,\1#\2'
19348 -ac_dC=' '
19349 -ac_dD=',;t'
19350 -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
19351 -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
19352 -ac_uB='$,\1#\2define\3'
19353 -ac_uC=' '
19354 -ac_uD=',;t'
19355 +s&@configure_input@&$configure_input&;t t
19356 +s&@top_builddir@&$ac_top_builddir_sub&;t t
19357 +s&@srcdir@&$ac_srcdir&;t t
19358 +s&@abs_srcdir@&$ac_abs_srcdir&;t t
19359 +s&@top_srcdir@&$ac_top_srcdir&;t t
19360 +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
19361 +s&@builddir@&$ac_builddir&;t t
19362 +s&@abs_builddir@&$ac_abs_builddir&;t t
19363 +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
19364 +s&@INSTALL@&$ac_INSTALL&;t t
19365 +$ac_datarootdir_hack
19366 +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
19367 +
19368 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
19369 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
19370 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
19371 + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
19372 +which seems to be undefined. Please make sure it is defined." >&5
19373 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
19374 +which seems to be undefined. Please make sure it is defined." >&2;}
19375
19376 -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
19377 - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
19378 + rm -f "$tmp/stdin"
19379 case $ac_file in
19380 - - | *:- | *:-:* ) # input from stdin
19381 - cat >$tmp/stdin
19382 - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
19383 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
19384 - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
19385 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
19386 - * ) ac_file_in=$ac_file.in ;;
19387 + -) cat "$tmp/out"; rm -f "$tmp/out";;
19388 + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
19389 esac
19390 -
19391 - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
19392 -echo "$as_me: creating $ac_file" >&6;}
19393 -
19394 - # First look for the input files in the build tree, otherwise in the
19395 - # src tree.
19396 - ac_file_inputs=`IFS=:
19397 - for f in $ac_file_in; do
19398 - case $f in
19399 - -) echo $tmp/stdin ;;
19400 - [\\/$]*)
19401 - # Absolute (can't be DOS-style, as IFS=:)
19402 - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
19403 -echo "$as_me: error: cannot find input file: $f" >&2;}
19404 - { (exit 1); exit 1; }; }
19405 - # Do quote $f, to prevent DOS paths from being IFS'd.
19406 - echo "$f";;
19407 - *) # Relative
19408 - if test -f "$f"; then
19409 - # Build tree
19410 - echo "$f"
19411 - elif test -f "$srcdir/$f"; then
19412 - # Source tree
19413 - echo "$srcdir/$f"
19414 - else
19415 - # /dev/null tree
19416 - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
19417 -echo "$as_me: error: cannot find input file: $f" >&2;}
19418 - { (exit 1); exit 1; }; }
19419 - fi;;
19420 - esac
19421 - done` || { (exit 1); exit 1; }
19422 - # Remove the trailing spaces.
19423 - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
19424 -
19425 + ;;
19426 + :H)
19427 + #
19428 + # CONFIG_HEADER
19429 + #
19430 _ACEOF
19431
19432 -# Transform confdefs.h into two sed scripts, `conftest.defines' and
19433 -# `conftest.undefs', that substitutes the proper values into
19434 -# config.h.in to produce config.h. The first handles `#define'
19435 -# templates, and the second `#undef' templates.
19436 -# And first: Protect against being on the right side of a sed subst in
19437 -# config.status. Protect against being in an unquoted here document
19438 -# in config.status.
19439 -rm -f conftest.defines conftest.undefs
19440 -# Using a here document instead of a string reduces the quoting nightmare.
19441 -# Putting comments in sed scripts is not portable.
19442 -#
19443 -# `end' is used to avoid that the second main sed command (meant for
19444 -# 0-ary CPP macros) applies to n-ary macro definitions.
19445 -# See the Autoconf documentation for `clear'.
19446 -cat >confdef2sed.sed <<\_ACEOF
19447 -s/[\\&,]/\\&/g
19448 -s,[\\$`],\\&,g
19449 -t clear
19450 -: clear
19451 -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
19452 -t end
19453 -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
19454 -: end
19455 -_ACEOF
19456 -# If some macros were called several times there might be several times
19457 -# the same #defines, which is useless. Nevertheless, we may not want to
19458 -# sort them, since we want the *last* AC-DEFINE to be honored.
19459 -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
19460 -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
19461 -rm -f confdef2sed.sed
19462 +# Transform confdefs.h into a sed script `conftest.defines', that
19463 +# substitutes the proper values into config.h.in to produce config.h.
19464 +rm -f conftest.defines conftest.tail
19465 +# First, append a space to every undef/define line, to ease matching.
19466 +echo 's/$/ /' >conftest.defines
19467 +# Then, protect against being on the right side of a sed subst, or in
19468 +# an unquoted here document, in config.status. If some macros were
19469 +# called several times there might be several #defines for the same
19470 +# symbol, which is useless. But do not sort them, since the last
19471 +# AC_DEFINE must be honored.
19472 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
19473 +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
19474 +# NAME is the cpp macro being defined, VALUE is the value it is being given.
19475 +# PARAMS is the parameter list in the macro definition--in most cases, it's
19476 +# just an empty string.
19477 +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
19478 +ac_dB='\\)[ (].*,\\1define\\2'
19479 +ac_dC=' '
19480 +ac_dD=' ,'
19481
19482 -# This sed command replaces #undef with comments. This is necessary, for
19483 +uniq confdefs.h |
19484 + sed -n '
19485 + t rset
19486 + :rset
19487 + s/^[ ]*#[ ]*define[ ][ ]*//
19488 + t ok
19489 + d
19490 + :ok
19491 + s/[\\&,]/\\&/g
19492 + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
19493 + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
19494 + ' >>conftest.defines
19495 +
19496 +# Remove the space that was appended to ease matching.
19497 +# Then replace #undef with comments. This is necessary, for
19498 # example, in the case of _POSIX_SOURCE, which is predefined and required
19499 # on some systems where configure will not decide to define it.
19500 -cat >>conftest.undefs <<\_ACEOF
19501 -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
19502 -_ACEOF
19503 +# (The regexp can be short, since the line contains either #define or #undef.)
19504 +echo 's/ $//
19505 +s,^[ #]*u.*,/* & */,' >>conftest.defines
19506 +
19507 +# Break up conftest.defines:
19508 +ac_max_sed_lines=50
19509 +
19510 +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
19511 +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
19512 +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
19513 +# et cetera.
19514 +ac_in='$ac_file_inputs'
19515 +ac_out='"$tmp/out1"'
19516 +ac_nxt='"$tmp/out2"'
19517
19518 -# Break up conftest.defines because some shells have a limit on the size
19519 -# of here documents, and old seds have small limits too (100 cmds).
19520 -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
19521 -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
19522 -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
19523 -echo ' :' >>$CONFIG_STATUS
19524 -rm -f conftest.tail
19525 -while grep . conftest.defines >/dev/null
19526 +while :
19527 do
19528 - # Write a limited-size here document to $tmp/defines.sed.
19529 - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
19530 - # Speed up: don't consider the non `#define' lines.
19531 - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
19532 - # Work around the forget-to-reset-the-flag bug.
19533 - echo 't clr' >>$CONFIG_STATUS
19534 - echo ': clr' >>$CONFIG_STATUS
19535 - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
19536 + # Write a here document:
19537 + cat >>$CONFIG_STATUS <<_ACEOF
19538 + # First, check the format of the line:
19539 + cat >"\$tmp/defines.sed" <<\\CEOF
19540 +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
19541 +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
19542 +b
19543 +:def
19544 +_ACEOF
19545 + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
19546 echo 'CEOF
19547 - sed -f $tmp/defines.sed $tmp/in >$tmp/out
19548 - rm -f $tmp/in
19549 - mv $tmp/out $tmp/in
19550 -' >>$CONFIG_STATUS
19551 - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
19552 + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
19553 + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
19554 + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
19555 + grep . conftest.tail >/dev/null || break
19556 rm -f conftest.defines
19557 mv conftest.tail conftest.defines
19558 done
19559 -rm -f conftest.defines
19560 -echo ' fi # grep' >>$CONFIG_STATUS
19561 -echo >>$CONFIG_STATUS
19562 -
19563 -# Break up conftest.undefs because some shells have a limit on the size
19564 -# of here documents, and old seds have small limits too (100 cmds).
19565 -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
19566 -rm -f conftest.tail
19567 -while grep . conftest.undefs >/dev/null
19568 -do
19569 - # Write a limited-size here document to $tmp/undefs.sed.
19570 - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
19571 - # Speed up: don't consider the non `#undef'
19572 - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
19573 - # Work around the forget-to-reset-the-flag bug.
19574 - echo 't clr' >>$CONFIG_STATUS
19575 - echo ': clr' >>$CONFIG_STATUS
19576 - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
19577 - echo 'CEOF
19578 - sed -f $tmp/undefs.sed $tmp/in >$tmp/out
19579 - rm -f $tmp/in
19580 - mv $tmp/out $tmp/in
19581 -' >>$CONFIG_STATUS
19582 - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
19583 - rm -f conftest.undefs
19584 - mv conftest.tail conftest.undefs
19585 -done
19586 -rm -f conftest.undefs
19587 +rm -f conftest.defines conftest.tail
19588
19589 +echo "ac_result=$ac_in" >>$CONFIG_STATUS
19590 cat >>$CONFIG_STATUS <<\_ACEOF
19591 - # Let's still pretend it is `configure' which instantiates (i.e., don't
19592 - # use $as_me), people would be surprised to read:
19593 - # /* config.h. Generated by config.status. */
19594 - if test x"$ac_file" = x-; then
19595 - echo "/* Generated by configure. */" >$tmp/config.h
19596 - else
19597 - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
19598 - fi
19599 - cat $tmp/in >>$tmp/config.h
19600 - rm -f $tmp/in
19601 if test x"$ac_file" != x-; then
19602 - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
19603 + echo "/* $configure_input */" >"$tmp/config.h"
19604 + cat "$ac_result" >>"$tmp/config.h"
19605 + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
19606 { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
19607 echo "$as_me: $ac_file is unchanged" >&6;}
19608 else
19609 - ac_dir=`(dirname "$ac_file") 2>/dev/null ||
19610 -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19611 - X"$ac_file" : 'X\(//\)[^/]' \| \
19612 - X"$ac_file" : 'X\(//\)$' \| \
19613 - X"$ac_file" : 'X\(/\)' \| \
19614 - . : '\(.\)' 2>/dev/null ||
19615 -echo X"$ac_file" |
19616 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19617 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19618 - /^X\(\/\/\)$/{ s//\1/; q; }
19619 - /^X\(\/\).*/{ s//\1/; q; }
19620 - s/.*/./; q'`
19621 - { if $as_mkdir_p; then
19622 - mkdir -p "$ac_dir"
19623 - else
19624 - as_dir="$ac_dir"
19625 - as_dirs=
19626 - while test ! -d "$as_dir"; do
19627 - as_dirs="$as_dir $as_dirs"
19628 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
19629 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19630 - X"$as_dir" : 'X\(//\)[^/]' \| \
19631 - X"$as_dir" : 'X\(//\)$' \| \
19632 - X"$as_dir" : 'X\(/\)' \| \
19633 - . : '\(.\)' 2>/dev/null ||
19634 -echo X"$as_dir" |
19635 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19636 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19637 - /^X\(\/\/\)$/{ s//\1/; q; }
19638 - /^X\(\/\).*/{ s//\1/; q; }
19639 - s/.*/./; q'`
19640 - done
19641 - test ! -n "$as_dirs" || mkdir $as_dirs
19642 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
19643 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
19644 - { (exit 1); exit 1; }; }; }
19645 -
19646 rm -f $ac_file
19647 - mv $tmp/config.h $ac_file
19648 + mv "$tmp/config.h" $ac_file
19649 fi
19650 else
19651 - cat $tmp/config.h
19652 - rm -f $tmp/config.h
19653 + echo "/* $configure_input */"
19654 + cat "$ac_result"
19655 fi
19656 + rm -f "$tmp/out12"
19657 # Compute $ac_file's index in $config_headers.
19658 _am_stamp_count=1
19659 for _am_header in $config_headers :; do
19660 @@ -30854,135 +31158,39 @@
19661 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
19662 esac
19663 done
19664 -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
19665 +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
19666 $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19667 X$ac_file : 'X\(//\)[^/]' \| \
19668 X$ac_file : 'X\(//\)$' \| \
19669 - X$ac_file : 'X\(/\)' \| \
19670 - . : '\(.\)' 2>/dev/null ||
19671 + X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
19672 echo X$ac_file |
19673 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19674 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19675 - /^X\(\/\/\)$/{ s//\1/; q; }
19676 - /^X\(\/\).*/{ s//\1/; q; }
19677 - s/.*/./; q'`/stamp-h$_am_stamp_count
19678 -done
19679 -_ACEOF
19680 -cat >>$CONFIG_STATUS <<\_ACEOF
19681 -
19682 -#
19683 -# CONFIG_COMMANDS section.
19684 -#
19685 -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
19686 - ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
19687 - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
19688 - ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
19689 -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19690 - X"$ac_dest" : 'X\(//\)[^/]' \| \
19691 - X"$ac_dest" : 'X\(//\)$' \| \
19692 - X"$ac_dest" : 'X\(/\)' \| \
19693 - . : '\(.\)' 2>/dev/null ||
19694 -echo X"$ac_dest" |
19695 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19696 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19697 - /^X\(\/\/\)$/{ s//\1/; q; }
19698 - /^X\(\/\).*/{ s//\1/; q; }
19699 - s/.*/./; q'`
19700 - { if $as_mkdir_p; then
19701 - mkdir -p "$ac_dir"
19702 - else
19703 - as_dir="$ac_dir"
19704 - as_dirs=
19705 - while test ! -d "$as_dir"; do
19706 - as_dirs="$as_dir $as_dirs"
19707 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
19708 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19709 - X"$as_dir" : 'X\(//\)[^/]' \| \
19710 - X"$as_dir" : 'X\(//\)$' \| \
19711 - X"$as_dir" : 'X\(/\)' \| \
19712 - . : '\(.\)' 2>/dev/null ||
19713 -echo X"$as_dir" |
19714 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19715 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19716 - /^X\(\/\/\)$/{ s//\1/; q; }
19717 - /^X\(\/\).*/{ s//\1/; q; }
19718 - s/.*/./; q'`
19719 - done
19720 - test ! -n "$as_dirs" || mkdir $as_dirs
19721 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
19722 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
19723 - { (exit 1); exit 1; }; }; }
19724 -
19725 - ac_builddir=.
19726 -
19727 -if test "$ac_dir" != .; then
19728 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
19729 - # A "../" for each directory in $ac_dir_suffix.
19730 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
19731 -else
19732 - ac_dir_suffix= ac_top_builddir=
19733 -fi
19734 -
19735 -case $srcdir in
19736 - .) # No --srcdir option. We are building in place.
19737 - ac_srcdir=.
19738 - if test -z "$ac_top_builddir"; then
19739 - ac_top_srcdir=.
19740 - else
19741 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
19742 - fi ;;
19743 - [\\/]* | ?:[\\/]* ) # Absolute path.
19744 - ac_srcdir=$srcdir$ac_dir_suffix;
19745 - ac_top_srcdir=$srcdir ;;
19746 - *) # Relative path.
19747 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
19748 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
19749 -esac
19750 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
19751 + s//\1/
19752 + q
19753 + }
19754 + /^X\(\/\/\)[^/].*/{
19755 + s//\1/
19756 + q
19757 + }
19758 + /^X\(\/\/\)$/{
19759 + s//\1/
19760 + q
19761 + }
19762 + /^X\(\/\).*/{
19763 + s//\1/
19764 + q
19765 + }
19766 + s/.*/./; q'`/stamp-h$_am_stamp_count
19767 + ;;
19768
19769 -# Do not use `cd foo && pwd` to compute absolute paths, because
19770 -# the directories may not exist.
19771 -case `pwd` in
19772 -.) ac_abs_builddir="$ac_dir";;
19773 -*)
19774 - case "$ac_dir" in
19775 - .) ac_abs_builddir=`pwd`;;
19776 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
19777 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
19778 - esac;;
19779 -esac
19780 -case $ac_abs_builddir in
19781 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
19782 -*)
19783 - case ${ac_top_builddir}. in
19784 - .) ac_abs_top_builddir=$ac_abs_builddir;;
19785 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
19786 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
19787 - esac;;
19788 -esac
19789 -case $ac_abs_builddir in
19790 -.) ac_abs_srcdir=$ac_srcdir;;
19791 -*)
19792 - case $ac_srcdir in
19793 - .) ac_abs_srcdir=$ac_abs_builddir;;
19794 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
19795 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
19796 - esac;;
19797 -esac
19798 -case $ac_abs_builddir in
19799 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
19800 -*)
19801 - case $ac_top_srcdir in
19802 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
19803 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
19804 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
19805 - esac;;
19806 -esac
19807 + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
19808 +echo "$as_me: executing $ac_file commands" >&6;}
19809 + ;;
19810 + esac
19811
19812
19813 - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
19814 -echo "$as_me: executing $ac_dest commands" >&6;}
19815 - case $ac_dest in
19816 - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
19817 + case $ac_file$ac_mode in
19818 + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
19819 # Strip MF so we end up with the name of the file.
19820 mf=`echo "$mf" | sed -e 's/:.*$//'`
19821 # Check whether this is an Automake generated Makefile or not.
19822 @@ -30992,18 +31200,29 @@
19823 # each Makefile.in and add a new line on top of each file to say so.
19824 # So let's grep whole file.
19825 if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
19826 - dirpart=`(dirname "$mf") 2>/dev/null ||
19827 + dirpart=`$as_dirname -- "$mf" ||
19828 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19829 X"$mf" : 'X\(//\)[^/]' \| \
19830 X"$mf" : 'X\(//\)$' \| \
19831 - X"$mf" : 'X\(/\)' \| \
19832 - . : '\(.\)' 2>/dev/null ||
19833 + X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
19834 echo X"$mf" |
19835 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19836 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19837 - /^X\(\/\/\)$/{ s//\1/; q; }
19838 - /^X\(\/\).*/{ s//\1/; q; }
19839 - s/.*/./; q'`
19840 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
19841 + s//\1/
19842 + q
19843 + }
19844 + /^X\(\/\/\)[^/].*/{
19845 + s//\1/
19846 + q
19847 + }
19848 + /^X\(\/\/\)$/{
19849 + s//\1/
19850 + q
19851 + }
19852 + /^X\(\/\).*/{
19853 + s//\1/
19854 + q
19855 + }
19856 + s/.*/./; q'`
19857 else
19858 continue
19859 fi
19860 @@ -31025,49 +31244,76 @@
19861 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
19862 # Make sure the directory exists.
19863 test -f "$dirpart/$file" && continue
19864 - fdir=`(dirname "$file") 2>/dev/null ||
19865 + fdir=`$as_dirname -- "$file" ||
19866 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19867 X"$file" : 'X\(//\)[^/]' \| \
19868 X"$file" : 'X\(//\)$' \| \
19869 - X"$file" : 'X\(/\)' \| \
19870 - . : '\(.\)' 2>/dev/null ||
19871 + X"$file" : 'X\(/\)' \| . 2>/dev/null ||
19872 echo X"$file" |
19873 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19874 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19875 - /^X\(\/\/\)$/{ s//\1/; q; }
19876 - /^X\(\/\).*/{ s//\1/; q; }
19877 - s/.*/./; q'`
19878 - { if $as_mkdir_p; then
19879 - mkdir -p $dirpart/$fdir
19880 - else
19881 - as_dir=$dirpart/$fdir
19882 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
19883 + s//\1/
19884 + q
19885 + }
19886 + /^X\(\/\/\)[^/].*/{
19887 + s//\1/
19888 + q
19889 + }
19890 + /^X\(\/\/\)$/{
19891 + s//\1/
19892 + q
19893 + }
19894 + /^X\(\/\).*/{
19895 + s//\1/
19896 + q
19897 + }
19898 + s/.*/./; q'`
19899 + { as_dir=$dirpart/$fdir
19900 + case $as_dir in #(
19901 + -*) as_dir=./$as_dir;;
19902 + esac
19903 + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
19904 as_dirs=
19905 - while test ! -d "$as_dir"; do
19906 - as_dirs="$as_dir $as_dirs"
19907 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
19908 + while :; do
19909 + case $as_dir in #(
19910 + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
19911 + *) as_qdir=$as_dir;;
19912 + esac
19913 + as_dirs="'$as_qdir' $as_dirs"
19914 + as_dir=`$as_dirname -- "$as_dir" ||
19915 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19916 X"$as_dir" : 'X\(//\)[^/]' \| \
19917 X"$as_dir" : 'X\(//\)$' \| \
19918 - X"$as_dir" : 'X\(/\)' \| \
19919 - . : '\(.\)' 2>/dev/null ||
19920 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
19921 echo X"$as_dir" |
19922 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
19923 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
19924 - /^X\(\/\/\)$/{ s//\1/; q; }
19925 - /^X\(\/\).*/{ s//\1/; q; }
19926 - s/.*/./; q'`
19927 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
19928 + s//\1/
19929 + q
19930 + }
19931 + /^X\(\/\/\)[^/].*/{
19932 + s//\1/
19933 + q
19934 + }
19935 + /^X\(\/\/\)$/{
19936 + s//\1/
19937 + q
19938 + }
19939 + /^X\(\/\).*/{
19940 + s//\1/
19941 + q
19942 + }
19943 + s/.*/./; q'`
19944 + test -d "$as_dir" && break
19945 done
19946 - test ! -n "$as_dirs" || mkdir $as_dirs
19947 - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
19948 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
19949 + test -z "$as_dirs" || eval "mkdir $as_dirs"
19950 + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
19951 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
19952 { (exit 1); exit 1; }; }; }
19953 -
19954 # echo "creating $dirpart/$file"
19955 echo '# dummy' > "$dirpart/$file"
19956 done
19957 done
19958 ;;
19959 - default-1 )
19960 + "default-1":C)
19961 for ac_file in $CONFIG_FILES; do
19962 # Support "outfile[:infile[:infile...]]"
19963 case "$ac_file" in
19964 @@ -31176,7 +31422,7 @@
19965 ;;
19966 esac
19967 done ;;
19968 - default-2 )
19969 + "default-2":C)
19970 for ac_file in $CONFIG_FILES; do
19971 # Support "outfile[:infile[:infile...]]"
19972 case "$ac_file" in
19973 @@ -31285,11 +31531,10 @@
19974 ;;
19975 esac
19976 done ;;
19977 +
19978 esac
19979 -done
19980 -_ACEOF
19981 +done # for ac_tag
19982
19983 -cat >>$CONFIG_STATUS <<\_ACEOF
19984
19985 { (exit 0); exit 0; }
19986 _ACEOF
19987 @@ -31326,7 +31571,10 @@
19988 # Remove --cache-file and --srcdir arguments so they do not pile up.
19989 ac_sub_configure_args=
19990 ac_prev=
19991 - for ac_arg in $ac_configure_args; do
19992 + eval "set x $ac_configure_args"
19993 + shift
19994 + for ac_arg
19995 + do
19996 if test -n "$ac_prev"; then
19997 ac_prev=
19998 continue
19999 @@ -31349,123 +31597,123 @@
20000 ac_prev=prefix ;;
20001 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
20002 ;;
20003 - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
20004 + *)
20005 + case $ac_arg in
20006 + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
20007 + esac
20008 + ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
20009 esac
20010 done
20011
20012 # Always prepend --prefix to ensure using the same prefix
20013 # in subdir configurations.
20014 - ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
20015 + ac_arg="--prefix=$prefix"
20016 + case $ac_arg in
20017 + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
20018 + esac
20019 + ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
20020 +
20021 + # Pass --silent
20022 + if test "$silent" = yes; then
20023 + ac_sub_configure_args="--silent $ac_sub_configure_args"
20024 + fi
20025
20026 ac_popdir=`pwd`
20027 for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
20028
20029 # Do not complain, so a configure script can configure whichever
20030 # parts of a large source tree are present.
20031 - test -d $srcdir/$ac_dir || continue
20032 + test -d "$srcdir/$ac_dir" || continue
20033
20034 - { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
20035 -echo "$as_me: configuring in $ac_dir" >&6;}
20036 - { if $as_mkdir_p; then
20037 - mkdir -p "$ac_dir"
20038 - else
20039 - as_dir="$ac_dir"
20040 + ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
20041 + echo "$as_me:$LINENO: $ac_msg" >&5
20042 + echo "$ac_msg" >&6
20043 + { as_dir="$ac_dir"
20044 + case $as_dir in #(
20045 + -*) as_dir=./$as_dir;;
20046 + esac
20047 + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
20048 as_dirs=
20049 - while test ! -d "$as_dir"; do
20050 - as_dirs="$as_dir $as_dirs"
20051 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
20052 + while :; do
20053 + case $as_dir in #(
20054 + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
20055 + *) as_qdir=$as_dir;;
20056 + esac
20057 + as_dirs="'$as_qdir' $as_dirs"
20058 + as_dir=`$as_dirname -- "$as_dir" ||
20059 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
20060 X"$as_dir" : 'X\(//\)[^/]' \| \
20061 X"$as_dir" : 'X\(//\)$' \| \
20062 - X"$as_dir" : 'X\(/\)' \| \
20063 - . : '\(.\)' 2>/dev/null ||
20064 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
20065 echo X"$as_dir" |
20066 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
20067 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
20068 - /^X\(\/\/\)$/{ s//\1/; q; }
20069 - /^X\(\/\).*/{ s//\1/; q; }
20070 - s/.*/./; q'`
20071 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
20072 + s//\1/
20073 + q
20074 + }
20075 + /^X\(\/\/\)[^/].*/{
20076 + s//\1/
20077 + q
20078 + }
20079 + /^X\(\/\/\)$/{
20080 + s//\1/
20081 + q
20082 + }
20083 + /^X\(\/\).*/{
20084 + s//\1/
20085 + q
20086 + }
20087 + s/.*/./; q'`
20088 + test -d "$as_dir" && break
20089 done
20090 - test ! -n "$as_dirs" || mkdir $as_dirs
20091 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
20092 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
20093 + test -z "$as_dirs" || eval "mkdir $as_dirs"
20094 + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
20095 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
20096 { (exit 1); exit 1; }; }; }
20097 -
20098 ac_builddir=.
20099
20100 -if test "$ac_dir" != .; then
20101 +case "$ac_dir" in
20102 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
20103 +*)
20104 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
20105 - # A "../" for each directory in $ac_dir_suffix.
20106 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
20107 -else
20108 - ac_dir_suffix= ac_top_builddir=
20109 -fi
20110 + # A ".." for each directory in $ac_dir_suffix.
20111 + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
20112 + case $ac_top_builddir_sub in
20113 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
20114 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
20115 + esac ;;
20116 +esac
20117 +ac_abs_top_builddir=$ac_pwd
20118 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
20119 +# for backward compatibility:
20120 +ac_top_builddir=$ac_top_build_prefix
20121
20122 case $srcdir in
20123 - .) # No --srcdir option. We are building in place.
20124 + .) # We are building in place.
20125 ac_srcdir=.
20126 - if test -z "$ac_top_builddir"; then
20127 - ac_top_srcdir=.
20128 - else
20129 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
20130 - fi ;;
20131 - [\\/]* | ?:[\\/]* ) # Absolute path.
20132 + ac_top_srcdir=$ac_top_builddir_sub
20133 + ac_abs_top_srcdir=$ac_pwd ;;
20134 + [\\/]* | ?:[\\/]* ) # Absolute name.
20135 ac_srcdir=$srcdir$ac_dir_suffix;
20136 - ac_top_srcdir=$srcdir ;;
20137 - *) # Relative path.
20138 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
20139 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
20140 -esac
20141 -
20142 -# Do not use `cd foo && pwd` to compute absolute paths, because
20143 -# the directories may not exist.
20144 -case `pwd` in
20145 -.) ac_abs_builddir="$ac_dir";;
20146 -*)
20147 - case "$ac_dir" in
20148 - .) ac_abs_builddir=`pwd`;;
20149 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
20150 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
20151 - esac;;
20152 -esac
20153 -case $ac_abs_builddir in
20154 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
20155 -*)
20156 - case ${ac_top_builddir}. in
20157 - .) ac_abs_top_builddir=$ac_abs_builddir;;
20158 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
20159 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
20160 - esac;;
20161 -esac
20162 -case $ac_abs_builddir in
20163 -.) ac_abs_srcdir=$ac_srcdir;;
20164 -*)
20165 - case $ac_srcdir in
20166 - .) ac_abs_srcdir=$ac_abs_builddir;;
20167 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
20168 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
20169 - esac;;
20170 -esac
20171 -case $ac_abs_builddir in
20172 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
20173 -*)
20174 - case $ac_top_srcdir in
20175 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
20176 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
20177 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
20178 - esac;;
20179 + ac_top_srcdir=$srcdir
20180 + ac_abs_top_srcdir=$srcdir ;;
20181 + *) # Relative name.
20182 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
20183 + ac_top_srcdir=$ac_top_build_prefix$srcdir
20184 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
20185 esac
20186 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
20187
20188
20189 - cd $ac_dir
20190 + cd "$ac_dir"
20191
20192 # Check for guested configure; otherwise get Cygnus style configure.
20193 - if test -f $ac_srcdir/configure.gnu; then
20194 - ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
20195 - elif test -f $ac_srcdir/configure; then
20196 - ac_sub_configure="$SHELL '$ac_srcdir/configure'"
20197 - elif test -f $ac_srcdir/configure.in; then
20198 - ac_sub_configure=$ac_configure
20199 + if test -f "$ac_srcdir/configure.gnu"; then
20200 + ac_sub_configure=$ac_srcdir/configure.gnu
20201 + elif test -f "$ac_srcdir/configure"; then
20202 + ac_sub_configure=$ac_srcdir/configure
20203 + elif test -f "$ac_srcdir/configure.in"; then
20204 + # This should be Cygnus configure.
20205 + ac_sub_configure=$ac_aux_dir/configure
20206 else
20207 { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
20208 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
20209 @@ -31477,15 +31725,15 @@
20210 # Make the cache file name correct relative to the subdirectory.
20211 case $cache_file in
20212 [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
20213 - *) # Relative path.
20214 - ac_sub_cache_file=$ac_top_builddir$cache_file ;;
20215 + *) # Relative name.
20216 + ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
20217 esac
20218
20219 - { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
20220 -echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
20221 + { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
20222 +echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
20223 # The eval makes quoting arguments work.
20224 - eval $ac_sub_configure $ac_sub_configure_args \
20225 - --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
20226 + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
20227 + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
20228 { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
20229 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
20230 { (exit 1); exit 1; }; }
20231 diff -urN -x autom4te.cache libgphoto2-2.2.1/libgphoto2_port/configure.in libgphoto2-2.2.1.new/libgphoto2_port/configure.in
20232 --- libgphoto2-2.2.1/libgphoto2_port/configure.in 2006-06-19 21:03:17.000000000 +0200
20233 +++ libgphoto2-2.2.1.new/libgphoto2_port/configure.in 2006-12-10 13:01:21.000000000 +0100
20234 @@ -305,14 +305,6 @@
20235 dnl ---------------------------------------------------------------------------
20236 dnl disk - hal and various stuff
20237 dnl ---------------------------------------------------------------------------
20238 -PKG_CHECK_MODULES(HAL, [dbus-1 >= 0.31 hal >= 0.5.0],
20239 - [have_hal=true],
20240 - [have_hal=false])
20241 -if test "x$have_hal" = "xtrue"; then
20242 - AC_SUBST(HAL_CFLAGS)
20243 - AC_SUBST(HAL_LIBS)
20244 - AC_DEFINE(HAVE_HAL,1,[defined if HAL is available])
20245 -fi
20246 IOLIB_SUBDIRS="$IOLIB_SUBDIRS disk"
20247
20248 dnl ptpip - works 'everywhere' with TCP/IP stack.
20249 diff -urN -x autom4te.cache libgphoto2-2.2.1/libgphoto2_port/ltmain.sh libgphoto2-2.2.1.new/libgphoto2_port/ltmain.sh
20250 --- libgphoto2-2.2.1/libgphoto2_port/ltmain.sh 2006-01-10 16:23:50.000000000 +0100
20251 +++ libgphoto2-2.2.1.new/libgphoto2_port/ltmain.sh 2006-08-11 12:31:25.000000000 +0200
20252 @@ -33,6 +33,9 @@
20253 # function.
20254 progpath="$0"
20255
20256 +# define SED for historic ltconfig's generated by Libtool 1.3
20257 +test -z "$SED" && SED=sed
20258 +
20259 # The name of this program:
20260 progname=`echo "$progpath" | $SED $basename`
20261 modename="$progname"
20262 @@ -43,7 +46,7 @@
20263
20264 PROGRAM=ltmain.sh
20265 PACKAGE=libtool
20266 -VERSION="1.5.22 Debian 1.5.22-2"
20267 +VERSION=1.5.22
20268 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
20269
20270 # See if we are running on zsh, and set the options which allow our
20271 @@ -51,6 +54,13 @@
20272 if test -n "${ZSH_VERSION+set}" ; then
20273 setopt NO_GLOB_SUBST
20274 fi
20275 +# Same for EGREP, and just to be sure, do LTCC as well
20276 +if test "X$EGREP" = X ; then
20277 + EGREP=egrep
20278 +fi
20279 +if test "X$LTCC" = X ; then
20280 + LTCC=${CC-gcc}
20281 +fi
20282
20283 # Check that we have a working $echo.
20284 if test "X$1" = X--no-reexec; then
20285 @@ -137,6 +147,30 @@
20286 lo2o="s/\\.lo\$/.${objext}/"
20287 o2lo="s/\\.${objext}\$/.lo/"
20288
20289 +if test -z "$max_cmd_len"; then
20290 + i=0
20291 + testring="ABCD"
20292 + new_result=
20293 +
20294 + # If test is not a shell built-in, we'll probably end up computing a
20295 + # maximum length that is only half of the actual maximum length, but
20296 + # we can't tell.
20297 + while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
20298 + = "XX$testring") >/dev/null 2>&1 &&
20299 + new_result=`expr "X$testring" : ".*" 2>&1` &&
20300 + max_cmd_len="$new_result" &&
20301 + test "$i" != 17 # 1/2 MB should be enough
20302 + do
20303 + i=`expr $i + 1`
20304 + testring="$testring$testring"
20305 + done
20306 + testring=
20307 + # Add a significant safety factor because C++ compilers can tack on massive
20308 + # amounts of additional arguments before passing them to the linker.
20309 + # It appears as though 1/2 is a usable value.
20310 + max_cmd_len=`expr $max_cmd_len \/ 2`
20311 +fi
20312 +
20313 #####################################
20314 # Shell function definitions:
20315 # This seems to be the best place for them
20316 @@ -257,7 +291,21 @@
20317 esac
20318 CC_quoted="$CC_quoted $arg"
20319 done
20320 + # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
20321 + trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
20322 + # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
20323 + extendcc=${host}-${CC}
20324 + # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
20325 + # (Gentoo-specific hack because we always export $CHOST)
20326 + mungedcc=${CHOST-${host}}-${trimedcc}
20327 case "$@ " in
20328 + "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
20329 + "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
20330 + tagname=CC
20331 + break ;;
20332 + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
20333 + "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
20334 + "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
20335 " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
20336 # The compiler in the base compile command matches
20337 # the one in the tagged configuration.
20338 @@ -851,7 +899,7 @@
20339 # Lock this critical section if it is needed
20340 # We use this script file to make the link, it avoids creating a new file
20341 if test "$need_locks" = yes; then
20342 - until $run ln "$progpath" "$lockfile" 2>/dev/null; do
20343 + until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
20344 $show "Waiting for $lockfile to be removed"
20345 sleep 2
20346 done
20347 @@ -2082,10 +2130,7 @@
20348 case $pass in
20349 dlopen) libs="$dlfiles" ;;
20350 dlpreopen) libs="$dlprefiles" ;;
20351 - link)
20352 - libs="$deplibs %DEPLIBS%"
20353 - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
20354 - ;;
20355 + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
20356 esac
20357 fi
20358 if test "$pass" = dlopen; then
20359 @@ -3204,11 +3249,6 @@
20360 age="$number_minor"
20361 revision="$number_minor"
20362 ;;
20363 - *)
20364 - $echo "$modename: unknown library version type \`$version_type'" 1>&2
20365 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
20366 - exit $EXIT_FAILURE
20367 - ;;
20368 esac
20369 ;;
20370 no)
20371 @@ -3650,6 +3690,13 @@
20372 *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
20373 esac
20374 done
20375 + # It is ok to link against an archive when
20376 + # building a shared library.
20377 + if $AR -t $potlib > /dev/null 2>&1; then
20378 + newdeplibs="$newdeplibs $a_deplib"
20379 + a_deplib=""
20380 + break 2
20381 + fi
20382 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
20383 | ${SED} 10q \
20384 | $EGREP "$file_magic_regex" > /dev/null; then
20385 @@ -5387,6 +5434,11 @@
20386 $echo >> $output "\
20387 if test \"\$libtool_execute_magic\" != \"$magic\"; then
20388 # Run the actual program with our arguments.
20389 +
20390 + # Make sure env LD_LIBRARY_PATH does not mess us up
20391 + if test -n \"\${LD_LIBRARY_PATH+set}\"; then
20392 + export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
20393 + fi
20394 "
20395 case $host in
20396 # Backslashes separate directories on plain windows
20397 @@ -5614,9 +5666,53 @@
20398 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
20399 exit $EXIT_FAILURE
20400 fi
20401 - newdependency_libs="$newdependency_libs $libdir/$name"
20402 + if test "X$EGREP" = X ; then
20403 + EGREP=egrep
20404 + fi
20405 + # We do not want portage's install root ($D) present. Check only for
20406 + # this if the .la is being installed.
20407 + if test "$installed" = yes && test "$D"; then
20408 + eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
20409 + else
20410 + mynewdependency_lib="$libdir/$name"
20411 + fi
20412 + # Do not add duplicates
20413 + if test "$mynewdependency_lib"; then
20414 + my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
20415 + if test -z "$my_little_ninja_foo_1"; then
20416 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
20417 + fi
20418 + fi
20419 + ;;
20420 + *)
20421 + if test "$installed" = yes; then
20422 + # Rather use S=WORKDIR if our version of portage supports it.
20423 + # This is because some ebuild (gcc) do not use $S as buildroot.
20424 + if test "$PWORKDIR"; then
20425 + S="$PWORKDIR"
20426 + fi
20427 + # We do not want portage's build root ($S) present.
20428 + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
20429 + # We do not want portage's install root ($D) present.
20430 + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
20431 + if test -n "$my_little_ninja_foo_2" && test "$S"; then
20432 + mynewdependency_lib=""
20433 + elif test -n "$my_little_ninja_foo_3" && test "$D"; then
20434 + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
20435 + else
20436 + mynewdependency_lib="$deplib"
20437 + fi
20438 + else
20439 + mynewdependency_lib="$deplib"
20440 + fi
20441 + # Do not add duplicates
20442 + if test "$mynewdependency_lib"; then
20443 + my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
20444 + if test -z "$my_little_ninja_foo_4"; then
20445 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
20446 + fi
20447 + fi
20448 ;;
20449 - *) newdependency_libs="$newdependency_libs $deplib" ;;
20450 esac
20451 done
20452 dependency_libs="$newdependency_libs"
20453 @@ -5668,6 +5764,10 @@
20454 case $host,$output,$installed,$module,$dlname in
20455 *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
20456 esac
20457 + # Do not add duplicates
20458 + if test "$installed" = yes && test "$D"; then
20459 + install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
20460 + fi
20461 $echo > $output "\
20462 # $outputname - a libtool library file
20463 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
OpenWrt SVN history