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