499
2365
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
502
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
2368
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
503
2369
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
505
2371
m32r*:Linux:*:*)
506
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
2372
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
507
2373
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
510
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
2376
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
511
2377
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
514
- eval $set_cc_for_build
515
- sed 's/^ //' << EOF >$dummy.c
519
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
522
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
529
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
534
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
537
+ mips:Linux:*:* | mips64:Linux:*:*)
2379
mips:Linux:*:* | mips64:Linux:*:*)
538
2380
eval $set_cc_for_build
539
sed 's/^ //' << EOF >$dummy.c
543
+ #undef ${UNAME_MACHINE}
544
+ #undef ${UNAME_MACHINE}el
545
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
547
+ CPU=${UNAME_MACHINE}el
549
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
551
+ CPU=${UNAME_MACHINE}
2381
@@ -946,51 +931,51 @@
557
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
562
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
563
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
2384
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
2385
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
564
2386
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
567
- echo or32-${VENDOR}-linux-gnu
570
- echo powerpc-${VENDOR}-linux-gnu
573
- echo powerpc64-${VENDOR}-linux-gnu
576
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
577
- EV5) UNAME_MACHINE=alphaev5 ;;
578
- EV56) UNAME_MACHINE=alphaev56 ;;
579
- PCA56) UNAME_MACHINE=alphapca56 ;;
580
- PCA57) UNAME_MACHINE=alphapca56 ;;
581
- EV6) UNAME_MACHINE=alphaev6 ;;
582
- EV67) UNAME_MACHINE=alphaev67 ;;
583
- EV68*) UNAME_MACHINE=alphaev68 ;;
585
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
586
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
587
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
2389
- echo or32-unknown-linux-${LIBC}
588
2390
+ echo or32-unknown-linux-gnu
590
2392
padre:Linux:*:*)
591
echo sparc-unknown-linux-gnu
2393
- echo sparc-unknown-linux-${LIBC}
2394
+ echo sparc-unknown-linux-gnu
593
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
2396
parisc64:Linux:*:* | hppa64:Linux:*:*)
2397
- echo hppa64-unknown-linux-${LIBC}
594
2398
+ echo hppa64-unknown-linux-gnu
596
2400
parisc:Linux:*:* | hppa:Linux:*:*)
597
2401
# Look for CPU level
598
2402
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
599
- PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
600
- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
601
- *) echo hppa-${VENDOR}-linux-gnu ;;
2403
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
2404
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
2405
- *) echo hppa-unknown-linux-${LIBC} ;;
602
2406
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
603
2407
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
604
2408
+ *) echo hppa-unknown-linux-gnu ;;
607
- parisc64:Linux:*:* | hppa64:Linux:*:*)
608
- echo hppa64-${VENDOR}-linux-gnu
2412
- echo powerpc64-unknown-linux-${LIBC}
610
2413
+ echo powerpc64-unknown-linux-gnu
2416
- echo powerpc-unknown-linux-${LIBC}
613
2417
+ echo powerpc-unknown-linux-gnu
615
2419
s390:Linux:*:* | s390x:Linux:*:*)
616
2420
echo ${UNAME_MACHINE}-ibm-linux
618
2422
sh64*:Linux:*:*)
619
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
2423
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
620
2424
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
623
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
2427
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
624
2428
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
626
2430
sparc:Linux:*:* | sparc64:Linux:*:*)
627
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
2431
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
628
2432
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
631
echo ${UNAME_MACHINE}-dec-linux-gnu
2435
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
2436
+ echo ${UNAME_MACHINE}-dec-linux-gnu
633
2438
x86_64:Linux:*:*)
634
- echo x86_64-${VENDOR}-linux-gnu
2439
- echo x86_64-unknown-linux-${LIBC}
635
2440
+ echo x86_64-unknown-linux-gnu
637
2442
xtensa*:Linux:*:*)
638
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
2443
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
639
2444
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
642
- # The BFD linker knows what the default object file format is, so
643
- # first see if it will tell us. cd to the root directory to prevent
644
- # problems with other programs or directories called `ld' in the path.
645
- # Set LC_ALL=C to ensure ld outputs messages in English.
646
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
647
- | sed -ne '/supported targets:/!d
649
- s/.*supported targets: *//
652
- case "$ld_supported_targets" in
654
- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
657
- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
660
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
661
- # one that does not give us useful --help.
662
- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
665
- # Determine whether the default compiler is a.out or elf
666
- eval $set_cc_for_build
667
- sed 's/^ //' << EOF >$dummy.c
668
- #include <features.h>
671
- # if __GLIBC__ >= 2
680
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
686
- #ifdef __dietlibc__
690
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
695
- test x"${LIBC}" != x && {
696
- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
699
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
701
2446
i*86:DYNIX/ptx:4*:*)
702
2447
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
703
# earlier versions are messed up and put the nodename in both
704
@@ -1076,16 +997,16 @@ EOF
705
echo ${UNAME_MACHINE}-pc-os2-emx
708
- echo ${UNAME_MACHINE}-${VENDOR}-stop
709
+ echo ${UNAME_MACHINE}-unknown-stop
712
- echo ${UNAME_MACHINE}-${VENDOR}-atheos
713
+ echo ${UNAME_MACHINE}-unknown-atheos
716
echo ${UNAME_MACHINE}-pc-syllable
718
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
719
- echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
720
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
721
+ echo i386-unknown-lynxos${UNAME_RELEASE}
724
echo ${UNAME_MACHINE}-pc-msdosdjgpp
725
@@ -1105,7 +1026,7 @@ EOF
726
*Pentium) UNAME_MACHINE=i586 ;;
727
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
729
- echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
730
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
733
if test -f /usr/options/cb.name; then
734
@@ -1144,7 +1065,7 @@ EOF
735
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
736
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
737
else # Add other i860-SVR4 vendors below as they are discovered.
738
- echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
739
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
743
@@ -1181,19 +1102,19 @@ EOF
744
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
745
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
746
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
747
- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
748
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
750
mc68030:UNIX_System_V:4.*:*)
751
echo m68k-atari-sysv4
753
TSUNAMI:LynxOS:2.*:*)
754
- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
755
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
758
- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
759
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
761
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
762
- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
763
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
764
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
767
echo mips-dde-sysv${UNAME_RELEASE}
768
@@ -1243,7 +1164,7 @@ EOF
769
if [ -d /usr/nec ]; then
770
echo mips-nec-sysv${UNAME_RELEASE}
772
- echo mips-${VENDOR}-sysv${UNAME_RELEASE}
773
+ echo mips-unknown-sysv${UNAME_RELEASE}
776
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
777
@@ -1285,6 +1206,16 @@ EOF
779
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
780
case $UNAME_PROCESSOR in
782
+ eval $set_cc_for_build
783
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
784
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
785
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
786
+ grep IS_64BIT_ARCH >/dev/null
788
+ UNAME_PROCESSOR="x86_64"
791
unknown) UNAME_PROCESSOR=powerpc ;;
793
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
794
@@ -1324,13 +1255,13 @@ EOF
796
UNAME_MACHINE="$cputype"
798
- echo ${UNAME_MACHINE}-${VENDOR}-plan9
799
+ echo ${UNAME_MACHINE}-unknown-plan9
802
- echo pdp10-${VENDOR}-tops10
803
+ echo pdp10-unknown-tops10
806
- echo pdp10-${VENDOR}-tenex
807
+ echo pdp10-unknown-tenex
809
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
810
echo pdp10-dec-tops20
811
@@ -1339,16 +1270,16 @@ EOF
812
echo pdp10-xkl-tops20
815
- echo pdp10-${VENDOR}-tops20
816
+ echo pdp10-unknown-tops20
819
- echo pdp10-${VENDOR}-its
820
+ echo pdp10-unknown-its
823
echo mips-sei-seiux${UNAME_RELEASE}
826
- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
827
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
830
UNAME_MACHINE=`(uname -p) 2>/dev/null`
831
Index: brasero-2.30.1/config.h.in
832
===================================================================
833
--- brasero-2.30.1.orig/config.h.in 2010-04-27 01:29:12.000000000 +0200
834
+++ brasero-2.30.1/config.h.in 2010-05-03 15:56:49.096114761 +0200
836
/* Define to the one symbol short name of this package. */
837
#undef PACKAGE_TARNAME
839
+/* Define to the home page for this package. */
842
/* Define to the version of this package. */
843
#undef PACKAGE_VERSION
845
Index: brasero-2.30.1/config.sub
846
===================================================================
847
--- brasero-2.30.1.orig/config.sub 2010-04-27 01:29:13.000000000 +0200
848
+++ brasero-2.30.1/config.sub 2010-05-03 15:57:24.236111042 +0200
851
# Configuration validation subroutine script.
852
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
853
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
854
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
2448
Index: brasero-2.30.2/config.sub
2449
===================================================================
2450
--- brasero-2.30.2.orig/config.sub 2010-07-04 14:04:53.149084093 +0200
2451
+++ brasero-2.30.2/config.sub 2010-07-04 14:04:20.425087951 +0200
2453
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
855
2454
# Free Software Foundation, Inc.
857
-timestamp='2009-04-17'
2456
-timestamp='2010-03-22'
858
2457
+timestamp='2010-01-22'
860
2459
# This file is (in principle) common to ALL GNU software.
861
2460
# The presence of a machine in this file suggests that SOME GNU software
862
@@ -32,13 +32,16 @@ timestamp='2009-04-17'
865
# Please send patches to <config-patches@gnu.org>. Submit a context
866
-# diff and a properly formatted ChangeLog entry.
867
+# diff and a properly formatted GNU ChangeLog entry.
869
# Configuration subroutine to validate and canonicalize a configuration type.
870
# Supply the specified configuration type as an argument.
871
# If it is invalid, we print an error message on stderr and exit with code 1.
872
# Otherwise, we print the canonical config type on stdout and succeed.
874
+# You can get the latest version of this script from:
875
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
877
# This file is supposed to be the same for all GNU packages
878
# and recognize all the CPU types, system types and aliases
879
# that are meaningful with *any* GNU software.
880
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
882
GNU config.sub ($timestamp)
884
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
885
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
886
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
887
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
888
+Software Foundation, Inc.
890
This is free software; see the source for copying conditions. There is NO
891
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
892
@@ -149,10 +153,13 @@ case $os in
893
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
894
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
895
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
896
- -apple | -axis | -knuth | -cray)
897
+ -apple | -axis | -knuth | -cray | -microblaze)
904
-sim | -cisco | -oki | -wec | -winbond)
907
@@ -281,6 +288,7 @@ case $basic_machine in
908
| pdp10 | pdp11 | pj | pjl \
909
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
913
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
915
@@ -288,13 +296,14 @@ case $basic_machine in
2462
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
2465
- | d10v | d30v | dlx | dsp16xx | dvp \
2466
+ | d10v | d30v | dlx | dsp16xx \
2467
| fido | fr30 | frv \
2468
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
2469
| i370 | i860 | i960 | ia64 \
2471
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
916
2472
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
917
2473
| spu | strongarm \
918
| tahoe | thumb | tic4x | tic80 | tron \
2474
- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
2475
+ | tahoe | thumb | tic4x | tic80 | tron \
920
2477
| v850 | v850e \
922
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
2479
@@ -303,15 +303,6 @@
924
2481
basic_machine=$basic_machine-unknown
926
- m6811 | m68hc11 | m6812 | m68hc12)
927
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
2484
- basic_machine=tic54x-unknown
2487
- basic_machine=tic55x-unknown
2490
- basic_machine=tic6x-unknown
2492
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
928
2493
# Motorola 68HC11/12.
929
2494
basic_machine=$basic_machine-unknown
931
@@ -337,7 +346,7 @@ case $basic_machine in
933
| m32c-* | m32r-* | m32rle-* \
934
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
935
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
936
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
937
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
939
| mips64-* | mips64el-* \
940
@@ -365,15 +374,17 @@ case $basic_machine in
941
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
942
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
944
- | romp-* | rs6000-* \
945
+ | romp-* | rs6000-* | rx-* \
946
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
947
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
948
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
950
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
951
| tahoe-* | thumb-* \
952
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
953
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
954
+ | tile-* | tilegx-* \
957
| v850-* | v850e-* | vax-* \
959
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
960
@@ -467,6 +478,10 @@ case $basic_machine in
961
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
2496
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
2498
| bfin-* | bs2000-* \
2499
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
2500
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
2501
| clipper-* | craynv-* | cydra-* \
2502
| d10v-* | d30v-* | dlx-* \
2504
@@ -491,15 +482,6 @@
2505
basic_machine=powerpc-ibm
965
+ basic_machine=powerpc-ibm
2509
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
2512
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
2515
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
969
2518
basic_machine=c90-cray
971
@@ -719,6 +734,9 @@ case $basic_machine in
972
basic_machine=ns32k-utek
976
+ basic_machine=microblaze-xilinx
979
basic_machine=i386-pc
981
@@ -1069,6 +1087,11 @@ case $basic_machine in
982
basic_machine=tic6x-unknown
985
+ # This must be matched before tile*.
987
+ basic_machine=tilegx-unknown
991
basic_machine=tile-unknown
993
@@ -1240,6 +1263,9 @@ case $os in
994
# First match some system type aliases
995
# that might get confused with valid system types.
996
# -solaris* is a basic system type, with this one exception.
1000
-solaris1 | -solaris1.*)
1001
os=`echo $os | sed -e 's|solaris1|sunos4|'`
1003
@@ -1260,9 +1286,9 @@ case $os in
1004
# Each alternative MUST END IN A *, to match a version number.
1005
# -sysv* is not here because it comes later, after sysvr4.
1006
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1007
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1008
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1009
- | -kopensolaris* \
1010
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1011
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1012
+ | -sym* | -kopensolaris* \
1013
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1015
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1016
@@ -1283,7 +1309,7 @@ case $os in
2520
@@ -770,24 +752,6 @@
2521
basic_machine=m68k-atari
2524
- mipsEE* | ee | ps2)
2525
- basic_machine=mips64r5900el-scei
2535
- basic_machine=mipsel-scei
2539
- basic_machine=dvp-scei
2543
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
2545
@@ -1111,6 +1075,18 @@
2546
basic_machine=t90-cray
2550
+ basic_machine=tic54x-unknown
2554
+ basic_machine=tic55x-unknown
2558
+ basic_machine=tic6x-unknown
2561
# This must be matched before tile*.
2563
basic_machine=tilegx-unknown
2564
@@ -1329,7 +1305,7 @@
2565
| -uxpv* | -beos* | -mpeix* | -udk* \
2566
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
2567
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
2568
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
2569
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1017
2570
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1018
2571
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1019
2572
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1020
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1021
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1022
# Remember, each alternative MUST END IN *, to match a version number.
1025
@@ -1416,6 +1442,8 @@ case $os in
1034
@@ -1613,7 +1641,7 @@ case $basic_machine in
1043
Index: brasero-2.30.1/configure
2573
@@ -1508,15 +1484,6 @@
2586
# This must come before the *-dec entry.
2589
Index: brasero-2.30.2/configure
1044
2590
===================================================================
1045
--- brasero-2.30.1.orig/configure 2010-04-27 01:29:11.000000000 +0200
1046
+++ brasero-2.30.1/configure 2010-05-03 15:57:31.024103860 +0200
1049
# Guess values for system-dependent variables and create Makefiles.
1050
-# Generated by GNU Autoconf 2.63 for brasero 2.30.1.
1051
+# Generated by GNU Autoconf 2.65 for brasero 2.30.1.
1054
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1055
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1056
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1060
# This configure script is free software; the Free Software Foundation
1061
# gives unlimited permission to copy, distribute and modify it.
1062
-## --------------------- ##
1063
-## M4sh Initialization. ##
1064
-## --------------------- ##
1065
+## -------------------- ##
1066
+## M4sh Initialization. ##
1067
+## -------------------- ##
1069
# Be more Bourne compatible
1070
DUALCASE=1; export DUALCASE # for MKS sh
1071
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1072
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
1075
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1076
@@ -20,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
1077
alias -g '${1+"$@"}'='"$@"'
1078
setopt NO_GLOB_SUBST
1080
- case `(set -o) 2>/dev/null` in
1081
- *posix*) set -o posix ;;
1082
+ case `(set -o) 2>/dev/null` in #(
1084
+ set -o posix ;; #(
1095
-# Avoid depending upon Character Ranges.
1096
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
1097
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
1098
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
1099
-as_cr_digits='0123456789'
1100
-as_cr_alnum=$as_cr_Letters$as_cr_digits
1105
@@ -44,7 +40,13 @@ export as_nl
1106
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1107
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
1108
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
1109
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1110
+# Prefer a ksh shell builtin over an external printf program on Solaris,
1111
+# but without wasting forks for bash or zsh.
1112
+if test -z "$BASH_VERSION$ZSH_VERSION" \
1113
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
1114
+ as_echo='print -r --'
1115
+ as_echo_n='print -rn --'
1116
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1117
as_echo='printf %s\n'
1118
as_echo_n='printf %s'
1120
@@ -55,7 +57,7 @@ else
1121
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
1122
as_echo_n_body='eval
1127
expr "X$arg" : "X\\(.*\\)$as_nl";
1128
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
1129
@@ -78,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set;
1133
-# Support unset when possible.
1134
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
1142
# We need space, tab and new line, in precisely that order. Quoting is
1143
@@ -94,15 +89,15 @@ fi
1146
# Find who we are. Look in the path if we contain no directory separator.
1149
*[\\/]* ) as_myself=$0 ;;
1150
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1154
test -z "$as_dir" && as_dir=.
1155
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1157
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1162
@@ -114,12 +109,16 @@ if test "x$as_myself" = x; then
1164
if test ! -f "$as_myself"; then
1165
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1166
- { (exit 1); exit 1; }
1170
-# Work around bugs in pre-3.0 UWIN ksh.
1171
-for as_var in ENV MAIL MAILPATH
1172
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1173
+# Unset variables that we do not need and which cause bugs (e.g. in
1174
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
1175
+# suppresses any "Segmentation fault" message there. '((' could
1176
+# trigger a bug in pdksh 5.2.14.
1177
+for as_var in BASH_ENV ENV MAIL MAILPATH
1178
+do eval test x\${$as_var+set} = xset \
1179
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
1183
@@ -131,330 +130,299 @@ export LC_ALL
1187
-# Required to use basename.
1188
-if expr a : '\(a\)' >/dev/null 2>&1 &&
1189
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
1195
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
1196
- as_basename=basename
1202
-# Name of the executable.
1203
-as_me=`$as_basename -- "$0" ||
1204
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
1205
- X"$0" : 'X\(//\)$' \| \
1206
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1208
- sed '/^.*\/\([^/][^/]*\)\/*$/{
1225
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1227
if test "x$CONFIG_SHELL" = x; then
1228
- if (eval ":") 2>/dev/null; then
1229
- as_have_required=yes
1230
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
1233
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
1234
+ # is contrary to our usage. Disable this feature.
1235
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
1236
+ setopt NO_GLOB_SUBST
1238
- as_have_required=no
1239
+ case \`(set -o) 2>/dev/null\` in #(
1241
+ set -o posix ;; #(
1247
- if test $as_have_required = yes && (eval ":
1248
-(as_func_return () {
1251
-as_func_success () {
1254
-as_func_failure () {
1257
-as_func_ret_success () {
1260
-as_func_ret_failure () {
1264
+ as_required="as_fn_return () { (exit \$1); }
1265
+as_fn_success () { as_fn_return 0; }
1266
+as_fn_failure () { as_fn_return 1; }
1267
+as_fn_ret_success () { return 0; }
1268
+as_fn_ret_failure () { return 1; }
1271
-if as_func_success; then
1275
- echo as_func_success failed.
1278
-if as_func_failure; then
1280
- echo as_func_failure succeeded.
1283
-if as_func_ret_success; then
1287
- echo as_func_ret_success failed.
1290
-if as_func_ret_failure; then
1292
- echo as_func_ret_failure succeeded.
1295
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
1297
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
1298
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
1299
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
1300
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
1301
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
1304
+ exitcode=1; echo positional parameters were not saved.
1306
+test x\$exitcode = x0 || exit 1"
1307
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
1308
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
1309
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
1310
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
1311
+test \$(( 1 + 1 )) = 2 || exit 1"
1312
+ if (eval "$as_required") 2>/dev/null; then :
1313
+ as_have_required=yes
1316
- echo positional parameters were not saved.
1317
+ as_have_required=no
1319
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
1321
-test \$exitcode = 0) || { (exit 1); exit 1; }
1324
- as_lineno_1=\$LINENO
1325
- as_lineno_2=\$LINENO
1326
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
1327
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
1328
-") 2> /dev/null; then
1331
- as_candidate_shells=
1332
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1333
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1335
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
1338
test -z "$as_dir" && as_dir=.
1341
+ case $as_dir in #(
1343
for as_base in sh bash ksh sh5; do
1344
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
1345
+ # Try only shells that exist, to save several forks.
1346
+ as_shell=$as_dir/$as_base
1347
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
1348
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
1349
+ CONFIG_SHELL=$as_shell as_have_required=yes
1350
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
1358
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
1359
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
1360
+ CONFIG_SHELL=$SHELL as_have_required=yes
1365
- for as_shell in $as_candidate_shells $SHELL; do
1366
- # Try only shells that exist, to save several forks.
1367
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
1368
- { ("$as_shell") 2> /dev/null <<\_ASEOF
1369
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1372
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1373
- # is contrary to our usage. Disable this feature.
1374
- alias -g '${1+"$@"}'='"$@"'
1375
- setopt NO_GLOB_SUBST
1377
- case `(set -o) 2>/dev/null` in
1378
- *posix*) set -o posix ;;
1387
- CONFIG_SHELL=$as_shell
1388
- as_have_required=yes
1389
- if { "$as_shell" 2> /dev/null <<\_ASEOF
1390
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1393
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1394
- # is contrary to our usage. Disable this feature.
1395
- alias -g '${1+"$@"}'='"$@"'
1396
- setopt NO_GLOB_SUBST
1398
- case `(set -o) 2>/dev/null` in
1399
- *posix*) set -o posix ;;
1406
-(as_func_return () {
1409
-as_func_success () {
1412
-as_func_failure () {
1415
-as_func_ret_success () {
1418
-as_func_ret_failure () {
1423
-if as_func_success; then
1427
- echo as_func_success failed.
1430
-if as_func_failure; then
1432
- echo as_func_failure succeeded.
1435
-if as_func_ret_success; then
1439
- echo as_func_ret_success failed.
1442
-if as_func_ret_failure; then
1444
- echo as_func_ret_failure succeeded.
1447
-if ( set x; as_func_ret_success y && test x = "$1" ); then
1451
- echo positional parameters were not saved.
1454
-test $exitcode = 0) || { (exit 1); exit 1; }
1457
- as_lineno_1=$LINENO
1458
- as_lineno_2=$LINENO
1459
- test "x$as_lineno_1" != "x$as_lineno_2" &&
1460
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
1471
- if test "x$CONFIG_SHELL" != x; then
1472
- for as_var in BASH_ENV ENV
1473
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1475
+ if test "x$CONFIG_SHELL" != x; then :
1476
+ # We cannot yet assume a decent shell, so we have to provide a
1477
+ # neutralization value for shells without unset; and this also
1478
+ # works around shells that cannot unset nonexistent variables.
1479
+ BASH_ENV=/dev/null
1481
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1483
exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1487
- if test $as_have_required = no; then
1488
- echo This script requires a shell more modern than all the
1489
- echo shells that I found on your system. Please install a
1490
- echo modern shell, or manually run the script under such a
1491
- echo shell if you do have one.
1492
- { (exit 1); exit 1; }
1493
+ if test x$as_have_required = xno; then :
1494
+ $as_echo "$0: This script requires a shell more modern than all"
1495
+ $as_echo "$0: the shells that I found on your system."
1496
+ if test x${ZSH_VERSION+set} = xset ; then
1497
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
1498
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
1500
+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
1501
+$0: including any error possibly output before this
1502
+$0: message. Then install a modern shell, or manually run
1503
+$0: the script under such a shell if you do have one."
1512
+SHELL=${CONFIG_SHELL-/bin/sh}
1514
+# Unset more variables known to interfere with behavior of common tools.
1515
+CLICOLOR_FORCE= GREP_OPTIONS=
1516
+unset CLICOLOR_FORCE GREP_OPTIONS
1518
+## --------------------- ##
1519
+## M4sh Shell Functions. ##
1520
+## --------------------- ##
1523
+# Portably unset VAR.
1526
+ { eval $1=; unset $1;}
1528
+as_unset=as_fn_unset
1530
+# as_fn_set_status STATUS
1531
+# -----------------------
1532
+# Set $? to STATUS, without forking.
1533
+as_fn_set_status ()
1536
+} # as_fn_set_status
1538
+# as_fn_exit STATUS
1539
+# -----------------
1540
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
1544
+ as_fn_set_status $1
1550
+# Create "$as_dir" as a directory, including parents if necessary.
1554
+ case $as_dir in #(
1555
+ -*) as_dir=./$as_dir;;
1557
+ test -d "$as_dir" || eval $as_mkdir_p || {
1560
+ case $as_dir in #(
1561
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
1562
+ *) as_qdir=$as_dir;;
1564
+ as_dirs="'$as_qdir' $as_dirs"
1565
+ as_dir=`$as_dirname -- "$as_dir" ||
1566
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1567
+ X"$as_dir" : 'X\(//\)[^/]' \| \
1568
+ X"$as_dir" : 'X\(//\)$' \| \
1569
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
1570
+$as_echo X"$as_dir" |
1571
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1575
+ /^X\(\/\/\)[^/].*/{
1588
+ test -d "$as_dir" && break
1590
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
1591
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
1593
-(eval "as_func_return () {
1596
-as_func_success () {
1599
-as_func_failure () {
1602
-as_func_ret_success () {
1605
-as_func_ret_failure () {
1610
-if as_func_success; then
1613
+# as_fn_append VAR VALUE
1614
+# ----------------------
1615
+# Append the text in VALUE to the end of the definition contained in VAR. Take
1616
+# advantage of any shell optimizations that allow amortized linear growth over
1617
+# repeated appends, instead of the typical quadratic growth present in naive
1619
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
1620
+ eval 'as_fn_append ()
1626
- echo as_func_success failed.
1634
-if as_func_failure; then
1636
- echo as_func_failure succeeded.
1638
+# as_fn_arith ARG...
1639
+# ------------------
1640
+# Perform arithmetic evaluation on the ARGs, and store the result in the
1641
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
1642
+# must be portable across $(()) and expr.
1643
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
1644
+ eval 'as_fn_arith ()
1651
+ as_val=`expr "$@" || test $? -eq 1`
1655
-if as_func_ret_success; then
1658
+# as_fn_error ERROR [LINENO LOG_FD]
1659
+# ---------------------------------
1660
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
1661
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
1662
+# script with status $?, using 1 if that was 0.
1665
+ as_status=$?; test $as_status -eq 0 && as_status=1
1666
+ if test "$3"; then
1667
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1668
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
1670
+ $as_echo "$as_me: error: $1" >&2
1671
+ as_fn_exit $as_status
1674
+if expr a : '\(a\)' >/dev/null 2>&1 &&
1675
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
1679
- echo as_func_ret_success failed.
1683
-if as_func_ret_failure; then
1685
- echo as_func_ret_failure succeeded.
1686
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
1687
+ as_basename=basename
1692
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
1694
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
1695
+ as_dirname=dirname
1698
- echo positional parameters were not saved.
1702
-test \$exitcode = 0") || {
1703
- echo No shell found that supports shell functions.
1704
- echo Please tell bug-autoconf@gnu.org about your system,
1705
- echo including any error possibly output before this message.
1706
- echo This can help us improve future autoconf versions.
1707
- echo Configuration will now proceed without shell functions.
1709
+as_me=`$as_basename -- "$0" ||
1710
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
1711
+ X"$0" : 'X\(//\)$' \| \
1712
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1714
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
1728
+# Avoid depending upon Character Ranges.
1729
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
1730
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
1731
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
1732
+as_cr_digits='0123456789'
1733
+as_cr_alnum=$as_cr_Letters$as_cr_digits
1736
- as_lineno_1=$LINENO
1737
- as_lineno_2=$LINENO
1738
- test "x$as_lineno_1" != "x$as_lineno_2" &&
1739
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
1741
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
1742
- # uniformly replaced by the line number. The first 'sed' inserts a
1743
- # line-number line after each line using $LINENO; the second 'sed'
1744
- # does the real work. The second script uses 'N' to pair each
1745
- # line-number line with the line containing $LINENO, and appends
1746
- # trailing '-' during substitution so that $LINENO is not a special
1747
- # case at line end.
1748
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
1749
- # scripts with optimization help from Paolo Bonzini. Blame Lee
1750
- # E. McMahon (1931-1989) for sed's syntax. :-)
1751
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
1752
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
1753
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
1754
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
1755
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
1759
@@ -471,8 +439,7 @@ test \$exitcode = 0") || {
1762
chmod +x "$as_me.lineno" ||
1763
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1764
- { (exit 1); exit 1; }; }
1765
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
1767
# Don't try to exec as it changes $[0], causing all sort of problems
1768
# (the dirname of $[0] is not the place where we might find the
1769
@@ -482,29 +449,18 @@ test \$exitcode = 0") || {
1774
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
1775
- as_dirname=dirname
1780
ECHO_C= ECHO_N= ECHO_T=
1781
-case `echo -n x` in
1782
+case `echo -n x` in #(((((
1784
- case `echo 'x\c'` in
1785
+ case `echo 'xy\c'` in
1786
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
1789
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
1795
-if expr a : '\(a\)' >/dev/null 2>&1 &&
1796
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
1802
rm -f conf$$ conf$$.exe conf$$.file
1803
if test -d conf$$.dir; then
1804
@@ -534,7 +490,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
1805
rmdir conf$$.dir 2>/dev/null
1807
if mkdir -p . 2>/dev/null; then
1809
+ as_mkdir_p='mkdir -p "$as_dir"'
1811
test -d ./-p && rmdir ./-p
1813
@@ -553,10 +509,10 @@ else
1814
if test -d "$1"; then
1821
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
1822
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
1823
???[sx]*):;;*)false;;esac;fi
1826
@@ -571,7 +527,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
1831
# Check that we are running under the correct shell.
2591
--- brasero-2.30.2.orig/configure 2010-07-04 14:04:53.629087691 +0200
2592
+++ brasero-2.30.2/configure 2010-07-04 14:04:30.905077572 +0200
2593
@@ -171,14 +171,6 @@
2594
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
2595
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
2596
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
2598
- test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
2599
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
2600
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
2601
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
2602
- PATH=/empty FPATH=/empty; export PATH FPATH
2603
- test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
2604
- || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
2605
test \$(( 1 + 1 )) = 2 || exit 1"
2606
if (eval "$as_required") 2>/dev/null; then :
2607
as_have_required=yes
2608
@@ -533,8 +525,155 @@
2609
# Sed expression to map a string onto a valid variable name.
2610
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
2614
+# Check that we are running under the correct shell.
1832
2615
SHELL=${CONFIG_SHELL-/bin/sh}
1834
@@ -720,7 +675,8 @@ fi
1838
-exec 7<&0 </dev/null 6>&1
1839
+test -n "$DJDIR" || exec 7<&0 </dev/null
1843
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
1844
@@ -738,7 +694,6 @@ cross_compiling=no
1848
-SHELL=${CONFIG_SHELL-/bin/sh}
1850
# Identity of this package.
1851
PACKAGE_NAME='brasero'
1852
@@ -746,6 +701,7 @@ PACKAGE_TARNAME='brasero'
1853
PACKAGE_VERSION='2.30.1'
1854
PACKAGE_STRING='brasero 2.30.1'
1855
PACKAGE_BUGREPORT=''
1858
ac_unique_file="src/main.c"
1859
# Factoring default headers for most tests.
1860
@@ -1054,6 +1010,7 @@ bindir
1861
program_transform_name
1868
@@ -1260,8 +1217,7 @@ do
1869
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1870
# Reject names that are not valid shell variable names.
1871
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1872
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
1873
- { (exit 1); exit 1; }; }
1874
+ as_fn_error "invalid feature name: $ac_useropt"
1875
ac_useropt_orig=$ac_useropt
1876
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1877
case $ac_user_opts in
1878
@@ -1287,8 +1243,7 @@ do
1879
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1880
# Reject names that are not valid shell variable names.
1881
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1882
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
1883
- { (exit 1); exit 1; }; }
1884
+ as_fn_error "invalid feature name: $ac_useropt"
1885
ac_useropt_orig=$ac_useropt
1886
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1887
case $ac_user_opts in
1888
@@ -1492,8 +1447,7 @@ do
1889
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1890
# Reject names that are not valid shell variable names.
1891
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1892
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1893
- { (exit 1); exit 1; }; }
1894
+ as_fn_error "invalid package name: $ac_useropt"
1895
ac_useropt_orig=$ac_useropt
1896
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1897
case $ac_user_opts in
1898
@@ -1509,8 +1463,7 @@ do
1899
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1900
# Reject names that are not valid shell variable names.
1901
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1902
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1903
- { (exit 1); exit 1; }; }
1904
+ as_fn_error "invalid package name: $ac_useropt"
1905
ac_useropt_orig=$ac_useropt
1906
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1907
case $ac_user_opts in
1908
@@ -1540,17 +1493,17 @@ do
1909
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1910
x_libraries=$ac_optarg ;;
1912
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
1913
-Try \`$0 --help' for more information." >&2
1914
- { (exit 1); exit 1; }; }
1915
+ -*) as_fn_error "unrecognized option: \`$ac_option'
1916
+Try \`$0 --help' for more information."
1920
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
1921
# Reject names that are not valid shell variable names.
1922
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1923
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1924
- { (exit 1); exit 1; }; }
1925
+ case $ac_envvar in #(
1926
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
1927
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
1929
eval $ac_envvar=\$ac_optarg
1930
export $ac_envvar ;;
1932
@@ -1567,15 +1520,13 @@ done
1934
if test -n "$ac_prev"; then
1935
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1936
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
1937
- { (exit 1); exit 1; }; }
1938
+ as_fn_error "missing argument to $ac_option"
1941
if test -n "$ac_unrecognized_opts"; then
1942
case $enable_option_checking in
1944
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
1945
- { (exit 1); exit 1; }; } ;;
1946
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
1947
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1950
@@ -1598,8 +1549,7 @@ do
1951
[\\/$]* | ?:[\\/]* ) continue;;
1952
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1954
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1955
- { (exit 1); exit 1; }; }
1956
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
1959
# There might be people who depend on the old broken behavior: `$host'
1960
@@ -1629,11 +1579,9 @@ test "$silent" = yes && exec 6>/dev/null
1961
ac_pwd=`pwd` && test -n "$ac_pwd" &&
1962
ac_ls_di=`ls -di .` &&
1963
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1964
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
1965
- { (exit 1); exit 1; }; }
1966
+ as_fn_error "working directory cannot be determined"
1967
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1968
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
1969
- { (exit 1); exit 1; }; }
1970
+ as_fn_error "pwd does not report name of working directory"
1973
# Find the source files, if location was not specified.
1974
@@ -1672,13 +1620,11 @@ else
1976
if test ! -r "$srcdir/$ac_unique_file"; then
1977
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1978
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1979
- { (exit 1); exit 1; }; }
1980
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
1982
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1984
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
1985
- { (exit 1); exit 1; }; }
1986
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
1988
# When building in place, set srcdir=.
1989
if test "$ac_abs_confdir" = "$ac_pwd"; then
1990
@@ -1794,9 +1740,9 @@ Optional Features:
1991
--enable-maintainer-mode enable make rules and dependencies not useful
1992
(and sometimes confusing) to the casual installer
1993
--disable-scrollkeeper do not make updates to the scrollkeeper database
1994
- --enable-gtk-doc use gtk-doc to build documentation [default=no]
1995
- --enable-gtk-doc-html build documentation in html format [default=yes]
1996
- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
1997
+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
1998
+ --enable-gtk-doc-html build documentation in html format [[default=yes]]
1999
+ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
2000
--enable-compile-warnings=[no/minimum/yes/maximum/error]
2001
Turn on compiler warnings
2002
--enable-iso-c Try to warn if code is not ISO C
2003
@@ -1805,22 +1751,22 @@ Optional Features:
2005
--enable-iso-cxx Try to warn if code is not ISO C++
2006
--disable-largefile omit support for large files
2007
- --enable-nautilus Build Nautilus extension [default=yes]
2008
- --enable-libburnia Build libburnia plugins [default=yes]
2009
- --enable-cdrtools Build cdrtools plugins [default=yes]
2010
- --enable-cdrdao Build cdrdao plugins [default=yes]
2011
- --enable-cdrkit Build cdrkit plugins [default=yes]
2012
- --enable-growisofs Build growisofs plugins [default=yes]
2013
+ --enable-nautilus Build Nautilus extension [[default=yes]]
2014
+ --enable-libburnia Build libburnia plugins [[default=yes]]
2015
+ --enable-cdrtools Build cdrtools plugins [[default=yes]]
2016
+ --enable-cdrdao Build cdrdao plugins [[default=yes]]
2017
+ --enable-cdrkit Build cdrkit plugins [[default=yes]]
2018
+ --enable-growisofs Build growisofs plugins [[default=yes]]
2019
--enable-search Build search pane (if a search backend is available)
2022
--enable-playlist Build playlist pane (if totem is
2023
- available)[default=yes]
2024
- --enable-preview Build preview pane [default=yes]
2025
- --enable-inotify use inotify [default=yes]
2026
+ available)[[default=yes]]
2027
+ --enable-preview Build preview pane [[default=yes]]
2028
+ --enable-inotify use inotify [[default=yes]]
2029
--enable-introspection=[no/auto/yes]
2030
Enable introspection for this build
2031
--enable-caches Run update-* to update mime, desktop and icon caches
2032
- when installing [default=yes]
2033
+ when installing [[default=yes]]
2034
--disable-nls do not use Native Language Support
2035
--disable-schemas-install
2036
Disable installation of the gconf schemas
2037
@@ -1852,7 +1798,7 @@ Some influential environment variables:
2038
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
2039
nonstandard directory <lib dir>
2040
LIBS libraries to pass to the linker, e.g. -l<library>
2041
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
2042
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
2043
you have headers in a nonstandard directory <include dir>
2045
PKG_CONFIG path to pkg-config utility
2046
@@ -1934,6 +1880,7 @@ Some influential environment variables:
2047
Use these variables to override the choices made by `configure' or to help
2048
it to find libraries and programs with nonstandard names/locations.
2050
+Report bugs to the package provider.
2054
@@ -1993,25 +1940,430 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
2058
-test -n "$ac_init_help" && exit $ac_status
2059
-if $ac_init_version; then
2061
-brasero configure 2.30.1
2062
-generated by GNU Autoconf 2.63
2063
+test -n "$ac_init_help" && exit $ac_status
2064
+if $ac_init_version; then
2066
+brasero configure 2.30.1
2067
+generated by GNU Autoconf 2.65
2069
+Copyright (C) 2009 Free Software Foundation, Inc.
2070
+This configure script is free software; the Free Software Foundation
2071
+gives unlimited permission to copy, distribute and modify it.
2076
+## ------------------------ ##
2077
+## Autoconf initialization. ##
2078
+## ------------------------ ##
2080
+# ac_fn_c_try_compile LINENO
2081
+# --------------------------
2082
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
2083
+ac_fn_c_try_compile ()
2085
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2086
+ rm -f conftest.$ac_objext
2087
+ if { { ac_try="$ac_compile"
2088
+case "(($ac_try" in
2089
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2090
+ *) ac_try_echo=$ac_try;;
2092
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2093
+$as_echo "$ac_try_echo"; } >&5
2094
+ (eval "$ac_compile") 2>conftest.err
2096
+ if test -s conftest.err; then
2097
+ grep -v '^ *+' conftest.err >conftest.er1
2098
+ cat conftest.er1 >&5
2099
+ mv -f conftest.er1 conftest.err
2101
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2102
+ test $ac_status = 0; } && {
2103
+ test -z "$ac_c_werror_flag" ||
2104
+ test ! -s conftest.err
2105
+ } && test -s conftest.$ac_objext; then :
2108
+ $as_echo "$as_me: failed program was:" >&5
2109
+sed 's/^/| /' conftest.$ac_ext >&5
2113
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2114
+ as_fn_set_status $ac_retval
2116
+} # ac_fn_c_try_compile
2118
+# ac_fn_c_try_link LINENO
2119
+# -----------------------
2120
+# Try to link conftest.$ac_ext, and return whether this succeeded.
2121
+ac_fn_c_try_link ()
2123
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2124
+ rm -f conftest.$ac_objext conftest$ac_exeext
2125
+ if { { ac_try="$ac_link"
2126
+case "(($ac_try" in
2127
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2128
+ *) ac_try_echo=$ac_try;;
2130
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2131
+$as_echo "$ac_try_echo"; } >&5
2132
+ (eval "$ac_link") 2>conftest.err
2134
+ if test -s conftest.err; then
2135
+ grep -v '^ *+' conftest.err >conftest.er1
2136
+ cat conftest.er1 >&5
2137
+ mv -f conftest.er1 conftest.err
2139
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2140
+ test $ac_status = 0; } && {
2141
+ test -z "$ac_c_werror_flag" ||
2142
+ test ! -s conftest.err
2143
+ } && test -s conftest$ac_exeext && {
2144
+ test "$cross_compiling" = yes ||
2145
+ $as_test_x conftest$ac_exeext
2149
+ $as_echo "$as_me: failed program was:" >&5
2150
+sed 's/^/| /' conftest.$ac_ext >&5
2154
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
2155
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
2156
+ # interfere with the next link command; also delete a directory that is
2157
+ # left behind by Apple's compiler. We do this before executing the actions.
2158
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2159
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2160
+ as_fn_set_status $ac_retval
2162
+} # ac_fn_c_try_link
2164
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
2165
+# -------------------------------------------------------
2166
+# Tests whether HEADER exists and can be compiled using the include files in
2167
+# INCLUDES, setting the cache variable VAR accordingly.
2168
+ac_fn_c_check_header_compile ()
2170
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2171
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2172
+$as_echo_n "checking for $2... " >&6; }
2173
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2174
+ $as_echo_n "(cached) " >&6
2176
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2177
+/* end confdefs.h. */
2181
+if ac_fn_c_try_compile "$LINENO"; then :
2186
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2189
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2190
+$as_echo "$ac_res" >&6; }
2191
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2193
+} # ac_fn_c_check_header_compile
2195
+# ac_fn_c_try_cpp LINENO
2196
+# ----------------------
2197
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
2200
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2201
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
2202
+case "(($ac_try" in
2203
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2204
+ *) ac_try_echo=$ac_try;;
2206
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2207
+$as_echo "$ac_try_echo"; } >&5
2208
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
2210
+ if test -s conftest.err; then
2211
+ grep -v '^ *+' conftest.err >conftest.er1
2212
+ cat conftest.er1 >&5
2213
+ mv -f conftest.er1 conftest.err
2215
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2216
+ test $ac_status = 0; } >/dev/null && {
2217
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2218
+ test ! -s conftest.err
2222
+ $as_echo "$as_me: failed program was:" >&5
2223
+sed 's/^/| /' conftest.$ac_ext >&5
2227
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2228
+ as_fn_set_status $ac_retval
2230
+} # ac_fn_c_try_cpp
2232
+# ac_fn_c_try_run LINENO
2233
+# ----------------------
2234
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
2235
+# that executables *can* be run.
2238
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2239
+ if { { ac_try="$ac_link"
2240
+case "(($ac_try" in
2241
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2242
+ *) ac_try_echo=$ac_try;;
2244
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2245
+$as_echo "$ac_try_echo"; } >&5
2246
+ (eval "$ac_link") 2>&5
2248
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2249
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
2250
+ { { case "(($ac_try" in
2251
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2252
+ *) ac_try_echo=$ac_try;;
2254
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2255
+$as_echo "$ac_try_echo"; } >&5
2256
+ (eval "$ac_try") 2>&5
2258
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2259
+ test $ac_status = 0; }; }; then :
2262
+ $as_echo "$as_me: program exited with status $ac_status" >&5
2263
+ $as_echo "$as_me: failed program was:" >&5
2264
+sed 's/^/| /' conftest.$ac_ext >&5
2266
+ ac_retval=$ac_status
2268
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2269
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2270
+ as_fn_set_status $ac_retval
2272
+} # ac_fn_c_try_run
2274
+# ac_fn_c_check_func LINENO FUNC VAR
2275
+# ----------------------------------
2276
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
2277
+ac_fn_c_check_func ()
2279
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2280
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2281
+$as_echo_n "checking for $2... " >&6; }
2282
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2283
+ $as_echo_n "(cached) " >&6
2285
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2286
+/* end confdefs.h. */
2287
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
2288
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
2289
+#define $2 innocuous_$2
2291
+/* System header to define __stub macros and hopefully few prototypes,
2292
+ which can conflict with char $2 (); below.
2293
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
2294
+ <limits.h> exists even on freestanding compilers. */
2297
+# include <limits.h>
2299
+# include <assert.h>
2304
+/* Override any GCC internal prototype to avoid an error.
2305
+ Use char because int might match the return type of a GCC
2306
+ builtin and then its argument prototype would still apply. */
2311
+/* The GNU C library defines this for functions which it implements
2312
+ to always fail with ENOSYS. Some functions are actually named
2313
+ something starting with __ and the normal name is an alias. */
2314
+#if defined __stub_$2 || defined __stub___$2
2326
+if ac_fn_c_try_link "$LINENO"; then :
2331
+rm -f core conftest.err conftest.$ac_objext \
2332
+ conftest$ac_exeext conftest.$ac_ext
2335
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2336
+$as_echo "$ac_res" >&6; }
2337
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2339
+} # ac_fn_c_check_func
2341
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
2342
+# -------------------------------------------------------
2343
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
2344
+# the include files in INCLUDES and setting the cache variable VAR
2346
+ac_fn_c_check_header_mongrel ()
2348
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2349
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2350
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2351
+$as_echo_n "checking for $2... " >&6; }
2352
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2353
+ $as_echo_n "(cached) " >&6
2356
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2357
+$as_echo "$ac_res" >&6; }
2359
+ # Is the header compilable?
2360
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
2361
+$as_echo_n "checking $2 usability... " >&6; }
2362
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2363
+/* end confdefs.h. */
2367
+if ac_fn_c_try_compile "$LINENO"; then :
2368
+ ac_header_compiler=yes
2370
+ ac_header_compiler=no
2372
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2373
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
2374
+$as_echo "$ac_header_compiler" >&6; }
2376
+# Is the header present?
2377
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
2378
+$as_echo_n "checking $2 presence... " >&6; }
2379
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2380
+/* end confdefs.h. */
2383
+if ac_fn_c_try_cpp "$LINENO"; then :
2384
+ ac_header_preproc=yes
2386
+ ac_header_preproc=no
2388
+rm -f conftest.err conftest.$ac_ext
2389
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2390
+$as_echo "$ac_header_preproc" >&6; }
2392
+# So? What about this header?
2393
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
2395
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
2396
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
2397
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2398
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2401
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
2402
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
2403
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
2404
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
2405
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
2406
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2407
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
2408
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2409
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2410
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2413
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2414
+$as_echo_n "checking for $2... " >&6; }
2415
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2416
+ $as_echo_n "(cached) " >&6
2418
+ eval "$3=\$ac_header_compiler"
2421
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2422
+$as_echo "$ac_res" >&6; }
2424
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2426
+} # ac_fn_c_check_header_mongrel
2428
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2429
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2430
-This configure script is free software; the Free Software Foundation
2431
-gives unlimited permission to copy, distribute and modify it.
2432
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
2433
+# -------------------------------------------
2434
+# Tests whether TYPE exists after having included INCLUDES, setting cache
2435
+# variable VAR accordingly.
2436
+ac_fn_c_check_type ()
2438
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2439
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2440
+$as_echo_n "checking for $2... " >&6; }
2441
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2442
+ $as_echo_n "(cached) " >&6
2445
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2446
+/* end confdefs.h. */
2458
+if ac_fn_c_try_compile "$LINENO"; then :
2459
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2460
+/* end confdefs.h. */
2471
+if ac_fn_c_try_compile "$LINENO"; then :
2476
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2478
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2481
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2482
+$as_echo "$ac_res" >&6; }
2483
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2485
+} # ac_fn_c_check_type
2486
cat >config.log <<_ACEOF
2487
This file contains any messages produced by compilers while
2488
running configure, to aid debugging if configure makes a mistake.
2490
It was created by brasero $as_me 2.30.1, which was
2491
-generated by GNU Autoconf 2.63. Invocation command line was
2492
+generated by GNU Autoconf 2.65. Invocation command line was
2496
@@ -2047,8 +2399,8 @@ for as_dir in $PATH
2499
test -z "$as_dir" && as_dir=.
2500
- $as_echo "PATH: $as_dir"
2502
+ $as_echo "PATH: $as_dir"
2507
@@ -2085,9 +2437,9 @@ do
2508
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
2511
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
2512
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2514
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
2515
+ as_fn_append ac_configure_args1 " '$ac_arg'"
2516
if test $ac_must_keep_next = true; then
2517
ac_must_keep_next=false # Got value, back to normal.
2519
@@ -2103,13 +2455,13 @@ do
2520
-* ) ac_must_keep_next=true ;;
2523
- ac_configure_args="$ac_configure_args '$ac_arg'"
2524
+ as_fn_append ac_configure_args " '$ac_arg'"
2529
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
2530
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
2531
+{ ac_configure_args0=; unset ac_configure_args0;}
2532
+{ ac_configure_args1=; unset ac_configure_args1;}
2534
# When interrupted or exit'd, cleanup temporary files, and complete
2535
# config.log. We remove comments because anyway the quotes in there
2536
@@ -2134,13 +2486,13 @@ _ASBOX
2540
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
2541
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
2542
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2545
_ | IFS | as_nl) ;; #(
2546
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
2547
- *) $as_unset $ac_var ;;
2548
+ *) { eval $ac_var=; unset $ac_var;} ;;
2552
@@ -2212,39 +2564,41 @@ _ASBOX
2555
for ac_signal in 1 2 13 15; do
2556
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
2557
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
2561
# confdefs.h avoids OS command line length limits that DEFS can exceed.
2562
rm -f -r conftest* confdefs.h
2564
+$as_echo "/* confdefs.h */" > confdefs.h
2566
# Predefined preprocessor variables.
2568
cat >>confdefs.h <<_ACEOF
2569
#define PACKAGE_NAME "$PACKAGE_NAME"
2573
cat >>confdefs.h <<_ACEOF
2574
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
2578
cat >>confdefs.h <<_ACEOF
2579
#define PACKAGE_VERSION "$PACKAGE_VERSION"
2583
cat >>confdefs.h <<_ACEOF
2584
#define PACKAGE_STRING "$PACKAGE_STRING"
2588
cat >>confdefs.h <<_ACEOF
2589
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
2592
+cat >>confdefs.h <<_ACEOF
2593
+#define PACKAGE_URL "$PACKAGE_URL"
2597
# Let the site file select an alternate cache file if it wants to.
2598
# Prefer an explicitly selected file to automatically selected ones.
2599
@@ -2262,8 +2616,8 @@ fi
2600
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
2602
test "x$ac_site_file" = xNONE && continue
2603
- if test -r "$ac_site_file"; then
2604
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
2605
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
2606
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2607
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2608
sed 's/^/| /' "$ac_site_file" >&5
2610
@@ -2271,10 +2625,10 @@ $as_echo "$as_me: loading site script $a
2613
if test -r "$cache_file"; then
2614
- # Some versions of bash will fail to source /dev/null (special
2615
- # files actually), so we avoid doing that.
2616
- if test -f "$cache_file"; then
2617
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
2618
+ # Some versions of bash will fail to source /dev/null (special files
2619
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
2620
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
2621
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
2622
$as_echo "$as_me: loading cache $cache_file" >&6;}
2624
[\\/]* | ?:[\\/]* ) . "$cache_file";;
2625
@@ -2282,7 +2636,7 @@ $as_echo "$as_me: loading cache $cache_f
2629
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
2630
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
2631
$as_echo "$as_me: creating cache $cache_file" >&6;}
2634
@@ -2297,11 +2651,11 @@ for ac_var in $ac_precious_vars; do
2635
eval ac_new_val=\$ac_env_${ac_var}_value
2636
case $ac_old_set,$ac_new_set in
2638
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
2639
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
2640
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
2641
ac_cache_corrupted=: ;;
2643
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
2644
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
2645
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
2646
ac_cache_corrupted=: ;;
2648
@@ -2311,17 +2665,17 @@ $as_echo "$as_me: error: \`$ac_var' was
2649
ac_old_val_w=`echo x $ac_old_val`
2650
ac_new_val_w=`echo x $ac_new_val`
2651
if test "$ac_old_val_w" != "$ac_new_val_w"; then
2652
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
2653
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
2654
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
2655
ac_cache_corrupted=:
2657
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
2658
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
2659
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
2660
eval $ac_var=\$ac_old_val
2662
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
2663
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
2664
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
2665
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
2666
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
2667
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
2670
@@ -2333,43 +2687,20 @@ $as_echo "$as_me: current value: \`$ac
2672
case " $ac_configure_args " in
2673
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
2674
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
2675
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
2679
if $ac_cache_corrupted; then
2680
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2681
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2682
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2683
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
2684
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2685
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2686
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
2687
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
2688
- { (exit 1); exit 1; }; }
2689
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2715
+## -------------------- ##
2716
+## Main body of script. ##
2717
+## -------------------- ##
2720
ac_cpp='$CPP $CPPFLAGS'
2721
@@ -2428,24 +2759,16 @@ am__api_version='1.11'
2724
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2725
- if test -f "$ac_dir/install-sh"; then
2726
- ac_aux_dir=$ac_dir
2727
- ac_install_sh="$ac_aux_dir/install-sh -c"
2729
- elif test -f "$ac_dir/install.sh"; then
2730
- ac_aux_dir=$ac_dir
2731
- ac_install_sh="$ac_aux_dir/install.sh -c"
2733
- elif test -f "$ac_dir/shtool"; then
2734
- ac_aux_dir=$ac_dir
2735
- ac_install_sh="$ac_aux_dir/shtool install -c"
2738
+ for ac_t in install-sh install.sh shtool; do
2739
+ if test -f "$ac_dir/$ac_t"; then
2740
+ ac_aux_dir=$ac_dir
2741
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
2619
+ # Remove one level of quotation (which was required for Make).
2620
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
2624
+ECHO=${lt_ECHO-echo}
2625
+if test "X$1" = X--no-reexec; then
2626
+ # Discard the --no-reexec flag, and continue.
2628
+elif test "X$1" = X--fallback-echo; then
2629
+ # Avoid inline document here, it may be left over
2631
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
2632
+ # Yippee, $ECHO works!
2635
+ # Restart under the correct shell.
2636
+ exec $SHELL "$0" --no-reexec ${1+"$@"}
2639
+if test "X$1" = X--fallback-echo; then
2640
+ # used as fallback echo
2648
+# The HP-UX ksh and POSIX shell print the target directory to stdout
2649
+# if CDPATH is set.
2650
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2652
+if test -z "$lt_ECHO"; then
2653
+ if test "X${echo_test_string+set}" != Xset; then
2654
+ # find a string as large as possible, as long as the shell can cope with it
2655
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
2656
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2657
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
2658
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
2665
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
2666
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
2667
+ test "X$echo_testing_string" = "X$echo_test_string"; then
2670
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
2671
+ # backslashes. This makes it impossible to quote backslashes using
2672
+ # echo "$something" | sed 's/\\/\\\\/g'
2674
+ # So, first we look for a working echo in the user's PATH.
2676
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2677
+ for dir in $PATH /usr/ucb; do
2678
+ IFS="$lt_save_ifs"
2679
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
2680
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
2681
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
2682
+ test "X$echo_testing_string" = "X$echo_test_string"; then
2687
+ IFS="$lt_save_ifs"
2689
+ if test "X$ECHO" = Xecho; then
2690
+ # We didn't find a better echo, so look for alternatives.
2691
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
2692
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
2693
+ test "X$echo_testing_string" = "X$echo_test_string"; then
2694
+ # This shell has a builtin print -r that does the trick.
2696
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
2697
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
2698
+ # If we have ksh, try running configure again with it.
2699
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
2700
+ export ORIGINAL_CONFIG_SHELL
2701
+ CONFIG_SHELL=/bin/ksh
2702
+ export CONFIG_SHELL
2703
+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
2705
+ # Try using printf.
2706
+ ECHO='printf %s\n'
2707
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
2708
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
2709
+ test "X$echo_testing_string" = "X$echo_test_string"; then
2710
+ # Cool, printf works
2712
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
2713
+ test "X$echo_testing_string" = 'X\t' &&
2714
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2715
+ test "X$echo_testing_string" = "X$echo_test_string"; then
2716
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
2717
+ export CONFIG_SHELL
2718
+ SHELL="$CONFIG_SHELL"
2720
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
2721
+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
2722
+ test "X$echo_testing_string" = 'X\t' &&
2723
+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2724
+ test "X$echo_testing_string" = "X$echo_test_string"; then
2725
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
2727
+ # maybe with a smaller string...
2730
+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
2731
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
2738
+ if test "$prev" != 'sed 50q "$0"'; then
2739
+ echo_test_string=`eval $prev`
2740
+ export echo_test_string
2741
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
2743
+ # Oops. We lost completely, so just stick with echo.
2746
if test -z "$ac_aux_dir"; then
2747
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
2748
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
2749
- { (exit 1); exit 1; }; }
2750
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
2753
# These three variables are undocumented and unsupported,
2754
@@ -2471,10 +2794,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
2755
# OS/2's system install, which has a completely different semantic
2756
# ./install, which can be erroneously created by make from ./install.sh.
2757
# Reject install programs that cannot install multiple files.
2758
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2759
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2760
$as_echo_n "checking for a BSD-compatible install... " >&6; }
2761
if test -z "$INSTALL"; then
2762
-if test "${ac_cv_path_install+set}" = set; then
2763
+if test "${ac_cv_path_install+set}" = set; then :
2764
$as_echo_n "(cached) " >&6
2766
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2767
@@ -2482,11 +2805,11 @@ for as_dir in $PATH
2770
test -z "$as_dir" && as_dir=.
2771
- # Account for people who put trailing slashes in PATH elements.
2773
- ./ | .// | /cC/* | \
2774
+ # Account for people who put trailing slashes in PATH elements.
2775
+case $as_dir/ in #((
2776
+ ./ | .// | /[cC]/* | \
2777
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
2778
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
2779
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
2782
# OSF1 and SCO ODT 3.0 have their own names for install.
2783
@@ -2523,7 +2846,7 @@ case $as_dir/ in
2791
rm -rf conftest.one conftest.two conftest.dir
2792
@@ -2539,7 +2862,7 @@ fi
2793
INSTALL=$ac_install_sh
2796
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
2797
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
2798
$as_echo "$INSTALL" >&6; }
2800
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2801
@@ -2550,7 +2873,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
2803
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2805
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
2806
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2807
$as_echo_n "checking whether build environment is sane... " >&6; }
2810
@@ -2561,15 +2884,11 @@ am_lf='
2813
*[\\\"\#\$\&\'\`$am_lf]*)
2814
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
2815
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
2816
- { (exit 1); exit 1; }; };;
2817
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
2820
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2821
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
2822
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
2823
- { (exit 1); exit 1; }; };;
2824
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2827
# Do `set' in a subshell so we don't clobber the current shell's
2828
@@ -2591,11 +2910,8 @@ if (
2829
# if, for instance, CONFIG_SHELL is bash and it inherits a
2830
# broken ls alias from the environment. This has actually
2831
# happened. Such a system could not be considered "sane".
2832
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
2833
-alias in your environment" >&5
2834
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
2835
-alias in your environment" >&2;}
2836
- { (exit 1); exit 1; }; }
2837
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
2838
+alias in your environment" "$LINENO" 5
2841
test "$2" = conftest.file
2842
@@ -2604,13 +2920,10 @@ then
2846
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
2847
-Check your system clock" >&5
2848
-$as_echo "$as_me: error: newly created file is older than distributed files!
2849
-Check your system clock" >&2;}
2850
- { (exit 1); exit 1; }; }
2851
+ as_fn_error "newly created file is older than distributed files!
2852
+Check your system clock" "$LINENO" 5
2854
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
2855
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2856
$as_echo "yes" >&6; }
2857
test "$program_prefix" != NONE &&
2858
program_transform_name="s&^&$program_prefix&;$program_transform_name"
2859
@@ -2638,7 +2951,7 @@ if eval "$MISSING --run true"; then
2860
am_missing_run="$MISSING --run "
2863
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
2864
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2865
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2868
@@ -2659,9 +2972,9 @@ if test "$cross_compiling" != no; then
2869
if test -n "$ac_tool_prefix"; then
2870
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2871
set dummy ${ac_tool_prefix}strip; ac_word=$2
2872
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2873
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2874
$as_echo_n "checking for $ac_word... " >&6; }
2875
-if test "${ac_cv_prog_STRIP+set}" = set; then
2876
+if test "${ac_cv_prog_STRIP+set}" = set; then :
2877
$as_echo_n "(cached) " >&6
2879
if test -n "$STRIP"; then
2880
@@ -2672,24 +2985,24 @@ for as_dir in $PATH
2883
test -z "$as_dir" && as_dir=.
2884
- for ac_exec_ext in '' $ac_executable_extensions; do
2885
+ for ac_exec_ext in '' $ac_executable_extensions; do
2886
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2887
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2888
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2889
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2899
STRIP=$ac_cv_prog_STRIP
2900
if test -n "$STRIP"; then
2901
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
2902
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
2903
$as_echo "$STRIP" >&6; }
2905
- { $as_echo "$as_me:$LINENO: result: no" >&5
2906
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2907
$as_echo "no" >&6; }
2910
@@ -2699,9 +3012,9 @@ if test -z "$ac_cv_prog_STRIP"; then
2912
# Extract the first word of "strip", so it can be a program name with args.
2913
set dummy strip; ac_word=$2
2914
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2915
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2916
$as_echo_n "checking for $ac_word... " >&6; }
2917
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
2918
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
2919
$as_echo_n "(cached) " >&6
2921
if test -n "$ac_ct_STRIP"; then
2922
@@ -2712,24 +3025,24 @@ for as_dir in $PATH
2925
test -z "$as_dir" && as_dir=.
2926
- for ac_exec_ext in '' $ac_executable_extensions; do
2927
+ for ac_exec_ext in '' $ac_executable_extensions; do
2928
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2929
ac_cv_prog_ac_ct_STRIP="strip"
2930
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2931
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2941
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2942
if test -n "$ac_ct_STRIP"; then
2943
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2944
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
2945
$as_echo "$ac_ct_STRIP" >&6; }
2947
- { $as_echo "$as_me:$LINENO: result: no" >&5
2948
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2949
$as_echo "no" >&6; }
2952
@@ -2738,7 +3051,7 @@ fi
2954
case $cross_compiling:$ac_tool_warned in
2956
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2957
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2958
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2959
ac_tool_warned=yes ;;
2961
@@ -2751,10 +3064,10 @@ fi
2963
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2965
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
2966
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
2967
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
2968
if test -z "$MKDIR_P"; then
2969
- if test "${ac_cv_path_mkdir+set}" = set; then
2970
+ if test "${ac_cv_path_mkdir+set}" = set; then :
2971
$as_echo_n "(cached) " >&6
2973
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2974
@@ -2762,7 +3075,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
2977
test -z "$as_dir" && as_dir=.
2978
- for ac_prog in mkdir gmkdir; do
2979
+ for ac_prog in mkdir gmkdir; do
2980
for ac_exec_ext in '' $ac_executable_extensions; do
2981
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2982
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2983
@@ -2774,11 +3087,12 @@ do
2993
+ test -d ./--version && rmdir ./--version
2994
if test "${ac_cv_path_mkdir+set}" = set; then
2995
MKDIR_P="$ac_cv_path_mkdir -p"
2997
@@ -2786,11 +3100,10 @@ fi
2998
# value for MKDIR_P within a source directory, because that will
2999
# break other packages using the cache if that directory is
3000
# removed, or if the value is a relative name.
3001
- test -d ./--version && rmdir ./--version
3002
MKDIR_P="$ac_install_sh -d"
3005
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
3006
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3007
$as_echo "$MKDIR_P" >&6; }
3010
@@ -2803,9 +3116,9 @@ for ac_prog in gawk mawk nawk awk
3012
# Extract the first word of "$ac_prog", so it can be a program name with args.
3013
set dummy $ac_prog; ac_word=$2
3014
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3015
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3016
$as_echo_n "checking for $ac_word... " >&6; }
3017
-if test "${ac_cv_prog_AWK+set}" = set; then
3018
+if test "${ac_cv_prog_AWK+set}" = set; then :
3019
$as_echo_n "(cached) " >&6
3021
if test -n "$AWK"; then
3022
@@ -2816,24 +3129,24 @@ for as_dir in $PATH
3025
test -z "$as_dir" && as_dir=.
3026
- for ac_exec_ext in '' $ac_executable_extensions; do
3027
+ for ac_exec_ext in '' $ac_executable_extensions; do
3028
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3029
ac_cv_prog_AWK="$ac_prog"
3030
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3031
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3042
if test -n "$AWK"; then
3043
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
3044
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
3045
$as_echo "$AWK" >&6; }
3047
- { $as_echo "$as_me:$LINENO: result: no" >&5
3048
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3049
$as_echo "no" >&6; }
3052
@@ -2841,11 +3154,11 @@ fi
3053
test -n "$AWK" && break
3056
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3057
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3058
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
3060
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3061
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
3062
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
3063
$as_echo_n "(cached) " >&6
3065
cat >conftest.make <<\_ACEOF
3066
@@ -2863,11 +3176,11 @@ esac
3069
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
3070
- { $as_echo "$as_me:$LINENO: result: yes" >&5
3071
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3072
$as_echo "yes" >&6; }
3075
- { $as_echo "$as_me:$LINENO: result: no" >&5
3076
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3077
$as_echo "no" >&6; }
3078
SET_MAKE="MAKE=${MAKE-make}"
3080
@@ -2887,9 +3200,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
3081
am__isrc=' -I$(srcdir)'
3082
# test to see if srcdir already configured
3083
if test -f $srcdir/config.status; then
3084
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
3085
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
3086
- { (exit 1); exit 1; }; }
3087
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
3091
@@ -2947,7 +3258,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
3094
# Check whether --enable-silent-rules was given.
3095
-if test "${enable_silent_rules+set}" = set; then
3096
+if test "${enable_silent_rules+set}" = set; then :
3097
enableval=$enable_silent_rules;
3100
@@ -2963,7 +3274,7 @@ ac_config_headers="$ac_config_headers co
3103
# Check whether --enable-static was given.
3104
-if test "${enable_static+set}" = set; then
3105
+if test "${enable_static+set}" = set; then :
3106
enableval=$enable_static; p=${PACKAGE-default}
3108
yes) enable_static=yes ;;
3109
@@ -2995,14 +3306,14 @@ fi
3113
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3114
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3115
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
3120
-macro_version='2.2.6'
3121
-macro_revision='1.3012'
2752
+# Copy echo and quote the copy suitably for passing to libtool from
2753
+# the Makefile, instead of quoting the original, which is used later.
2755
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
2756
+ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
2762
test -n "$DJDIR" || exec 7<&0 </dev/null
2772
@@ -3180,8 +3320,8 @@
2776
-macro_version='2.2.10'
2777
-macro_revision='1.3175'
3122
2778
+macro_version='2.2.6b'
3123
2779
+macro_revision='1.3017'
3127
@@ -3020,35 +3331,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
3129
# Make sure we can run config.sub.
3130
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3131
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
3132
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
3133
- { (exit 1); exit 1; }; }
3134
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3136
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
3137
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3138
$as_echo_n "checking build system type... " >&6; }
3139
-if test "${ac_cv_build+set}" = set; then
3140
+if test "${ac_cv_build+set}" = set; then :
3141
$as_echo_n "(cached) " >&6
3143
ac_build_alias=$build_alias
3144
test "x$ac_build_alias" = x &&
3145
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3146
test "x$ac_build_alias" = x &&
3147
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
3148
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
3149
- { (exit 1); exit 1; }; }
3150
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
3151
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3152
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
3153
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
3154
- { (exit 1); exit 1; }; }
3155
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3158
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
3159
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3160
$as_echo "$ac_cv_build" >&6; }
3161
case $ac_cv_build in
3163
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
3164
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
3165
- { (exit 1); exit 1; }; };;
3166
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
3169
ac_save_IFS=$IFS; IFS='-'
3170
@@ -3064,28 +3367,24 @@ IFS=$ac_save_IFS
3171
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
3174
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
3175
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
3176
$as_echo_n "checking host system type... " >&6; }
3177
-if test "${ac_cv_host+set}" = set; then
3178
+if test "${ac_cv_host+set}" = set; then :
3179
$as_echo_n "(cached) " >&6
3181
if test "x$host_alias" = x; then
3182
ac_cv_host=$ac_cv_build
3184
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3185
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
3186
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
3187
- { (exit 1); exit 1; }; }
3188
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3192
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
3193
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
3194
$as_echo "$ac_cv_host" >&6; }
3197
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
3198
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
3199
- { (exit 1); exit 1; }; };;
3200
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
3203
ac_save_IFS=$IFS; IFS='-'
3204
@@ -3113,7 +3412,7 @@ am__doit:
3207
# If we don't find an include directive, just comment out the code.
3208
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
3209
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3210
$as_echo_n "checking for style of include used by $am_make... " >&6; }
3213
@@ -3141,12 +3440,12 @@ if test "$am__include" = "#"; then
3217
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
3218
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
3219
$as_echo "$_am_result" >&6; }
3220
rm -f confinc confmf
3222
# Check whether --enable-dependency-tracking was given.
3223
-if test "${enable_dependency_tracking+set}" = set; then
3224
+if test "${enable_dependency_tracking+set}" = set; then :
3225
enableval=$enable_dependency_tracking;
3228
@@ -3171,9 +3470,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
3229
if test -n "$ac_tool_prefix"; then
3230
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
3231
set dummy ${ac_tool_prefix}gcc; ac_word=$2
3232
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3233
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3234
$as_echo_n "checking for $ac_word... " >&6; }
3235
-if test "${ac_cv_prog_CC+set}" = set; then
3236
+if test "${ac_cv_prog_CC+set}" = set; then :
3237
$as_echo_n "(cached) " >&6
3239
if test -n "$CC"; then
3240
@@ -3184,24 +3483,24 @@ for as_dir in $PATH
3243
test -z "$as_dir" && as_dir=.
3244
- for ac_exec_ext in '' $ac_executable_extensions; do
3245
+ for ac_exec_ext in '' $ac_executable_extensions; do
3246
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3247
ac_cv_prog_CC="${ac_tool_prefix}gcc"
3248
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3249
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3260
if test -n "$CC"; then
3261
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3262
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3263
$as_echo "$CC" >&6; }
3265
- { $as_echo "$as_me:$LINENO: result: no" >&5
3266
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3267
$as_echo "no" >&6; }
3270
@@ -3211,9 +3510,9 @@ if test -z "$ac_cv_prog_CC"; then
3272
# Extract the first word of "gcc", so it can be a program name with args.
3273
set dummy gcc; ac_word=$2
3274
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3275
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3276
$as_echo_n "checking for $ac_word... " >&6; }
3277
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3278
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
3279
$as_echo_n "(cached) " >&6
3281
if test -n "$ac_ct_CC"; then
3282
@@ -3224,24 +3523,24 @@ for as_dir in $PATH
3285
test -z "$as_dir" && as_dir=.
3286
- for ac_exec_ext in '' $ac_executable_extensions; do
3287
+ for ac_exec_ext in '' $ac_executable_extensions; do
3288
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3289
ac_cv_prog_ac_ct_CC="gcc"
3290
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3291
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3301
ac_ct_CC=$ac_cv_prog_ac_ct_CC
3302
if test -n "$ac_ct_CC"; then
3303
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3304
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
3305
$as_echo "$ac_ct_CC" >&6; }
3307
- { $as_echo "$as_me:$LINENO: result: no" >&5
3308
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3309
$as_echo "no" >&6; }
3312
@@ -3250,7 +3549,7 @@ fi
3314
case $cross_compiling:$ac_tool_warned in
3316
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3317
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3318
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3319
ac_tool_warned=yes ;;
3321
@@ -3264,9 +3563,9 @@ if test -z "$CC"; then
3322
if test -n "$ac_tool_prefix"; then
3323
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
3324
set dummy ${ac_tool_prefix}cc; ac_word=$2
3325
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3326
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3327
$as_echo_n "checking for $ac_word... " >&6; }
3328
-if test "${ac_cv_prog_CC+set}" = set; then
3329
+if test "${ac_cv_prog_CC+set}" = set; then :
3330
$as_echo_n "(cached) " >&6
3332
if test -n "$CC"; then
3333
@@ -3277,24 +3576,24 @@ for as_dir in $PATH
3336
test -z "$as_dir" && as_dir=.
3337
- for ac_exec_ext in '' $ac_executable_extensions; do
3338
+ for ac_exec_ext in '' $ac_executable_extensions; do
3339
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3340
ac_cv_prog_CC="${ac_tool_prefix}cc"
3341
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3342
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3353
if test -n "$CC"; then
3354
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3355
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3356
$as_echo "$CC" >&6; }
3358
- { $as_echo "$as_me:$LINENO: result: no" >&5
3359
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3360
$as_echo "no" >&6; }
3363
@@ -3304,9 +3603,9 @@ fi
3364
if test -z "$CC"; then
3365
# Extract the first word of "cc", so it can be a program name with args.
3366
set dummy cc; ac_word=$2
3367
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3368
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3369
$as_echo_n "checking for $ac_word... " >&6; }
3370
-if test "${ac_cv_prog_CC+set}" = set; then
3371
+if test "${ac_cv_prog_CC+set}" = set; then :
3372
$as_echo_n "(cached) " >&6
3374
if test -n "$CC"; then
3375
@@ -3318,18 +3617,18 @@ for as_dir in $PATH
3378
test -z "$as_dir" && as_dir=.
3379
- for ac_exec_ext in '' $ac_executable_extensions; do
3380
+ for ac_exec_ext in '' $ac_executable_extensions; do
3381
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3382
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3383
ac_prog_rejected=yes
3387
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3388
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3396
if test $ac_prog_rejected = yes; then
3397
@@ -3348,10 +3647,10 @@ fi
3400
if test -n "$CC"; then
3401
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3402
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3403
$as_echo "$CC" >&6; }
3405
- { $as_echo "$as_me:$LINENO: result: no" >&5
3406
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3407
$as_echo "no" >&6; }
3410
@@ -3363,9 +3662,9 @@ if test -z "$CC"; then
3412
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3413
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3414
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3415
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3416
$as_echo_n "checking for $ac_word... " >&6; }
3417
-if test "${ac_cv_prog_CC+set}" = set; then
3418
+if test "${ac_cv_prog_CC+set}" = set; then :
3419
$as_echo_n "(cached) " >&6
3421
if test -n "$CC"; then
3422
@@ -3376,24 +3675,24 @@ for as_dir in $PATH
3425
test -z "$as_dir" && as_dir=.
3426
- for ac_exec_ext in '' $ac_executable_extensions; do
3427
+ for ac_exec_ext in '' $ac_executable_extensions; do
3428
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3429
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3430
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3431
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3442
if test -n "$CC"; then
3443
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
3444
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3445
$as_echo "$CC" >&6; }
3447
- { $as_echo "$as_me:$LINENO: result: no" >&5
3448
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3449
$as_echo "no" >&6; }
3452
@@ -3407,9 +3706,9 @@ if test -z "$CC"; then
3454
# Extract the first word of "$ac_prog", so it can be a program name with args.
3455
set dummy $ac_prog; ac_word=$2
3456
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3457
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3458
$as_echo_n "checking for $ac_word... " >&6; }
3459
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3460
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
3461
$as_echo_n "(cached) " >&6
3463
if test -n "$ac_ct_CC"; then
3464
@@ -3420,24 +3719,24 @@ for as_dir in $PATH
3467
test -z "$as_dir" && as_dir=.
3468
- for ac_exec_ext in '' $ac_executable_extensions; do
3469
+ for ac_exec_ext in '' $ac_executable_extensions; do
3470
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3471
ac_cv_prog_ac_ct_CC="$ac_prog"
3472
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3473
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3483
ac_ct_CC=$ac_cv_prog_ac_ct_CC
3484
if test -n "$ac_ct_CC"; then
3485
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3486
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
3487
$as_echo "$ac_ct_CC" >&6; }
3489
- { $as_echo "$as_me:$LINENO: result: no" >&5
3490
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3491
$as_echo "no" >&6; }
3494
@@ -3450,7 +3749,7 @@ done
3496
case $cross_compiling:$ac_tool_warned in
3498
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3499
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3500
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3501
ac_tool_warned=yes ;;
3503
@@ -3461,57 +3760,37 @@ fi
3507
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3508
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3509
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3510
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
3511
-See \`config.log' for more details." >&5
3512
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
3513
-See \`config.log' for more details." >&2;}
3514
- { (exit 1); exit 1; }; }; }
3515
+as_fn_error "no acceptable C compiler found in \$PATH
3516
+See \`config.log' for more details." "$LINENO" 5; }
3518
# Provide some information about the compiler.
3519
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
3520
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
3523
-{ (ac_try="$ac_compiler --version >&5"
3524
-case "(($ac_try" in
3525
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3526
- *) ac_try_echo=$ac_try;;
3528
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3529
-$as_echo "$ac_try_echo") >&5
3530
- (eval "$ac_compiler --version >&5") 2>&5
3532
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3533
- (exit $ac_status); }
3534
-{ (ac_try="$ac_compiler -v >&5"
3535
-case "(($ac_try" in
3536
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3537
- *) ac_try_echo=$ac_try;;
3539
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3540
-$as_echo "$ac_try_echo") >&5
3541
- (eval "$ac_compiler -v >&5") 2>&5
3543
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3544
- (exit $ac_status); }
3545
-{ (ac_try="$ac_compiler -V >&5"
3546
+for ac_option in --version -v -V -qversion; do
3547
+ { { ac_try="$ac_compiler $ac_option >&5"
3549
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3550
*) ac_try_echo=$ac_try;;
3552
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3553
-$as_echo "$ac_try_echo") >&5
3554
- (eval "$ac_compiler -V >&5") 2>&5
3555
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3556
+$as_echo "$ac_try_echo"; } >&5
3557
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
3559
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3560
- (exit $ac_status); }
3561
+ if test -s conftest.err; then
3563
+... rest of stderr output deleted ...
3564
+ 10q' conftest.err >conftest.er1
3565
+ cat conftest.er1 >&5
3567
+ rm -f conftest.er1 conftest.err
3568
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3569
+ test $ac_status = 0; }
3572
-cat >conftest.$ac_ext <<_ACEOF
3575
-cat confdefs.h >>conftest.$ac_ext
3576
-cat >>conftest.$ac_ext <<_ACEOF
3577
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3578
/* end confdefs.h. */
3581
@@ -3527,8 +3806,8 @@ ac_clean_files="$ac_clean_files a.out a.
3582
# Try to create an executable without -o first, disregard a.out.
3583
# It will help us diagnose broken compilers, and finding out an intuition
3585
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3586
-$as_echo_n "checking for C compiler default output file name... " >&6; }
3587
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
3588
+$as_echo_n "checking whether the C compiler works... " >&6; }
3589
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3591
# The possible output files:
3592
@@ -3544,17 +3823,17 @@ do
3596
-if { (ac_try="$ac_link_default"
3597
+if { { ac_try="$ac_link_default"
3599
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3600
*) ac_try_echo=$ac_try;;
3602
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3603
-$as_echo "$ac_try_echo") >&5
3604
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3605
+$as_echo "$ac_try_echo"; } >&5
3606
(eval "$ac_link_default") 2>&5
3608
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3609
- (exit $ac_status); }; then
3610
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3611
+ test $ac_status = 0; }; then :
3612
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
3613
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
3614
# in a Makefile. We should not override ac_cv_exeext if it was cached,
3615
@@ -3571,7 +3850,7 @@ do
3619
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3620
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3622
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3624
@@ -3590,84 +3869,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
3629
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
3630
-$as_echo "$ac_file" >&6; }
3631
-if test -z "$ac_file"; then
3632
- $as_echo "$as_me: failed program was:" >&5
3633
+if test -z "$ac_file"; then :
3634
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3635
+$as_echo "no" >&6; }
3636
+$as_echo "$as_me: failed program was:" >&5
3637
sed 's/^/| /' conftest.$ac_ext >&5
3639
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3640
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3641
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3642
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
3643
-See \`config.log' for more details." >&5
3644
-$as_echo "$as_me: error: C compiler cannot create executables
3645
-See \`config.log' for more details." >&2;}
3646
- { (exit 77); exit 77; }; }; }
3647
+{ as_fn_set_status 77
3648
+as_fn_error "C compiler cannot create executables
3649
+See \`config.log' for more details." "$LINENO" 5; }; }
3651
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3652
+$as_echo "yes" >&6; }
3655
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
3656
+$as_echo_n "checking for C compiler default output file name... " >&6; }
3657
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
3658
+$as_echo "$ac_file" >&6; }
3659
ac_exeext=$ac_cv_exeext
3661
-# Check that the compiler produces executables we can run. If not, either
3662
-# the compiler is broken, or we cross compile.
3663
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3664
-$as_echo_n "checking whether the C compiler works... " >&6; }
3665
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
3666
-# If not cross compiling, check that we can run a simple program.
3667
-if test "$cross_compiling" != yes; then
3668
- if { ac_try='./$ac_file'
3669
- { (case "(($ac_try" in
3670
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3671
- *) ac_try_echo=$ac_try;;
3673
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3674
-$as_echo "$ac_try_echo") >&5
3675
- (eval "$ac_try") 2>&5
3677
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3678
- (exit $ac_status); }; }; then
3679
- cross_compiling=no
3681
- if test "$cross_compiling" = maybe; then
3682
- cross_compiling=yes
3684
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3685
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3686
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
3687
-If you meant to cross compile, use \`--host'.
3688
-See \`config.log' for more details." >&5
3689
-$as_echo "$as_me: error: cannot run C compiled programs.
3690
-If you meant to cross compile, use \`--host'.
3691
-See \`config.log' for more details." >&2;}
3692
- { (exit 1); exit 1; }; }; }
2783
@@ -3268,75 +3408,6 @@
2784
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
2787
-# Backslashify metacharacters that are still active within
2788
-# double-quoted strings.
2789
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
2791
-# Same as above, but do not quote variable references.
2792
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
2794
-# Sed substitution to delay expansion of an escaped shell variable in a
2795
-# double_quote_subst'ed string.
2796
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
2798
-# Sed substitution to delay expansion of an escaped single quote.
2799
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
2801
-# Sed substitution to avoid accidental globbing in evaled expressions
2802
-no_glob_subst='s/\*/\\\*/g'
2804
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
2805
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
2806
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2808
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2809
-$as_echo_n "checking how to print strings... " >&6; }
2810
-# Test print first, because it will be a builtin if present.
2811
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
2812
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2813
- ECHO='print -r --'
2814
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2815
- ECHO='printf %s\n'
2817
- # Use this function as a fallback that always works.
2818
- func_fallback_echo ()
2820
- eval 'cat <<_LTECHO_EOF
2824
- ECHO='func_fallback_echo'
3696
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
3697
-$as_echo "yes" >&6; }
3699
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
3700
ac_clean_files=$ac_clean_files_save
3701
-# Check that the compiler produces executables we can run. If not, either
3702
-# the compiler is broken, or we cross compile.
3703
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3704
-$as_echo_n "checking whether we are cross compiling... " >&6; }
3705
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
3706
-$as_echo "$cross_compiling" >&6; }
3708
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
3709
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
3710
$as_echo_n "checking for suffix of executables... " >&6; }
3711
-if { (ac_try="$ac_link"
3712
+if { { ac_try="$ac_link"
3714
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3715
*) ac_try_echo=$ac_try;;
3717
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3718
-$as_echo "$ac_try_echo") >&5
3719
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3720
+$as_echo "$ac_try_echo"; } >&5
3721
(eval "$ac_link") 2>&5
3723
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3724
- (exit $ac_status); }; then
3725
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3726
+ test $ac_status = 0; }; then :
3727
# If both `conftest.exe' and `conftest' are `present' (well, observable)
3728
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
3729
# work properly (i.e., refer to `conftest.exe'), while it won't with
3730
@@ -3682,32 +3919,83 @@ for ac_file in conftest.exe conftest con
3734
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3735
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3736
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3737
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
3738
-See \`config.log' for more details." >&5
3739
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
3740
-See \`config.log' for more details." >&2;}
3741
- { (exit 1); exit 1; }; }; }
3742
+as_fn_error "cannot compute suffix of executables: cannot compile and link
3743
+See \`config.log' for more details." "$LINENO" 5; }
3746
-rm -f conftest$ac_cv_exeext
3747
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3748
+rm -f conftest conftest$ac_cv_exeext
3749
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
3750
$as_echo "$ac_cv_exeext" >&6; }
3752
rm -f conftest.$ac_ext
3753
EXEEXT=$ac_cv_exeext
3755
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
3756
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3757
+/* end confdefs.h. */
3762
+FILE *f = fopen ("conftest.out", "w");
3763
+ return ferror (f) || fclose (f) != 0;
3769
+ac_clean_files="$ac_clean_files conftest.out"
3770
+# Check that the compiler produces executables we can run. If not, either
3771
+# the compiler is broken, or we cross compile.
3772
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
3773
+$as_echo_n "checking whether we are cross compiling... " >&6; }
3774
+if test "$cross_compiling" != yes; then
3775
+ { { ac_try="$ac_link"
3776
+case "(($ac_try" in
3777
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3778
+ *) ac_try_echo=$ac_try;;
3780
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3781
+$as_echo "$ac_try_echo"; } >&5
3782
+ (eval "$ac_link") 2>&5
3784
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3785
+ test $ac_status = 0; }
3786
+ if { ac_try='./conftest$ac_cv_exeext'
3787
+ { { case "(($ac_try" in
3788
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3789
+ *) ac_try_echo=$ac_try;;
3791
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3792
+$as_echo "$ac_try_echo"; } >&5
3793
+ (eval "$ac_try") 2>&5
3795
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3796
+ test $ac_status = 0; }; }; then
3797
+ cross_compiling=no
3799
+ if test "$cross_compiling" = maybe; then
3800
+ cross_compiling=yes
3802
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3803
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3804
+as_fn_error "cannot run C compiled programs.
3805
+If you meant to cross compile, use \`--host'.
3806
+See \`config.log' for more details." "$LINENO" 5; }
3810
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
3811
+$as_echo "$cross_compiling" >&6; }
3813
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
3814
+ac_clean_files=$ac_clean_files_save
3815
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
3816
$as_echo_n "checking for suffix of object files... " >&6; }
3817
-if test "${ac_cv_objext+set}" = set; then
3818
+if test "${ac_cv_objext+set}" = set; then :
3819
$as_echo_n "(cached) " >&6
3821
- cat >conftest.$ac_ext <<_ACEOF
3824
-cat confdefs.h >>conftest.$ac_ext
3825
-cat >>conftest.$ac_ext <<_ACEOF
3826
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3827
/* end confdefs.h. */
3830
@@ -3719,17 +4007,17 @@ main ()
3833
rm -f conftest.o conftest.obj
3834
-if { (ac_try="$ac_compile"
3835
+if { { ac_try="$ac_compile"
3837
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3838
*) ac_try_echo=$ac_try;;
3840
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3841
-$as_echo "$ac_try_echo") >&5
3842
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3843
+$as_echo "$ac_try_echo"; } >&5
3844
(eval "$ac_compile") 2>&5
3846
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3847
- (exit $ac_status); }; then
3848
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3849
+ test $ac_status = 0; }; then :
3850
for ac_file in conftest.o conftest.obj conftest.*; do
3851
test -f "$ac_file" || continue;
3853
@@ -3742,31 +4030,23 @@ else
3854
$as_echo "$as_me: failed program was:" >&5
3855
sed 's/^/| /' conftest.$ac_ext >&5
3857
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3858
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3859
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3860
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
3861
-See \`config.log' for more details." >&5
3862
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
3863
-See \`config.log' for more details." >&2;}
3864
- { (exit 1); exit 1; }; }; }
3865
+as_fn_error "cannot compute suffix of object files: cannot compile
3866
+See \`config.log' for more details." "$LINENO" 5; }
3869
rm -f conftest.$ac_cv_objext conftest.$ac_ext
3871
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3872
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
3873
$as_echo "$ac_cv_objext" >&6; }
3874
OBJEXT=$ac_cv_objext
3876
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3877
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
3878
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
3879
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
3880
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
3881
$as_echo_n "(cached) " >&6
3883
- cat >conftest.$ac_ext <<_ACEOF
3886
-cat confdefs.h >>conftest.$ac_ext
3887
-cat >>conftest.$ac_ext <<_ACEOF
3888
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3889
/* end confdefs.h. */
3892
@@ -3780,37 +4060,16 @@ main ()
3896
-rm -f conftest.$ac_objext
3897
-if { (ac_try="$ac_compile"
3898
-case "(($ac_try" in
3899
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3900
- *) ac_try_echo=$ac_try;;
3902
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3903
-$as_echo "$ac_try_echo") >&5
3904
- (eval "$ac_compile") 2>conftest.er1
3906
- grep -v '^ *+' conftest.er1 >conftest.err
3907
- rm -f conftest.er1
3908
- cat conftest.err >&5
3909
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3910
- (exit $ac_status); } && {
3911
- test -z "$ac_c_werror_flag" ||
3912
- test ! -s conftest.err
3913
- } && test -s conftest.$ac_objext; then
3914
+if ac_fn_c_try_compile "$LINENO"; then :
3917
- $as_echo "$as_me: failed program was:" >&5
3918
-sed 's/^/| /' conftest.$ac_ext >&5
3920
- ac_compiler_gnu=no
3921
+ ac_compiler_gnu=no
3924
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3925
ac_cv_c_compiler_gnu=$ac_compiler_gnu
3928
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3929
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
3930
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
3931
if test $ac_compiler_gnu = yes; then
3933
@@ -3819,20 +4078,16 @@ else
3935
ac_test_CFLAGS=${CFLAGS+set}
3936
ac_save_CFLAGS=$CFLAGS
3937
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3938
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
3939
$as_echo_n "checking whether $CC accepts -g... " >&6; }
3940
-if test "${ac_cv_prog_cc_g+set}" = set; then
3941
+if test "${ac_cv_prog_cc_g+set}" = set; then :
3942
$as_echo_n "(cached) " >&6
3944
ac_save_c_werror_flag=$ac_c_werror_flag
3945
ac_c_werror_flag=yes
3948
- cat >conftest.$ac_ext <<_ACEOF
3951
-cat confdefs.h >>conftest.$ac_ext
3952
-cat >>conftest.$ac_ext <<_ACEOF
3953
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3954
/* end confdefs.h. */
3957
@@ -3843,35 +4098,11 @@ main ()
3961
-rm -f conftest.$ac_objext
3962
-if { (ac_try="$ac_compile"
3963
-case "(($ac_try" in
3964
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3965
- *) ac_try_echo=$ac_try;;
3967
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3968
-$as_echo "$ac_try_echo") >&5
3969
- (eval "$ac_compile") 2>conftest.er1
3971
- grep -v '^ *+' conftest.er1 >conftest.err
3972
- rm -f conftest.er1
3973
- cat conftest.err >&5
3974
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3975
- (exit $ac_status); } && {
3976
- test -z "$ac_c_werror_flag" ||
3977
- test ! -s conftest.err
3978
- } && test -s conftest.$ac_objext; then
3979
+if ac_fn_c_try_compile "$LINENO"; then :
3982
- $as_echo "$as_me: failed program was:" >&5
3983
-sed 's/^/| /' conftest.$ac_ext >&5
3986
- cat >conftest.$ac_ext <<_ACEOF
3989
-cat confdefs.h >>conftest.$ac_ext
3990
-cat >>conftest.$ac_ext <<_ACEOF
3992
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3993
/* end confdefs.h. */
3996
@@ -3882,82 +4113,33 @@ main ()
4000
-rm -f conftest.$ac_objext
4001
-if { (ac_try="$ac_compile"
4002
-case "(($ac_try" in
4003
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4004
- *) ac_try_echo=$ac_try;;
4006
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4007
-$as_echo "$ac_try_echo") >&5
4008
- (eval "$ac_compile") 2>conftest.er1
4010
- grep -v '^ *+' conftest.er1 >conftest.err
4011
- rm -f conftest.er1
4012
- cat conftest.err >&5
4013
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4014
- (exit $ac_status); } && {
4015
- test -z "$ac_c_werror_flag" ||
4016
- test ! -s conftest.err
4017
- } && test -s conftest.$ac_objext; then
4020
- $as_echo "$as_me: failed program was:" >&5
4021
-sed 's/^/| /' conftest.$ac_ext >&5
4022
+if ac_fn_c_try_compile "$LINENO"; then :
4024
- ac_c_werror_flag=$ac_save_c_werror_flag
4026
+ ac_c_werror_flag=$ac_save_c_werror_flag
4028
- cat >conftest.$ac_ext <<_ACEOF
4031
-cat confdefs.h >>conftest.$ac_ext
4032
-cat >>conftest.$ac_ext <<_ACEOF
4033
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4034
/* end confdefs.h. */
2827
-# func_echo_all arg...
2828
-# Invoke $ECHO with all args, space-separated.
4044
-rm -f conftest.$ac_objext
4045
-if { (ac_try="$ac_compile"
4046
-case "(($ac_try" in
4047
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4048
- *) ac_try_echo=$ac_try;;
4050
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4051
-$as_echo "$ac_try_echo") >&5
4052
- (eval "$ac_compile") 2>conftest.er1
4054
- grep -v '^ *+' conftest.er1 >conftest.err
4055
- rm -f conftest.er1
4056
- cat conftest.err >&5
4057
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4058
- (exit $ac_status); } && {
4059
- test -z "$ac_c_werror_flag" ||
4060
- test ! -s conftest.err
4061
- } && test -s conftest.$ac_objext; then
4062
- ac_cv_prog_cc_g=yes
4064
- $as_echo "$as_me: failed program was:" >&5
4065
-sed 's/^/| /' conftest.$ac_ext >&5
4072
+if ac_fn_c_try_compile "$LINENO"; then :
4073
+ ac_cv_prog_cc_g=yes
4076
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4079
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4082
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4083
ac_c_werror_flag=$ac_save_c_werror_flag
4085
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
4086
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
4087
$as_echo "$ac_cv_prog_cc_g" >&6; }
4088
if test "$ac_test_CFLAGS" = set; then
4089
CFLAGS=$ac_save_CFLAGS
4090
@@ -3974,18 +4156,14 @@ else
4094
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
4095
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
4096
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
4097
-if test "${ac_cv_prog_cc_c89+set}" = set; then
4098
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
4099
$as_echo_n "(cached) " >&6
4101
ac_cv_prog_cc_c89=no
4103
-cat >conftest.$ac_ext <<_ACEOF
4106
-cat confdefs.h >>conftest.$ac_ext
4107
-cat >>conftest.$ac_ext <<_ACEOF
4108
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4109
/* end confdefs.h. */
4112
@@ -4042,32 +4220,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
4113
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
4115
CC="$ac_save_CC $ac_arg"
4116
- rm -f conftest.$ac_objext
4117
-if { (ac_try="$ac_compile"
4118
-case "(($ac_try" in
4119
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4120
- *) ac_try_echo=$ac_try;;
4122
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4123
-$as_echo "$ac_try_echo") >&5
4124
- (eval "$ac_compile") 2>conftest.er1
4126
- grep -v '^ *+' conftest.er1 >conftest.err
4127
- rm -f conftest.er1
4128
- cat conftest.err >&5
4129
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4130
- (exit $ac_status); } && {
4131
- test -z "$ac_c_werror_flag" ||
4132
- test ! -s conftest.err
4133
- } && test -s conftest.$ac_objext; then
4134
+ if ac_fn_c_try_compile "$LINENO"; then :
4135
ac_cv_prog_cc_c89=$ac_arg
4137
- $as_echo "$as_me: failed program was:" >&5
4138
-sed 's/^/| /' conftest.$ac_ext >&5
4143
rm -f core conftest.err conftest.$ac_objext
4144
test "x$ac_cv_prog_cc_c89" != "xno" && break
4146
@@ -4078,17 +4233,19 @@ fi
4148
case "x$ac_cv_prog_cc_c89" in
4150
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
4151
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
4152
$as_echo "none needed" >&6; } ;;
4154
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
4155
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
4156
$as_echo "unsupported" >&6; } ;;
4158
CC="$CC $ac_cv_prog_cc_c89"
4159
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
4160
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
4161
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
4163
+if test "x$ac_cv_prog_cc_c89" != xno; then :
4168
ac_cpp='$CPP $CPPFLAGS'
4169
@@ -4098,9 +4255,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4171
depcc="$CC" am_compiler_list=
4173
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
4174
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4175
$as_echo_n "checking dependency style of $depcc... " >&6; }
4176
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
4177
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
4178
$as_echo_n "(cached) " >&6
4180
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
4181
@@ -4208,7 +4365,7 @@ else
4185
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
4186
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
4187
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
4188
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
4190
@@ -4223,9 +4380,9 @@ else
4194
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
4195
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
4196
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
4197
-if test "${ac_cv_path_SED+set}" = set; then
4198
+if test "${ac_cv_path_SED+set}" = set; then :
4199
$as_echo_n "(cached) " >&6
4201
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
4202
@@ -4233,7 +4390,7 @@ else
4203
ac_script="$ac_script$as_nl$ac_script"
4205
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
4206
- $as_unset ac_script || ac_script=
4207
+ { ac_script=; unset ac_script;}
4208
if test -z "$SED"; then
4209
ac_path_SED_found=false
4210
# Loop through the user's path and test for each of PROGNAME-LIST
4211
@@ -4242,7 +4399,7 @@ for as_dir in $PATH
4214
test -z "$as_dir" && as_dir=.
4215
- for ac_prog in sed gsed; do
4216
+ for ac_prog in sed gsed; do
4217
for ac_exec_ext in '' $ac_executable_extensions; do
4218
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
4219
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
4220
@@ -4262,7 +4419,7 @@ case `"$ac_path_SED" --version 2>&1` in
4221
$as_echo '' >> "conftest.nl"
4222
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
4223
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4224
- ac_count=`expr $ac_count + 1`
4225
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4226
if test $ac_count -gt ${ac_path_SED_max-0}; then
4227
# Best one so far, save it but keep looking for a better one
4228
ac_cv_path_SED="$ac_path_SED"
4229
@@ -4277,19 +4434,17 @@ esac
4230
$ac_path_SED_found && break 3
4236
if test -z "$ac_cv_path_SED"; then
4237
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
4238
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
4239
- { (exit 1); exit 1; }; }
4240
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
4247
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
4248
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
4249
$as_echo "$ac_cv_path_SED" >&6; }
4250
SED="$ac_cv_path_SED"
4252
@@ -4307,9 +4462,9 @@ Xsed="$SED -e 1s/^X//"
4256
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
4257
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
4258
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
4259
-if test "${ac_cv_path_GREP+set}" = set; then
4260
+if test "${ac_cv_path_GREP+set}" = set; then :
4261
$as_echo_n "(cached) " >&6
4263
if test -z "$GREP"; then
4264
@@ -4320,7 +4475,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
4267
test -z "$as_dir" && as_dir=.
4268
- for ac_prog in grep ggrep; do
4269
+ for ac_prog in grep ggrep; do
4270
for ac_exec_ext in '' $ac_executable_extensions; do
4271
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4272
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4273
@@ -4340,7 +4495,7 @@ case `"$ac_path_GREP" --version 2>&1` in
4274
$as_echo 'GREP' >> "conftest.nl"
4275
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4276
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4277
- ac_count=`expr $ac_count + 1`
4278
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4279
if test $ac_count -gt ${ac_path_GREP_max-0}; then
4280
# Best one so far, save it but keep looking for a better one
4281
ac_cv_path_GREP="$ac_path_GREP"
4282
@@ -4355,26 +4510,24 @@ esac
4283
$ac_path_GREP_found && break 3
4289
if test -z "$ac_cv_path_GREP"; then
4290
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4291
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4292
- { (exit 1); exit 1; }; }
4293
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4296
ac_cv_path_GREP=$GREP
4300
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
4301
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
4302
$as_echo "$ac_cv_path_GREP" >&6; }
4303
GREP="$ac_cv_path_GREP"
4306
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
4307
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
4308
$as_echo_n "checking for egrep... " >&6; }
4309
-if test "${ac_cv_path_EGREP+set}" = set; then
4310
+if test "${ac_cv_path_EGREP+set}" = set; then :
4311
$as_echo_n "(cached) " >&6
4313
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
4314
@@ -4388,7 +4541,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
4317
test -z "$as_dir" && as_dir=.
4318
- for ac_prog in egrep; do
4319
+ for ac_prog in egrep; do
4320
for ac_exec_ext in '' $ac_executable_extensions; do
4321
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4322
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4323
@@ -4408,7 +4561,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
4324
$as_echo 'EGREP' >> "conftest.nl"
4325
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4326
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4327
- ac_count=`expr $ac_count + 1`
4328
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4329
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
4330
# Best one so far, save it but keep looking for a better one
4331
ac_cv_path_EGREP="$ac_path_EGREP"
4332
@@ -4423,12 +4576,10 @@ esac
4333
$ac_path_EGREP_found && break 3
4339
if test -z "$ac_cv_path_EGREP"; then
4340
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4341
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4342
- { (exit 1); exit 1; }; }
4343
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4346
ac_cv_path_EGREP=$EGREP
4347
@@ -4436,14 +4587,14 @@ fi
4351
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
4352
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
4353
$as_echo "$ac_cv_path_EGREP" >&6; }
4354
EGREP="$ac_cv_path_EGREP"
4357
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
4358
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
4359
$as_echo_n "checking for fgrep... " >&6; }
4360
-if test "${ac_cv_path_FGREP+set}" = set; then
4361
+if test "${ac_cv_path_FGREP+set}" = set; then :
4362
$as_echo_n "(cached) " >&6
4364
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
4365
@@ -4457,7 +4608,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
4368
test -z "$as_dir" && as_dir=.
4369
- for ac_prog in fgrep; do
4370
+ for ac_prog in fgrep; do
4371
for ac_exec_ext in '' $ac_executable_extensions; do
4372
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
4373
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
4374
@@ -4477,7 +4628,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
4375
$as_echo 'FGREP' >> "conftest.nl"
4376
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
4377
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4378
- ac_count=`expr $ac_count + 1`
4379
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
4380
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
4381
# Best one so far, save it but keep looking for a better one
4382
ac_cv_path_FGREP="$ac_path_FGREP"
4383
@@ -4492,12 +4643,10 @@ esac
4384
$ac_path_FGREP_found && break 3
4390
if test -z "$ac_cv_path_FGREP"; then
4391
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4392
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4393
- { (exit 1); exit 1; }; }
4394
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4397
ac_cv_path_FGREP=$FGREP
4398
@@ -4505,7 +4654,7 @@ fi
4402
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
4403
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
4404
$as_echo "$ac_cv_path_FGREP" >&6; }
4405
FGREP="$ac_cv_path_FGREP"
4407
@@ -4531,7 +4680,7 @@ test -z "$GREP" && GREP=grep
4410
# Check whether --with-gnu-ld was given.
4411
-if test "${with_gnu_ld+set}" = set; then
4412
+if test "${with_gnu_ld+set}" = set; then :
4413
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
4416
@@ -4540,7 +4689,7 @@ fi
4418
if test "$GCC" = yes; then
4419
# Check if gcc -print-prog-name=ld gives a path.
4420
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
4421
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
4422
$as_echo_n "checking for ld used by $CC... " >&6; }
4425
@@ -4570,13 +4719,13 @@ $as_echo_n "checking for ld used by $CC.
4428
elif test "$with_gnu_ld" = yes; then
4429
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
4430
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
4431
$as_echo_n "checking for GNU ld... " >&6; }
4433
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
4434
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
4435
$as_echo_n "checking for non-GNU ld... " >&6; }
4437
-if test "${lt_cv_path_LD+set}" = set; then
4438
+if test "${lt_cv_path_LD+set}" = set; then :
4439
$as_echo_n "(cached) " >&6
4441
if test -z "$LD"; then
4442
@@ -4607,18 +4756,16 @@ fi
4445
if test -n "$LD"; then
4446
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
4447
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
4448
$as_echo "$LD" >&6; }
4450
- { $as_echo "$as_me:$LINENO: result: no" >&5
4451
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4452
$as_echo "no" >&6; }
4454
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
4455
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
4456
- { (exit 1); exit 1; }; }
4457
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
4458
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
4459
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
4460
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
4461
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
4462
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
4463
$as_echo_n "(cached) " >&6
4465
# I'd rather use --version here, but apparently some GNU lds only accept -v.
4466
@@ -4631,7 +4778,7 @@ case `$LD -v 2>&1 </dev/null` in
4470
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
4471
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
4472
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
4473
with_gnu_ld=$lt_cv_prog_gnu_ld
4475
@@ -4643,9 +4790,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
4479
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
4480
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
4481
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
4482
-if test "${lt_cv_path_NM+set}" = set; then
4483
+if test "${lt_cv_path_NM+set}" = set; then :
4484
$as_echo_n "(cached) " >&6
4486
if test -n "$NM"; then
4487
@@ -4692,7 +4839,7 @@ else
4488
: ${lt_cv_path_NM=no}
4491
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
4492
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
4493
$as_echo "$lt_cv_path_NM" >&6; }
4494
if test "$lt_cv_path_NM" != "no"; then
2835
- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
2836
-$as_echo "printf" >&6; } ;;
2837
- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
2838
-$as_echo "print -r" >&6; } ;;
2839
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
2840
-$as_echo "cat" >&6; } ;;
2856
DEPDIR="${am__leading_dot}deps"
2858
ac_config_commands="$ac_config_commands depfiles"
2859
@@ -4782,11 +4853,8 @@
4495
2860
NM="$lt_cv_path_NM"
4496
@@ -4703,9 +4850,9 @@ else
2862
# Didn't find any BSD compatible name lister, look for dumpbin.
2863
- if test -n "$DUMPBIN"; then :
2864
- # Let the user override the test.
2866
- if test -n "$ac_tool_prefix"; then
2867
- for ac_prog in dumpbin "link -dump"
2868
+ if test -n "$ac_tool_prefix"; then
2869
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
4498
2871
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4499
2872
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4500
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4501
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4502
$as_echo_n "checking for $ac_word... " >&6; }
4503
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
4504
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
4505
$as_echo_n "(cached) " >&6
4507
if test -n "$DUMPBIN"; then
4508
@@ -4716,24 +4863,24 @@ for as_dir in $PATH
4511
test -z "$as_dir" && as_dir=.
4512
- for ac_exec_ext in '' $ac_executable_extensions; do
4513
+ for ac_exec_ext in '' $ac_executable_extensions; do
4514
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4515
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
4516
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4517
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4527
DUMPBIN=$ac_cv_prog_DUMPBIN
4528
if test -n "$DUMPBIN"; then
4529
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
4530
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
4531
$as_echo "$DUMPBIN" >&6; }
4533
- { $as_echo "$as_me:$LINENO: result: no" >&5
4534
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4535
$as_echo "no" >&6; }
4538
@@ -4747,9 +4894,9 @@ if test -z "$DUMPBIN"; then
2873
@@ -4830,7 +4898,7 @@
2875
if test -z "$DUMPBIN"; then
2876
ac_ct_DUMPBIN=$DUMPBIN
2877
- for ac_prog in dumpbin "link -dump"
2878
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
4540
2880
# Extract the first word of "$ac_prog", so it can be a program name with args.
4541
2881
set dummy $ac_prog; ac_word=$2
4542
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4543
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4544
$as_echo_n "checking for $ac_word... " >&6; }
4545
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
4546
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
4547
$as_echo_n "(cached) " >&6
4549
if test -n "$ac_ct_DUMPBIN"; then
4550
@@ -4760,24 +4907,24 @@ for as_dir in $PATH
4553
test -z "$as_dir" && as_dir=.
4554
- for ac_exec_ext in '' $ac_executable_extensions; do
4555
+ for ac_exec_ext in '' $ac_executable_extensions; do
4556
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4557
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
4558
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4559
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2882
@@ -4885,15 +4953,6 @@
4569
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
4570
if test -n "$ac_ct_DUMPBIN"; then
4571
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
4572
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
4573
$as_echo "$ac_ct_DUMPBIN" >&6; }
4575
- { $as_echo "$as_me:$LINENO: result: no" >&5
4576
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4577
$as_echo "no" >&6; }
4580
@@ -4790,7 +4937,7 @@ done
4582
case $cross_compiling:$ac_tool_warned in
4584
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4585
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4586
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4587
ac_tool_warned=yes ;;
4589
@@ -4810,44 +4957,44 @@ test -z "$NM" && NM=nm
4593
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
4594
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
4595
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
4596
-if test "${lt_cv_nm_interface+set}" = set; then
4597
+if test "${lt_cv_nm_interface+set}" = set; then :
4598
$as_echo_n "(cached) " >&6
2886
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
2888
- DUMPBIN="$DUMPBIN -symbols"
2896
if test "$DUMPBIN" != ":"; then
2898
@@ -4913,13 +4972,13 @@
4600
2900
lt_cv_nm_interface="BSD nm"
4601
2901
echo "int some_variable = 0;" > conftest.$ac_ext
4602
- (eval echo "\"\$as_me:4820: $ac_compile\"" >&5)
4603
+ (eval echo "\"\$as_me:4967: $ac_compile\"" >&5)
2902
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
2903
+ (eval echo "\"\$as_me:4975: $ac_compile\"" >&5)
4604
2904
(eval "$ac_compile" 2>conftest.err)
4605
2905
cat conftest.err >&5
4606
- (eval echo "\"\$as_me:4823: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
4607
+ (eval echo "\"\$as_me:4970: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
2906
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
2907
+ (eval echo "\"\$as_me:4978: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
4608
2908
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
4609
2909
cat conftest.err >&5
4610
- (eval echo "\"\$as_me:4826: output\"" >&5)
4611
+ (eval echo "\"\$as_me:4973: output\"" >&5)
2910
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
2911
+ (eval echo "\"\$as_me:4981: output\"" >&5)
4612
2912
cat conftest.out >&5
4613
2913
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
4614
2914
lt_cv_nm_interface="MS dumpbin"
4618
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
4619
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
4620
$as_echo "$lt_cv_nm_interface" >&6; }
4622
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
4623
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
4624
$as_echo_n "checking whether ln -s works... " >&6; }
4626
if test "$LN_S" = "ln -s"; then
4627
- { $as_echo "$as_me:$LINENO: result: yes" >&5
4628
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4629
$as_echo "yes" >&6; }
4631
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
4632
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
4633
$as_echo "no, using $LN_S" >&6; }
4636
# find the maximum length of command line arguments
4637
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
4638
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
4639
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
4640
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
4641
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
4642
$as_echo_n "(cached) " >&6
4645
@@ -4965,10 +5112,10 @@ else
4648
if test -n $lt_cv_sys_max_cmd_len ; then
4649
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
4650
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
4651
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
4653
- { $as_echo "$as_me:$LINENO: result: none" >&5
4654
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
4655
$as_echo "none" >&6; }
4657
max_cmd_len=$lt_cv_sys_max_cmd_len
4658
@@ -4982,7 +5129,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
4662
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
4663
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
4664
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
4665
# Try some XSI features
4667
@@ -4992,17 +5139,17 @@ xsi_shell=no
4668
&& eval 'test $(( 1 + 1 )) -eq 2 \
4669
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
4671
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
4672
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
4673
$as_echo "$xsi_shell" >&6; }
4676
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
4677
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
4678
$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
4680
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
4682
&& lt_shell_append=yes
4683
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
4684
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
4685
$as_echo "$lt_shell_append" >&6; }
4688
@@ -5037,14 +5184,14 @@ esac
4692
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
4693
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4694
$as_echo_n "checking for $LD option to reload object files... " >&6; }
4695
-if test "${lt_cv_ld_reload_flag+set}" = set; then
4696
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
4697
$as_echo_n "(cached) " >&6
4699
lt_cv_ld_reload_flag='-r'
4701
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
4702
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
4703
$as_echo "$lt_cv_ld_reload_flag" >&6; }
4704
reload_flag=$lt_cv_ld_reload_flag
4705
case $reload_flag in
4706
@@ -5073,9 +5220,9 @@ esac
4707
if test -n "$ac_tool_prefix"; then
4708
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
4709
set dummy ${ac_tool_prefix}objdump; ac_word=$2
4710
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4711
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4712
$as_echo_n "checking for $ac_word... " >&6; }
4713
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
4714
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
4715
$as_echo_n "(cached) " >&6
4717
if test -n "$OBJDUMP"; then
4718
@@ -5086,24 +5233,24 @@ for as_dir in $PATH
4721
test -z "$as_dir" && as_dir=.
4722
- for ac_exec_ext in '' $ac_executable_extensions; do
4723
+ for ac_exec_ext in '' $ac_executable_extensions; do
4724
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4725
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
4726
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4727
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4737
OBJDUMP=$ac_cv_prog_OBJDUMP
4738
if test -n "$OBJDUMP"; then
4739
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
4740
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
4741
$as_echo "$OBJDUMP" >&6; }
4743
- { $as_echo "$as_me:$LINENO: result: no" >&5
4744
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4745
$as_echo "no" >&6; }
4748
@@ -5113,9 +5260,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
4749
ac_ct_OBJDUMP=$OBJDUMP
4750
# Extract the first word of "objdump", so it can be a program name with args.
4751
set dummy objdump; ac_word=$2
4752
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4753
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4754
$as_echo_n "checking for $ac_word... " >&6; }
4755
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
4756
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
4757
$as_echo_n "(cached) " >&6
4759
if test -n "$ac_ct_OBJDUMP"; then
4760
@@ -5126,24 +5273,24 @@ for as_dir in $PATH
4763
test -z "$as_dir" && as_dir=.
4764
- for ac_exec_ext in '' $ac_executable_extensions; do
4765
+ for ac_exec_ext in '' $ac_executable_extensions; do
4766
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4767
ac_cv_prog_ac_ct_OBJDUMP="objdump"
4768
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4769
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4779
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
4780
if test -n "$ac_ct_OBJDUMP"; then
4781
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
4782
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
4783
$as_echo "$ac_ct_OBJDUMP" >&6; }
4785
- { $as_echo "$as_me:$LINENO: result: no" >&5
4786
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4787
$as_echo "no" >&6; }
4790
@@ -5152,7 +5299,7 @@ fi
2915
@@ -4976,11 +5035,6 @@
2916
lt_cv_sys_max_cmd_len=8192;
2920
- # On MiNT this can take a long time and run out of memory.
2921
- lt_cv_sys_max_cmd_len=8192;
2925
# On AmigaOS with pdksh, this test takes hours, literally.
2926
# So we just punt and use a minimum line length of 8192.
2927
@@ -5045,8 +5099,8 @@
2928
# If test is not a shell built-in, we'll probably end up computing a
2929
# maximum length that is only half of the actual maximum length, but
2931
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
2932
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
2933
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
2934
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
2935
test $i != 17 # 1/2 MB should be enough
2938
@@ -5317,18 +5371,16 @@
2939
# Base MSYS/MinGW do not provide the 'file' command needed by
2940
# func_win32_libid shell function, so use a weaker test based on 'objdump',
2941
# unless we find 'file', for example because we are cross-compiling.
2942
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
2943
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
2944
+ if ( file / ) >/dev/null 2>&1; then
2945
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2946
lt_cv_file_magic_cmd='func_win32_libid'
4792
case $cross_compiling:$ac_tool_warned in
4794
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4795
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4796
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4797
ac_tool_warned=yes ;;
4799
@@ -5172,9 +5319,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
4803
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
4804
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
4805
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
4806
-if test "${lt_cv_deplibs_check_method+set}" = set; then
4807
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
4808
$as_echo_n "(cached) " >&6
4810
lt_cv_file_magic_cmd='$MAGIC_CMD'
4811
@@ -5289,11 +5436,11 @@ irix5* | irix6* | nonstopux*)
4814
# This must be Linux ELF.
4815
-linux* | k*bsd*-gnu)
4816
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
2948
- # Keep this pattern in sync with the one in func_win32_libid.
2949
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2950
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2951
lt_cv_file_magic_cmd='$OBJDUMP -f'
2957
# use the weaker test based on 'objdump'. See mingw*.
2958
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
2959
lt_cv_file_magic_cmd='$OBJDUMP -f'
2960
@@ -5358,10 +5410,6 @@
2961
lt_cv_deplibs_check_method=pass_all
2965
- lt_cv_deplibs_check_method=pass_all
2968
hpux10.20* | hpux11*)
2969
lt_cv_file_magic_cmd=/usr/bin/file
2971
@@ -5370,11 +5418,11 @@
2972
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
2975
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
2976
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
2977
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
2980
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
2981
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
2982
lt_cv_file_magic_test_file=/usr/lib/libc.sl
2985
@@ -5400,7 +5448,7 @@
4817
2986
lt_cv_deplibs_check_method=pass_all
7130
3991
version_type=sunos
7131
3992
need_lib_prefix=no
7132
@@ -10406,7 +10123,7 @@ uts4*)
7136
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
7137
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
7138
$as_echo "$dynamic_linker" >&6; }
7139
test "$dynamic_linker" = no && can_build_shared=no
7141
@@ -10508,7 +10225,7 @@ fi
7145
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
7146
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
3993
@@ -10337,11 +10233,6 @@
4002
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
7147
4003
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
7148
4004
hardcode_action=
7149
if test -n "$hardcode_libdir_flag_spec" ||
7150
@@ -10533,7 +10250,7 @@ else
7152
hardcode_action=unsupported
7154
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
7155
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
7156
$as_echo "$hardcode_action" >&6; }
7158
if test "$hardcode_action" = relink ||
7159
@@ -10573,189 +10290,19 @@ else
7162
lt_cv_dlopen="dlopen"
7163
- lt_cv_dlopen_libs=
7167
- # if libdl is installed we need to link against it
7168
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
7169
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
7170
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
7171
- $as_echo_n "(cached) " >&6
7173
- ac_check_lib_save_LIBS=$LIBS
7175
-cat >conftest.$ac_ext <<_ACEOF
7178
-cat confdefs.h >>conftest.$ac_ext
7179
-cat >>conftest.$ac_ext <<_ACEOF
7180
-/* end confdefs.h. */
7182
-/* Override any GCC internal prototype to avoid an error.
7183
- Use char because int might match the return type of a GCC
7184
- builtin and then its argument prototype would still apply. */
7197
-rm -f conftest.$ac_objext conftest$ac_exeext
7198
-if { (ac_try="$ac_link"
7199
-case "(($ac_try" in
7200
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7201
- *) ac_try_echo=$ac_try;;
7203
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7204
-$as_echo "$ac_try_echo") >&5
7205
- (eval "$ac_link") 2>conftest.er1
7207
- grep -v '^ *+' conftest.er1 >conftest.err
7208
- rm -f conftest.er1
7209
- cat conftest.err >&5
7210
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7211
- (exit $ac_status); } && {
7212
- test -z "$ac_c_werror_flag" ||
7213
- test ! -s conftest.err
7214
- } && test -s conftest$ac_exeext && {
7215
- test "$cross_compiling" = yes ||
7216
- $as_test_x conftest$ac_exeext
7218
- ac_cv_lib_dl_dlopen=yes
7220
- $as_echo "$as_me: failed program was:" >&5
7221
-sed 's/^/| /' conftest.$ac_ext >&5
7223
- ac_cv_lib_dl_dlopen=no
7226
-rm -rf conftest.dSYM
7227
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7228
- conftest$ac_exeext conftest.$ac_ext
7229
-LIBS=$ac_check_lib_save_LIBS
7231
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
7232
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
7233
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
7234
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
7237
- lt_cv_dlopen="dyld"
7238
- lt_cv_dlopen_libs=
7239
- lt_cv_dlopen_self=yes
7246
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
7247
-$as_echo_n "checking for shl_load... " >&6; }
7248
-if test "${ac_cv_func_shl_load+set}" = set; then
7249
- $as_echo_n "(cached) " >&6
7251
- cat >conftest.$ac_ext <<_ACEOF
7254
-cat confdefs.h >>conftest.$ac_ext
7255
-cat >>conftest.$ac_ext <<_ACEOF
7256
-/* end confdefs.h. */
7257
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
7258
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
7259
-#define shl_load innocuous_shl_load
7261
-/* System header to define __stub macros and hopefully few prototypes,
7262
- which can conflict with char shl_load (); below.
7263
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7264
- <limits.h> exists even on freestanding compilers. */
7267
-# include <limits.h>
7269
-# include <assert.h>
7274
-/* Override any GCC internal prototype to avoid an error.
7275
- Use char because int might match the return type of a GCC
7276
- builtin and then its argument prototype would still apply. */
7281
-/* The GNU C library defines this for functions which it implements
7282
- to always fail with ENOSYS. Some functions are actually named
7283
- something starting with __ and the normal name is an alias. */
7284
-#if defined __stub_shl_load || defined __stub___shl_load
7291
-return shl_load ();
7296
-rm -f conftest.$ac_objext conftest$ac_exeext
7297
-if { (ac_try="$ac_link"
7298
-case "(($ac_try" in
7299
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7300
- *) ac_try_echo=$ac_try;;
7302
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7303
-$as_echo "$ac_try_echo") >&5
7304
- (eval "$ac_link") 2>conftest.er1
7306
- grep -v '^ *+' conftest.er1 >conftest.err
7307
- rm -f conftest.er1
7308
- cat conftest.err >&5
7309
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7310
- (exit $ac_status); } && {
7311
- test -z "$ac_c_werror_flag" ||
7312
- test ! -s conftest.err
7313
- } && test -s conftest$ac_exeext && {
7314
- test "$cross_compiling" = yes ||
7315
- $as_test_x conftest$ac_exeext
7317
- ac_cv_func_shl_load=yes
7319
- $as_echo "$as_me: failed program was:" >&5
7320
-sed 's/^/| /' conftest.$ac_ext >&5
7322
- ac_cv_func_shl_load=no
7324
+ lt_cv_dlopen_libs=
7327
-rm -rf conftest.dSYM
7328
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7329
- conftest$ac_exeext conftest.$ac_ext
7331
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
7332
-$as_echo "$ac_cv_func_shl_load" >&6; }
7333
-if test "x$ac_cv_func_shl_load" = x""yes; then
7334
- lt_cv_dlopen="shl_load"
7336
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
7337
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
7338
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
7340
+ # if libdl is installed we need to link against it
7341
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
7342
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
7343
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
7344
$as_echo_n "(cached) " >&6
7346
ac_check_lib_save_LIBS=$LIBS
7348
-cat >conftest.$ac_ext <<_ACEOF
7351
-cat confdefs.h >>conftest.$ac_ext
7352
-cat >>conftest.$ac_ext <<_ACEOF
7354
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7355
/* end confdefs.h. */
7357
/* Override any GCC internal prototype to avoid an error.
7358
@@ -10764,81 +10311,52 @@ cat >>conftest.$ac_ext <<_ACEOF
7367
-return shl_load ();
7373
-rm -f conftest.$ac_objext conftest$ac_exeext
7374
-if { (ac_try="$ac_link"
7375
-case "(($ac_try" in
7376
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7377
- *) ac_try_echo=$ac_try;;
7379
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7380
-$as_echo "$ac_try_echo") >&5
7381
- (eval "$ac_link") 2>conftest.er1
7383
- grep -v '^ *+' conftest.er1 >conftest.err
7384
- rm -f conftest.er1
7385
- cat conftest.err >&5
7386
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7387
- (exit $ac_status); } && {
7388
- test -z "$ac_c_werror_flag" ||
7389
- test ! -s conftest.err
7390
- } && test -s conftest$ac_exeext && {
7391
- test "$cross_compiling" = yes ||
7392
- $as_test_x conftest$ac_exeext
7394
- ac_cv_lib_dld_shl_load=yes
7395
+if ac_fn_c_try_link "$LINENO"; then :
7396
+ ac_cv_lib_dl_dlopen=yes
7398
- $as_echo "$as_me: failed program was:" >&5
7399
-sed 's/^/| /' conftest.$ac_ext >&5
7401
- ac_cv_lib_dld_shl_load=no
7402
+ ac_cv_lib_dl_dlopen=no
7405
-rm -rf conftest.dSYM
7406
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7407
- conftest$ac_exeext conftest.$ac_ext
7408
+rm -f core conftest.err conftest.$ac_objext \
7409
+ conftest$ac_exeext conftest.$ac_ext
7410
LIBS=$ac_check_lib_save_LIBS
7412
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
7413
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
7414
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
7415
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
7417
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
7418
-$as_echo_n "checking for dlopen... " >&6; }
7419
-if test "${ac_cv_func_dlopen+set}" = set; then
7420
- $as_echo_n "(cached) " >&6
7421
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
7422
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
7423
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
7424
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
7426
- cat >conftest.$ac_ext <<_ACEOF
7429
-cat confdefs.h >>conftest.$ac_ext
7430
-cat >>conftest.$ac_ext <<_ACEOF
7431
-/* end confdefs.h. */
7432
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
7433
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
7434
-#define dlopen innocuous_dlopen
7436
-/* System header to define __stub macros and hopefully few prototypes,
7437
- which can conflict with char dlopen (); below.
7438
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7439
- <limits.h> exists even on freestanding compilers. */
7440
+ lt_cv_dlopen="dyld"
7441
+ lt_cv_dlopen_libs=
7442
+ lt_cv_dlopen_self=yes
7445
-# include <limits.h>
7447
-# include <assert.h>
7455
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
7456
+if test "x$ac_cv_func_shl_load" = x""yes; then :
7457
+ lt_cv_dlopen="shl_load"
7459
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
7460
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
7461
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
7462
+ $as_echo_n "(cached) " >&6
7464
+ ac_check_lib_save_LIBS=$LIBS
7466
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7467
+/* end confdefs.h. */
7469
/* Override any GCC internal prototype to avoid an error.
7470
Use char because int might match the return type of a GCC
7471
@@ -10846,72 +10364,41 @@ cat >>conftest.$ac_ext <<_ACEOF
7476
-/* The GNU C library defines this for functions which it implements
7477
- to always fail with ENOSYS. Some functions are actually named
7478
- something starting with __ and the normal name is an alias. */
7479
-#if defined __stub_dlopen || defined __stub___dlopen
7488
+return shl_load ();
7493
-rm -f conftest.$ac_objext conftest$ac_exeext
7494
-if { (ac_try="$ac_link"
7495
-case "(($ac_try" in
7496
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7497
- *) ac_try_echo=$ac_try;;
7499
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7500
-$as_echo "$ac_try_echo") >&5
7501
- (eval "$ac_link") 2>conftest.er1
7503
- grep -v '^ *+' conftest.er1 >conftest.err
7504
- rm -f conftest.er1
7505
- cat conftest.err >&5
7506
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7507
- (exit $ac_status); } && {
7508
- test -z "$ac_c_werror_flag" ||
7509
- test ! -s conftest.err
7510
- } && test -s conftest$ac_exeext && {
7511
- test "$cross_compiling" = yes ||
7512
- $as_test_x conftest$ac_exeext
7514
- ac_cv_func_dlopen=yes
7515
+if ac_fn_c_try_link "$LINENO"; then :
7516
+ ac_cv_lib_dld_shl_load=yes
7518
- $as_echo "$as_me: failed program was:" >&5
7519
-sed 's/^/| /' conftest.$ac_ext >&5
7521
- ac_cv_func_dlopen=no
7522
+ ac_cv_lib_dld_shl_load=no
7525
-rm -rf conftest.dSYM
7526
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7527
- conftest$ac_exeext conftest.$ac_ext
7528
+rm -f core conftest.err conftest.$ac_objext \
7529
+ conftest$ac_exeext conftest.$ac_ext
7530
+LIBS=$ac_check_lib_save_LIBS
7532
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
7533
-$as_echo "$ac_cv_func_dlopen" >&6; }
7534
-if test "x$ac_cv_func_dlopen" = x""yes; then
7535
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
7536
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
7537
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
7538
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
7540
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
7541
+if test "x$ac_cv_func_dlopen" = x""yes; then :
7542
lt_cv_dlopen="dlopen"
7544
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
7545
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
7546
$as_echo_n "checking for dlopen in -ldl... " >&6; }
7547
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
7548
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
7549
$as_echo_n "(cached) " >&6
7551
ac_check_lib_save_LIBS=$LIBS
7553
-cat >conftest.$ac_ext <<_ACEOF
7556
-cat confdefs.h >>conftest.$ac_ext
7557
-cat >>conftest.$ac_ext <<_ACEOF
7558
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7559
/* end confdefs.h. */
7561
/* Override any GCC internal prototype to avoid an error.
7562
@@ -10929,57 +10416,28 @@ return dlopen ();
7566
-rm -f conftest.$ac_objext conftest$ac_exeext
7567
-if { (ac_try="$ac_link"
7568
-case "(($ac_try" in
7569
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7570
- *) ac_try_echo=$ac_try;;
7572
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7573
-$as_echo "$ac_try_echo") >&5
7574
- (eval "$ac_link") 2>conftest.er1
7576
- grep -v '^ *+' conftest.er1 >conftest.err
7577
- rm -f conftest.er1
7578
- cat conftest.err >&5
7579
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7580
- (exit $ac_status); } && {
7581
- test -z "$ac_c_werror_flag" ||
7582
- test ! -s conftest.err
7583
- } && test -s conftest$ac_exeext && {
7584
- test "$cross_compiling" = yes ||
7585
- $as_test_x conftest$ac_exeext
7587
+if ac_fn_c_try_link "$LINENO"; then :
7588
ac_cv_lib_dl_dlopen=yes
7590
- $as_echo "$as_me: failed program was:" >&5
7591
-sed 's/^/| /' conftest.$ac_ext >&5
7593
- ac_cv_lib_dl_dlopen=no
7594
+ ac_cv_lib_dl_dlopen=no
7597
-rm -rf conftest.dSYM
7598
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7599
- conftest$ac_exeext conftest.$ac_ext
7600
+rm -f core conftest.err conftest.$ac_objext \
7601
+ conftest$ac_exeext conftest.$ac_ext
7602
LIBS=$ac_check_lib_save_LIBS
7604
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
7605
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
7606
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
7607
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
7608
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
7609
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
7611
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
7612
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
7613
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
7614
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
7615
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
7616
$as_echo_n "(cached) " >&6
7618
ac_check_lib_save_LIBS=$LIBS
7620
-cat >conftest.$ac_ext <<_ACEOF
7623
-cat confdefs.h >>conftest.$ac_ext
7624
-cat >>conftest.$ac_ext <<_ACEOF
7625
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7626
/* end confdefs.h. */
7628
/* Override any GCC internal prototype to avoid an error.
7629
@@ -10997,57 +10455,28 @@ return dlopen ();
7633
-rm -f conftest.$ac_objext conftest$ac_exeext
7634
-if { (ac_try="$ac_link"
7635
-case "(($ac_try" in
7636
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7637
- *) ac_try_echo=$ac_try;;
7639
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7640
-$as_echo "$ac_try_echo") >&5
7641
- (eval "$ac_link") 2>conftest.er1
7643
- grep -v '^ *+' conftest.er1 >conftest.err
7644
- rm -f conftest.er1
7645
- cat conftest.err >&5
7646
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7647
- (exit $ac_status); } && {
7648
- test -z "$ac_c_werror_flag" ||
7649
- test ! -s conftest.err
7650
- } && test -s conftest$ac_exeext && {
7651
- test "$cross_compiling" = yes ||
7652
- $as_test_x conftest$ac_exeext
7654
+if ac_fn_c_try_link "$LINENO"; then :
7655
ac_cv_lib_svld_dlopen=yes
7657
- $as_echo "$as_me: failed program was:" >&5
7658
-sed 's/^/| /' conftest.$ac_ext >&5
7660
- ac_cv_lib_svld_dlopen=no
7661
+ ac_cv_lib_svld_dlopen=no
7664
-rm -rf conftest.dSYM
7665
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7666
- conftest$ac_exeext conftest.$ac_ext
7667
+rm -f core conftest.err conftest.$ac_objext \
7668
+ conftest$ac_exeext conftest.$ac_ext
7669
LIBS=$ac_check_lib_save_LIBS
7671
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
7672
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
7673
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
7674
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
7675
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
7676
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
7678
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
7679
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
7680
$as_echo_n "checking for dld_link in -ldld... " >&6; }
7681
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
7682
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
7683
$as_echo_n "(cached) " >&6
7685
ac_check_lib_save_LIBS=$LIBS
7687
-cat >conftest.$ac_ext <<_ACEOF
7690
-cat confdefs.h >>conftest.$ac_ext
7691
-cat >>conftest.$ac_ext <<_ACEOF
7692
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7693
/* end confdefs.h. */
7695
/* Override any GCC internal prototype to avoid an error.
7696
@@ -11065,43 +10494,18 @@ return dld_link ();
7700
-rm -f conftest.$ac_objext conftest$ac_exeext
7701
-if { (ac_try="$ac_link"
7702
-case "(($ac_try" in
7703
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7704
- *) ac_try_echo=$ac_try;;
7706
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7707
-$as_echo "$ac_try_echo") >&5
7708
- (eval "$ac_link") 2>conftest.er1
7710
- grep -v '^ *+' conftest.er1 >conftest.err
7711
- rm -f conftest.er1
7712
- cat conftest.err >&5
7713
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7714
- (exit $ac_status); } && {
7715
- test -z "$ac_c_werror_flag" ||
7716
- test ! -s conftest.err
7717
- } && test -s conftest$ac_exeext && {
7718
- test "$cross_compiling" = yes ||
7719
- $as_test_x conftest$ac_exeext
7721
+if ac_fn_c_try_link "$LINENO"; then :
7722
ac_cv_lib_dld_dld_link=yes
7724
- $as_echo "$as_me: failed program was:" >&5
7725
-sed 's/^/| /' conftest.$ac_ext >&5
7727
- ac_cv_lib_dld_dld_link=no
7728
+ ac_cv_lib_dld_dld_link=no
7731
-rm -rf conftest.dSYM
7732
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7733
- conftest$ac_exeext conftest.$ac_ext
7734
+rm -f core conftest.err conftest.$ac_objext \
7735
+ conftest$ac_exeext conftest.$ac_ext
7736
LIBS=$ac_check_lib_save_LIBS
7738
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
7739
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
7740
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
7741
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
7742
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
7743
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
7746
@@ -11140,9 +10544,9 @@ fi
7748
LIBS="$lt_cv_dlopen_libs $LIBS"
7750
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
7751
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
7752
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
7753
-if test "${lt_cv_dlopen_self+set}" = set; then
7754
+if test "${lt_cv_dlopen_self+set}" = set; then :
7755
$as_echo_n "(cached) " >&6
7757
if test "$cross_compiling" = yes; then :
7758
@@ -11151,7 +10555,7 @@ else
7759
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7760
lt_status=$lt_dlunknown
7761
cat > conftest.$ac_ext <<_LT_EOF
7762
-#line 11154 "configure"
7763
+#line 10558 "configure"
7764
#include "confdefs.h"
7767
@@ -11210,11 +10614,11 @@ int main ()
7771
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7772
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7773
(eval $ac_link) 2>&5
7775
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7776
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
7777
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7778
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
7779
(./conftest; exit; ) >&5 2>/dev/null
7782
@@ -11231,14 +10635,14 @@ rm -fr conftest*
7786
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
7787
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
7788
$as_echo "$lt_cv_dlopen_self" >&6; }
7790
if test "x$lt_cv_dlopen_self" = xyes; then
7791
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
7792
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
7793
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
7794
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
7795
-if test "${lt_cv_dlopen_self_static+set}" = set; then
7796
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
7797
$as_echo_n "(cached) " >&6
7799
if test "$cross_compiling" = yes; then :
7800
@@ -11247,7 +10651,7 @@ else
7801
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7802
lt_status=$lt_dlunknown
7803
cat > conftest.$ac_ext <<_LT_EOF
7804
-#line 11250 "configure"
7805
+#line 10654 "configure"
7806
#include "confdefs.h"
7809
@@ -11306,11 +10710,11 @@ int main ()
7813
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7814
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7815
(eval $ac_link) 2>&5
7817
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7818
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
7819
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7820
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
7821
(./conftest; exit; ) >&5 2>/dev/null
7824
@@ -11327,7 +10731,7 @@ rm -fr conftest*
7828
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
7829
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
7830
$as_echo "$lt_cv_dlopen_self_static" >&6; }
7833
@@ -11366,12 +10770,12 @@ fi
7837
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
7838
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
7839
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
7840
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
7841
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
7842
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
7843
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7844
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7845
$as_echo "yes" >&6; }
7847
# FIXME - insert some real tests, host_os isn't really good enough
7848
@@ -11380,15 +10784,15 @@ else
7849
if test -n "$STRIP" ; then
7850
striplib="$STRIP -x"
7851
old_striplib="$STRIP -S"
7852
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7853
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7854
$as_echo "yes" >&6; }
7856
- { $as_echo "$as_me:$LINENO: result: no" >&5
7857
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7858
$as_echo "no" >&6; }
7862
- { $as_echo "$as_me:$LINENO: result: no" >&5
7863
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7864
$as_echo "no" >&6; }
7867
@@ -11406,12 +10810,12 @@ fi
7870
# Report which library types will actually be built
7871
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
7872
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
7873
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
7874
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
7875
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
7876
$as_echo "$can_build_shared" >&6; }
7878
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
7879
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
7880
$as_echo_n "checking whether to build shared libraries... " >&6; }
7881
test "$can_build_shared" = "no" && enable_shared=no
7883
@@ -11432,14 +10836,14 @@ $as_echo_n "checking whether to build sh
7887
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
7888
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
7889
$as_echo "$enable_shared" >&6; }
7891
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
7892
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
7893
$as_echo_n "checking whether to build static libraries... " >&6; }
7894
# Make sure either enable_shared or enable_static is yes.
7895
test "$enable_shared" = yes || enable_static=yes
7896
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
7897
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
7898
$as_echo "$enable_static" >&6; }
7901
@@ -11476,16 +10880,16 @@ CC="$lt_save_CC"
7905
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
7906
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
7907
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
7908
# Check whether --enable-maintainer-mode was given.
7909
-if test "${enable_maintainer_mode+set}" = set; then
7910
+if test "${enable_maintainer_mode+set}" = set; then :
7911
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
7913
USE_MAINTAINER_MODE=no
7916
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
7917
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
7918
$as_echo "$USE_MAINTAINER_MODE" >&6; }
7919
if test $USE_MAINTAINER_MODE = yes; then
7920
MAINTAINER_MODE_TRUE=
7921
@@ -11506,9 +10910,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
7922
if test -n "$ac_tool_prefix"; then
7923
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
7924
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
7925
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7926
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7927
$as_echo_n "checking for $ac_word... " >&6; }
7928
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
7929
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7930
$as_echo_n "(cached) " >&6
7933
@@ -11521,14 +10925,14 @@ for as_dir in $PATH
7936
test -z "$as_dir" && as_dir=.
7937
- for ac_exec_ext in '' $ac_executable_extensions; do
7938
+ for ac_exec_ext in '' $ac_executable_extensions; do
7939
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7940
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7941
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7942
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7951
@@ -11536,10 +10940,10 @@ esac
7953
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7954
if test -n "$PKG_CONFIG"; then
7955
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
7956
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7957
$as_echo "$PKG_CONFIG" >&6; }
7959
- { $as_echo "$as_me:$LINENO: result: no" >&5
7960
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7961
$as_echo "no" >&6; }
7964
@@ -11549,9 +10953,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
7965
ac_pt_PKG_CONFIG=$PKG_CONFIG
7966
# Extract the first word of "pkg-config", so it can be a program name with args.
7967
set dummy pkg-config; ac_word=$2
7968
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7969
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7970
$as_echo_n "checking for $ac_word... " >&6; }
7971
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
7972
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
7973
$as_echo_n "(cached) " >&6
7975
case $ac_pt_PKG_CONFIG in
7976
@@ -11564,14 +10968,14 @@ for as_dir in $PATH
7979
test -z "$as_dir" && as_dir=.
7980
- for ac_exec_ext in '' $ac_executable_extensions; do
7981
+ for ac_exec_ext in '' $ac_executable_extensions; do
7982
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7983
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7984
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7985
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7994
@@ -11579,10 +10983,10 @@ esac
7996
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
7997
if test -n "$ac_pt_PKG_CONFIG"; then
7998
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
7999
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
8000
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
8002
- { $as_echo "$as_me:$LINENO: result: no" >&5
8003
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8004
$as_echo "no" >&6; }
8007
@@ -11591,7 +10995,7 @@ fi
8009
case $cross_compiling:$ac_tool_warned in
8011
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8012
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8013
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8014
ac_tool_warned=yes ;;
8016
@@ -11604,13 +11008,13 @@ fi
8018
if test -n "$PKG_CONFIG"; then
8019
_pkg_min_version=0.9.0
8020
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
8021
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
8022
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
8023
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
8024
- { $as_echo "$as_me:$LINENO: result: yes" >&5
8025
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8026
$as_echo "yes" >&6; }
8028
- { $as_echo "$as_me:$LINENO: result: no" >&5
8029
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8030
$as_echo "no" >&6; }
8033
@@ -11619,35 +11023,33 @@ fi
8035
gdu_cv_version_required=0.3.2
8037
-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
8038
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
8039
$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
8040
if test -n "$PKG_CONFIG" && \
8041
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
8042
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
8043
($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
8045
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8046
- (exit $ac_status); }; then
8047
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8048
+ test $ac_status = 0; }; then
8054
if test "$gdu_cv_have_gdu" = "yes"; then
8055
- { $as_echo "$as_me:$LINENO: result: yes" >&5
8056
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8057
$as_echo "yes" >&6; }
8060
- { $as_echo "$as_me:$LINENO: result: no" >&5
8061
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8062
$as_echo "no" >&6; }
8063
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
8064
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
8065
- { (exit 1); exit 1; }; }
8066
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
8071
# Check whether --with-help-dir was given.
8072
-if test "${with_help_dir+set}" = set; then
8073
+if test "${with_help_dir+set}" = set; then :
8074
withval=$with_help_dir;
8076
with_help_dir='${datadir}/gnome/help'
8077
@@ -11658,7 +11060,7 @@ HELP_DIR="$with_help_dir"
8080
# Check whether --with-omf-dir was given.
8081
-if test "${with_omf_dir+set}" = set; then
8082
+if test "${with_omf_dir+set}" = set; then :
8083
withval=$with_omf_dir;
8085
with_omf_dir='${datadir}/omf'
8086
@@ -11669,7 +11071,7 @@ OMF_DIR="$with_omf_dir"
8089
# Check whether --with-help-formats was given.
8090
-if test "${with_help_formats+set}" = set; then
8091
+if test "${with_help_formats+set}" = set; then :
8092
withval=$with_help_formats;
8094
with_help_formats=''
8095
@@ -11679,7 +11081,7 @@ DOC_USER_FORMATS="$with_help_formats"
8098
# Check whether --enable-scrollkeeper was given.
8099
-if test "${enable_scrollkeeper+set}" = set; then
8100
+if test "${enable_scrollkeeper+set}" = set; then :
8101
enableval=$enable_scrollkeeper;
8103
enable_scrollkeeper=yes
8104
@@ -11711,9 +11113,9 @@ fi
8106
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
8107
set dummy gtkdoc-check; ac_word=$2
8108
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8109
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8110
$as_echo_n "checking for $ac_word... " >&6; }
8111
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
8112
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
8113
$as_echo_n "(cached) " >&6
8115
case $GTKDOC_CHECK in
8116
@@ -11726,14 +11128,14 @@ for as_dir in $PATH
8119
test -z "$as_dir" && as_dir=.
8120
- for ac_exec_ext in '' $ac_executable_extensions; do
8121
+ for ac_exec_ext in '' $ac_executable_extensions; do
8122
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8123
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
8124
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8125
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8134
@@ -11741,10 +11143,10 @@ esac
8136
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
8137
if test -n "$GTKDOC_CHECK"; then
8138
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
8139
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
8140
$as_echo "$GTKDOC_CHECK" >&6; }
8142
- { $as_echo "$as_me:$LINENO: result: no" >&5
8143
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8144
$as_echo "no" >&6; }
8147
@@ -11753,9 +11155,9 @@ fi
8149
# Extract the first word of "$ac_prog", so it can be a program name with args.
8150
set dummy $ac_prog; ac_word=$2
8151
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8152
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8153
$as_echo_n "checking for $ac_word... " >&6; }
8154
-if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
8155
+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
8156
$as_echo_n "(cached) " >&6
8158
case $GTKDOC_REBASE in
8159
@@ -11768,14 +11170,14 @@ for as_dir in $PATH
8162
test -z "$as_dir" && as_dir=.
8163
- for ac_exec_ext in '' $ac_executable_extensions; do
8164
+ for ac_exec_ext in '' $ac_executable_extensions; do
8165
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8166
ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
8167
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8168
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8177
@@ -11783,10 +11185,10 @@ esac
8179
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
8180
if test -n "$GTKDOC_REBASE"; then
8181
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
8182
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
8183
$as_echo "$GTKDOC_REBASE" >&6; }
8185
- { $as_echo "$as_me:$LINENO: result: no" >&5
8186
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8187
$as_echo "no" >&6; }
8190
@@ -11797,9 +11199,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
8192
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
8193
set dummy gtkdoc-mkpdf; ac_word=$2
8194
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8195
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8196
$as_echo_n "checking for $ac_word... " >&6; }
8197
-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
8198
+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
8199
$as_echo_n "(cached) " >&6
8201
case $GTKDOC_MKPDF in
8202
@@ -11812,14 +11214,14 @@ for as_dir in $PATH
8205
test -z "$as_dir" && as_dir=.
8206
- for ac_exec_ext in '' $ac_executable_extensions; do
8207
+ for ac_exec_ext in '' $ac_executable_extensions; do
8208
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8209
ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
8210
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8211
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8220
@@ -11827,10 +11229,10 @@ esac
8222
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
8223
if test -n "$GTKDOC_MKPDF"; then
8224
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
8225
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
8226
$as_echo "$GTKDOC_MKPDF" >&6; }
8228
- { $as_echo "$as_me:$LINENO: result: no" >&5
8229
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8230
$as_echo "no" >&6; }
8233
@@ -11838,7 +11240,7 @@ fi
8236
# Check whether --with-html-dir was given.
8237
-if test "${with_html_dir+set}" = set; then
8238
+if test "${with_html_dir+set}" = set; then :
8239
withval=$with_html_dir;
8241
with_html_dir='${datadir}/gtk-doc/html'
8242
@@ -11848,7 +11250,7 @@ fi
8245
# Check whether --enable-gtk-doc was given.
8246
-if test "${enable_gtk_doc+set}" = set; then
8247
+if test "${enable_gtk_doc+set}" = set; then :
8248
enableval=$enable_gtk_doc;
8251
@@ -11857,33 +11259,31 @@ fi
8253
if test x$enable_gtk_doc = xyes; then
4005
@@ -10672,7 +10563,7 @@
4006
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4007
lt_status=$lt_dlunknown
4008
cat > conftest.$ac_ext <<_LT_EOF
4009
-#line $LINENO "configure"
4010
+#line 10566 "configure"
4011
#include "confdefs.h"
4014
@@ -10713,13 +10604,7 @@
4018
-/* When -fvisbility=hidden is used, assume the code has been annotated
4019
- correspondingly for the symbols needed. */
4020
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
4021
-void fnord () __attribute__((visibility("default")));
4024
-void fnord () { int i=42; }
4025
+void fnord() { int i=42;}
4028
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
4029
@@ -10728,11 +10613,7 @@
4032
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
4035
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4036
- else puts (dlerror ());
4038
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4039
/* dlclose (self); */
4042
@@ -10778,7 +10659,7 @@
4043
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4044
lt_status=$lt_dlunknown
4045
cat > conftest.$ac_ext <<_LT_EOF
4046
-#line $LINENO "configure"
4047
+#line 10662 "configure"
4048
#include "confdefs.h"
4051
@@ -10819,13 +10700,7 @@
4055
-/* When -fvisbility=hidden is used, assume the code has been annotated
4056
- correspondingly for the symbols needed. */
4057
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
4058
-void fnord () __attribute__((visibility("default")));
4061
-void fnord () { int i=42; }
4062
+void fnord() { int i=42;}
4065
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
4066
@@ -10834,11 +10709,7 @@
4069
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
4072
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4073
- else puts (dlerror ());
4075
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4076
/* dlclose (self); */
4079
@@ -13977,14 +13848,14 @@
4080
elif test -n "$PKG_CONFIG"; then
8254
4081
if test -n "$PKG_CONFIG" && \
8255
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.12\"") >&5
8256
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.12\""; } >&5
8257
($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.12") 2>&5
8259
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8260
- (exit $ac_status); }; then
8261
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8262
+ test $ac_status = 0; }; then
8265
- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" >&5
8266
-$as_echo "$as_me: error: You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" >&2;}
8267
- { (exit 1); exit 1; }; }
8268
+ as_fn_error "You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" "$LINENO" 5
8272
- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
8273
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
8274
$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
8275
- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
8276
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
8277
$as_echo "$enable_gtk_doc" >&6; }
8279
# Check whether --enable-gtk-doc-html was given.
8280
-if test "${enable_gtk_doc_html+set}" = set; then
8281
+if test "${enable_gtk_doc_html+set}" = set; then :
8282
enableval=$enable_gtk_doc_html;
8284
enable_gtk_doc_html=yes
8287
# Check whether --enable-gtk-doc-pdf was given.
8288
-if test "${enable_gtk_doc_pdf+set}" = set; then
8289
+if test "${enable_gtk_doc_pdf+set}" = set; then :
8290
enableval=$enable_gtk_doc_pdf;
8292
enable_gtk_doc_pdf=no
8293
@@ -11941,7 +11341,7 @@ fi
8296
# Check whether --enable-compile-warnings was given.
8297
-if test "${enable_compile_warnings+set}" = set; then
8298
+if test "${enable_compile_warnings+set}" = set; then :
8299
enableval=$enable_compile_warnings;
8301
enable_compile_warnings="maximum"
8302
@@ -11972,13 +11372,9 @@ fi
8303
for option in -Wno-sign-compare; do
8304
SAVE_CFLAGS="$CFLAGS"
8305
CFLAGS="$CFLAGS $option"
8306
- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
8307
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
8308
$as_echo_n "checking whether gcc understands $option... " >&6; }
8309
- cat >conftest.$ac_ext <<_ACEOF
8312
-cat confdefs.h >>conftest.$ac_ext
8313
-cat >>conftest.$ac_ext <<_ACEOF
8314
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8315
/* end confdefs.h. */
8318
@@ -11989,35 +11385,14 @@ main ()
8322
-rm -f conftest.$ac_objext
8323
-if { (ac_try="$ac_compile"
8324
-case "(($ac_try" in
8325
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8326
- *) ac_try_echo=$ac_try;;
8328
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8329
-$as_echo "$ac_try_echo") >&5
8330
- (eval "$ac_compile") 2>conftest.er1
8332
- grep -v '^ *+' conftest.er1 >conftest.err
8333
- rm -f conftest.er1
8334
- cat conftest.err >&5
8335
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8336
- (exit $ac_status); } && {
8337
- test -z "$ac_c_werror_flag" ||
8338
- test ! -s conftest.err
8339
- } && test -s conftest.$ac_objext; then
8340
+if ac_fn_c_try_compile "$LINENO"; then :
8343
- $as_echo "$as_me: failed program was:" >&5
8344
-sed 's/^/| /' conftest.$ac_ext >&5
8350
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8351
CFLAGS="$SAVE_CFLAGS"
8352
- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
8353
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
8354
$as_echo "$has_option" >&6; }
8355
if test $has_option = yes; then
8356
warning_flags="$warning_flags $option"
8357
@@ -12031,26 +11406,24 @@ $as_echo "$has_option" >&6; }
8361
- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
8362
-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
8363
- { (exit 1); exit 1; }; }
8364
+ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
8367
CFLAGS="$realsave_CFLAGS"
8368
- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
8369
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
8370
$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
8371
- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
8372
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
8373
$as_echo "$warning_flags" >&6; }
8375
# Check whether --enable-iso-c was given.
8376
-if test "${enable_iso_c+set}" = set; then
8377
+if test "${enable_iso_c+set}" = set; then :
8378
enableval=$enable_iso_c;
8384
- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
8385
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
8386
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
8388
if test "x$enable_iso_c" != "xno"; then
8389
@@ -12065,7 +11438,7 @@ $as_echo_n "checking what language compl
8393
- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
8394
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
8395
$as_echo "$complCFLAGS" >&6; }
8397
WARN_CFLAGS="$warning_flags $complCFLAGS"
8398
@@ -12073,14 +11446,14 @@ $as_echo "$complCFLAGS" >&6; }
8401
# Check whether --enable-cxx-warnings was given.
8402
-if test "${enable_cxx_warnings+set}" = set; then
8403
+if test "${enable_cxx_warnings+set}" = set; then :
8404
enableval=$enable_cxx_warnings;
8406
enable_cxx_warnings="minimum"
8410
- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5
8411
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5
8412
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
8414
if test "x$GXX" != xyes; then
8415
@@ -12100,18 +11473,18 @@ $as_echo_n "checking what warning flags
8419
- { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5
8420
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warnCXXFLAGS" >&5
8421
$as_echo "$warnCXXFLAGS" >&6; }
8423
# Check whether --enable-iso-cxx was given.
8424
-if test "${enable_iso_cxx+set}" = set; then
8425
+if test "${enable_iso_cxx+set}" = set; then :
8426
enableval=$enable_iso_cxx;
8432
- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5
8433
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C++ compiler" >&5
8434
$as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }
8436
if test "x$enable_iso_cxx" != "xno"; then
8437
@@ -12127,7 +11500,7 @@ $as_echo_n "checking what language compl
8441
- { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5
8442
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCXXFLAGS" >&5
8443
$as_echo "$complCXXFLAGS" >&6; }
8445
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
8446
@@ -12158,9 +11531,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
8447
if test -n "$ac_tool_prefix"; then
8448
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
8449
set dummy ${ac_tool_prefix}gcc; ac_word=$2
8450
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8451
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8452
$as_echo_n "checking for $ac_word... " >&6; }
8453
-if test "${ac_cv_prog_CC+set}" = set; then
8454
+if test "${ac_cv_prog_CC+set}" = set; then :
8455
$as_echo_n "(cached) " >&6
8457
if test -n "$CC"; then
8458
@@ -12171,24 +11544,24 @@ for as_dir in $PATH
8461
test -z "$as_dir" && as_dir=.
8462
- for ac_exec_ext in '' $ac_executable_extensions; do
8463
+ for ac_exec_ext in '' $ac_executable_extensions; do
8464
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8465
ac_cv_prog_CC="${ac_tool_prefix}gcc"
8466
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8467
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8478
if test -n "$CC"; then
8479
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8480
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8481
$as_echo "$CC" >&6; }
8483
- { $as_echo "$as_me:$LINENO: result: no" >&5
8484
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8485
$as_echo "no" >&6; }
8488
@@ -12198,9 +11571,9 @@ if test -z "$ac_cv_prog_CC"; then
8490
# Extract the first word of "gcc", so it can be a program name with args.
8491
set dummy gcc; ac_word=$2
8492
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8493
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8494
$as_echo_n "checking for $ac_word... " >&6; }
8495
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
8496
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
8497
$as_echo_n "(cached) " >&6
8499
if test -n "$ac_ct_CC"; then
8500
@@ -12211,24 +11584,24 @@ for as_dir in $PATH
8503
test -z "$as_dir" && as_dir=.
8504
- for ac_exec_ext in '' $ac_executable_extensions; do
8505
+ for ac_exec_ext in '' $ac_executable_extensions; do
8506
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8507
ac_cv_prog_ac_ct_CC="gcc"
8508
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8509
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8519
ac_ct_CC=$ac_cv_prog_ac_ct_CC
8520
if test -n "$ac_ct_CC"; then
8521
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
8522
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
8523
$as_echo "$ac_ct_CC" >&6; }
8525
- { $as_echo "$as_me:$LINENO: result: no" >&5
8526
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8527
$as_echo "no" >&6; }
8530
@@ -12237,7 +11610,7 @@ fi
8532
case $cross_compiling:$ac_tool_warned in
8534
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8535
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8536
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8537
ac_tool_warned=yes ;;
8539
@@ -12251,9 +11624,9 @@ if test -z "$CC"; then
8540
if test -n "$ac_tool_prefix"; then
8541
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
8542
set dummy ${ac_tool_prefix}cc; ac_word=$2
8543
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8544
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8545
$as_echo_n "checking for $ac_word... " >&6; }
8546
-if test "${ac_cv_prog_CC+set}" = set; then
8547
+if test "${ac_cv_prog_CC+set}" = set; then :
8548
$as_echo_n "(cached) " >&6
8550
if test -n "$CC"; then
8551
@@ -12264,24 +11637,24 @@ for as_dir in $PATH
8554
test -z "$as_dir" && as_dir=.
8555
- for ac_exec_ext in '' $ac_executable_extensions; do
8556
+ for ac_exec_ext in '' $ac_executable_extensions; do
8557
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8558
ac_cv_prog_CC="${ac_tool_prefix}cc"
8559
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8560
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8571
if test -n "$CC"; then
8572
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8573
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8574
$as_echo "$CC" >&6; }
8576
- { $as_echo "$as_me:$LINENO: result: no" >&5
8577
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8578
$as_echo "no" >&6; }
8581
@@ -12291,9 +11664,9 @@ fi
8582
if test -z "$CC"; then
8583
# Extract the first word of "cc", so it can be a program name with args.
8584
set dummy cc; ac_word=$2
8585
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8586
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8587
$as_echo_n "checking for $ac_word... " >&6; }
8588
-if test "${ac_cv_prog_CC+set}" = set; then
8589
+if test "${ac_cv_prog_CC+set}" = set; then :
8590
$as_echo_n "(cached) " >&6
8592
if test -n "$CC"; then
8593
@@ -12305,18 +11678,18 @@ for as_dir in $PATH
8596
test -z "$as_dir" && as_dir=.
8597
- for ac_exec_ext in '' $ac_executable_extensions; do
8598
+ for ac_exec_ext in '' $ac_executable_extensions; do
8599
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8600
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
8601
ac_prog_rejected=yes
8605
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8606
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8614
if test $ac_prog_rejected = yes; then
8615
@@ -12335,10 +11708,10 @@ fi
8618
if test -n "$CC"; then
8619
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8620
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8621
$as_echo "$CC" >&6; }
8623
- { $as_echo "$as_me:$LINENO: result: no" >&5
8624
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8625
$as_echo "no" >&6; }
8628
@@ -12350,9 +11723,9 @@ if test -z "$CC"; then
8630
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8631
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8632
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8633
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8634
$as_echo_n "checking for $ac_word... " >&6; }
8635
-if test "${ac_cv_prog_CC+set}" = set; then
8636
+if test "${ac_cv_prog_CC+set}" = set; then :
8637
$as_echo_n "(cached) " >&6
8639
if test -n "$CC"; then
8640
@@ -12363,24 +11736,24 @@ for as_dir in $PATH
8643
test -z "$as_dir" && as_dir=.
8644
- for ac_exec_ext in '' $ac_executable_extensions; do
8645
+ for ac_exec_ext in '' $ac_executable_extensions; do
8646
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8647
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
8648
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8649
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8660
if test -n "$CC"; then
8661
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
8662
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
8663
$as_echo "$CC" >&6; }
8665
- { $as_echo "$as_me:$LINENO: result: no" >&5
8666
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8667
$as_echo "no" >&6; }
8670
@@ -12394,9 +11767,9 @@ if test -z "$CC"; then
8672
# Extract the first word of "$ac_prog", so it can be a program name with args.
8673
set dummy $ac_prog; ac_word=$2
8674
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8675
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8676
$as_echo_n "checking for $ac_word... " >&6; }
8677
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
8678
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
8679
$as_echo_n "(cached) " >&6
8681
if test -n "$ac_ct_CC"; then
8682
@@ -12407,24 +11780,24 @@ for as_dir in $PATH
8685
test -z "$as_dir" && as_dir=.
8686
- for ac_exec_ext in '' $ac_executable_extensions; do
8687
+ for ac_exec_ext in '' $ac_executable_extensions; do
8688
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8689
ac_cv_prog_ac_ct_CC="$ac_prog"
8690
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8691
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8701
ac_ct_CC=$ac_cv_prog_ac_ct_CC
8702
if test -n "$ac_ct_CC"; then
8703
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
8704
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
8705
$as_echo "$ac_ct_CC" >&6; }
8707
- { $as_echo "$as_me:$LINENO: result: no" >&5
8708
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8709
$as_echo "no" >&6; }
8712
@@ -12437,7 +11810,7 @@ done
8714
case $cross_compiling:$ac_tool_warned in
8716
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8717
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8718
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8719
ac_tool_warned=yes ;;
8721
@@ -12448,62 +11821,42 @@ fi
8725
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
8726
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8727
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8728
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
8729
-See \`config.log' for more details." >&5
8730
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
8731
-See \`config.log' for more details." >&2;}
8732
- { (exit 1); exit 1; }; }; }
8733
+as_fn_error "no acceptable C compiler found in \$PATH
8734
+See \`config.log' for more details." "$LINENO" 5; }
8736
# Provide some information about the compiler.
8737
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
8738
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
8741
-{ (ac_try="$ac_compiler --version >&5"
8742
-case "(($ac_try" in
8743
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8744
- *) ac_try_echo=$ac_try;;
8746
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8747
-$as_echo "$ac_try_echo") >&5
8748
- (eval "$ac_compiler --version >&5") 2>&5
8750
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8751
- (exit $ac_status); }
8752
-{ (ac_try="$ac_compiler -v >&5"
8753
-case "(($ac_try" in
8754
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8755
- *) ac_try_echo=$ac_try;;
8757
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8758
-$as_echo "$ac_try_echo") >&5
8759
- (eval "$ac_compiler -v >&5") 2>&5
8761
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8762
- (exit $ac_status); }
8763
-{ (ac_try="$ac_compiler -V >&5"
8764
+for ac_option in --version -v -V -qversion; do
8765
+ { { ac_try="$ac_compiler $ac_option >&5"
8767
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8768
*) ac_try_echo=$ac_try;;
8770
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8771
-$as_echo "$ac_try_echo") >&5
8772
- (eval "$ac_compiler -V >&5") 2>&5
8773
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
8774
+$as_echo "$ac_try_echo"; } >&5
8775
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
8777
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8778
- (exit $ac_status); }
8779
+ if test -s conftest.err; then
8781
+... rest of stderr output deleted ...
8782
+ 10q' conftest.err >conftest.er1
8783
+ cat conftest.er1 >&5
8785
+ rm -f conftest.er1 conftest.err
8786
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8787
+ test $ac_status = 0; }
8790
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
8791
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
8792
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
8793
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
8794
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
8795
$as_echo_n "(cached) " >&6
8797
- cat >conftest.$ac_ext <<_ACEOF
8800
-cat confdefs.h >>conftest.$ac_ext
8801
-cat >>conftest.$ac_ext <<_ACEOF
8802
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8803
/* end confdefs.h. */
8806
@@ -12517,37 +11870,16 @@ main ()
8810
-rm -f conftest.$ac_objext
8811
-if { (ac_try="$ac_compile"
8812
-case "(($ac_try" in
8813
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8814
- *) ac_try_echo=$ac_try;;
8816
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8817
-$as_echo "$ac_try_echo") >&5
8818
- (eval "$ac_compile") 2>conftest.er1
8820
- grep -v '^ *+' conftest.er1 >conftest.err
8821
- rm -f conftest.er1
8822
- cat conftest.err >&5
8823
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8824
- (exit $ac_status); } && {
8825
- test -z "$ac_c_werror_flag" ||
8826
- test ! -s conftest.err
8827
- } && test -s conftest.$ac_objext; then
8828
+if ac_fn_c_try_compile "$LINENO"; then :
8831
- $as_echo "$as_me: failed program was:" >&5
8832
-sed 's/^/| /' conftest.$ac_ext >&5
8834
- ac_compiler_gnu=no
8835
+ ac_compiler_gnu=no
8838
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8839
ac_cv_c_compiler_gnu=$ac_compiler_gnu
8842
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
8843
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
8844
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
8845
if test $ac_compiler_gnu = yes; then
8847
@@ -12556,59 +11888,16 @@ else
8849
ac_test_CFLAGS=${CFLAGS+set}
8850
ac_save_CFLAGS=$CFLAGS
8851
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
8852
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
8853
$as_echo_n "checking whether $CC accepts -g... " >&6; }
8854
-if test "${ac_cv_prog_cc_g+set}" = set; then
8855
+if test "${ac_cv_prog_cc_g+set}" = set; then :
8856
$as_echo_n "(cached) " >&6
8858
ac_save_c_werror_flag=$ac_c_werror_flag
8859
ac_c_werror_flag=yes
8862
- cat >conftest.$ac_ext <<_ACEOF
8865
-cat confdefs.h >>conftest.$ac_ext
8866
-cat >>conftest.$ac_ext <<_ACEOF
8867
-/* end confdefs.h. */
8877
-rm -f conftest.$ac_objext
8878
-if { (ac_try="$ac_compile"
8879
-case "(($ac_try" in
8880
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8881
- *) ac_try_echo=$ac_try;;
8883
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8884
-$as_echo "$ac_try_echo") >&5
8885
- (eval "$ac_compile") 2>conftest.er1
8887
- grep -v '^ *+' conftest.er1 >conftest.err
8888
- rm -f conftest.er1
8889
- cat conftest.err >&5
8890
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8891
- (exit $ac_status); } && {
8892
- test -z "$ac_c_werror_flag" ||
8893
- test ! -s conftest.err
8894
- } && test -s conftest.$ac_objext; then
8895
- ac_cv_prog_cc_g=yes
8897
- $as_echo "$as_me: failed program was:" >&5
8898
-sed 's/^/| /' conftest.$ac_ext >&5
8901
- cat >conftest.$ac_ext <<_ACEOF
8904
-cat confdefs.h >>conftest.$ac_ext
8905
-cat >>conftest.$ac_ext <<_ACEOF
8906
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8907
/* end confdefs.h. */
8910
@@ -12616,39 +11905,14 @@ main ()
8917
-rm -f conftest.$ac_objext
8918
-if { (ac_try="$ac_compile"
8919
-case "(($ac_try" in
8920
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8921
- *) ac_try_echo=$ac_try;;
8923
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8924
-$as_echo "$ac_try_echo") >&5
8925
- (eval "$ac_compile") 2>conftest.er1
8927
- grep -v '^ *+' conftest.er1 >conftest.err
8928
- rm -f conftest.er1
8929
- cat conftest.err >&5
8930
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8931
- (exit $ac_status); } && {
8932
- test -z "$ac_c_werror_flag" ||
8933
- test ! -s conftest.err
8934
- } && test -s conftest.$ac_objext; then
8937
- $as_echo "$as_me: failed program was:" >&5
8938
-sed 's/^/| /' conftest.$ac_ext >&5
8940
- ac_c_werror_flag=$ac_save_c_werror_flag
8942
- cat >conftest.$ac_ext <<_ACEOF
8947
-cat confdefs.h >>conftest.$ac_ext
8948
-cat >>conftest.$ac_ext <<_ACEOF
8949
+if ac_fn_c_try_compile "$LINENO"; then :
8950
+ ac_cv_prog_cc_g=yes
8953
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8954
/* end confdefs.h. */
8957
@@ -12659,42 +11923,33 @@ main ()
8961
-rm -f conftest.$ac_objext
8962
-if { (ac_try="$ac_compile"
8963
-case "(($ac_try" in
8964
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8965
- *) ac_try_echo=$ac_try;;
8967
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8968
-$as_echo "$ac_try_echo") >&5
8969
- (eval "$ac_compile") 2>conftest.er1
8971
- grep -v '^ *+' conftest.er1 >conftest.err
8972
- rm -f conftest.er1
8973
- cat conftest.err >&5
8974
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8975
- (exit $ac_status); } && {
8976
- test -z "$ac_c_werror_flag" ||
8977
- test ! -s conftest.err
8978
- } && test -s conftest.$ac_objext; then
8979
- ac_cv_prog_cc_g=yes
8980
+if ac_fn_c_try_compile "$LINENO"; then :
8983
- $as_echo "$as_me: failed program was:" >&5
8984
-sed 's/^/| /' conftest.$ac_ext >&5
8985
+ ac_c_werror_flag=$ac_save_c_werror_flag
8987
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8988
+/* end confdefs.h. */
8998
+if ac_fn_c_try_compile "$LINENO"; then :
8999
+ ac_cv_prog_cc_g=yes
9002
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9005
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9008
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9009
ac_c_werror_flag=$ac_save_c_werror_flag
9011
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
9012
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
9013
$as_echo "$ac_cv_prog_cc_g" >&6; }
9014
if test "$ac_test_CFLAGS" = set; then
9015
CFLAGS=$ac_save_CFLAGS
9016
@@ -12711,18 +11966,14 @@ else
9020
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
9021
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
9022
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
9023
-if test "${ac_cv_prog_cc_c89+set}" = set; then
9024
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
9025
$as_echo_n "(cached) " >&6
9027
ac_cv_prog_cc_c89=no
9029
-cat >conftest.$ac_ext <<_ACEOF
9032
-cat confdefs.h >>conftest.$ac_ext
9033
-cat >>conftest.$ac_ext <<_ACEOF
9034
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9035
/* end confdefs.h. */
9038
@@ -12779,32 +12030,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
9039
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
9041
CC="$ac_save_CC $ac_arg"
9042
- rm -f conftest.$ac_objext
9043
-if { (ac_try="$ac_compile"
9044
-case "(($ac_try" in
9045
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9046
- *) ac_try_echo=$ac_try;;
9048
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9049
-$as_echo "$ac_try_echo") >&5
9050
- (eval "$ac_compile") 2>conftest.er1
9052
- grep -v '^ *+' conftest.er1 >conftest.err
9053
- rm -f conftest.er1
9054
- cat conftest.err >&5
9055
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9056
- (exit $ac_status); } && {
9057
- test -z "$ac_c_werror_flag" ||
9058
- test ! -s conftest.err
9059
- } && test -s conftest.$ac_objext; then
9060
+ if ac_fn_c_try_compile "$LINENO"; then :
9061
ac_cv_prog_cc_c89=$ac_arg
9063
- $as_echo "$as_me: failed program was:" >&5
9064
-sed 's/^/| /' conftest.$ac_ext >&5
9069
rm -f core conftest.err conftest.$ac_objext
9070
test "x$ac_cv_prog_cc_c89" != "xno" && break
9072
@@ -12815,17 +12043,19 @@ fi
9074
case "x$ac_cv_prog_cc_c89" in
9076
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
9077
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
9078
$as_echo "none needed" >&6; } ;;
9080
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
9081
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
9082
$as_echo "unsupported" >&6; } ;;
9084
CC="$CC $ac_cv_prog_cc_c89"
9085
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
9086
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
9087
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
9089
+if test "x$ac_cv_prog_cc_c89" != xno; then :
9094
ac_cpp='$CPP $CPPFLAGS'
9095
@@ -12835,9 +12065,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
9097
depcc="$CC" am_compiler_list=
9099
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
9100
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
9101
$as_echo_n "checking dependency style of $depcc... " >&6; }
9102
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
9103
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
9104
$as_echo_n "(cached) " >&6
9106
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
9107
@@ -12945,7 +12175,7 @@ else
9111
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
9112
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
9113
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
9114
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
9116
@@ -12960,16 +12190,12 @@ else
9120
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
9121
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
9122
$as_echo_n "checking for ANSI C header files... " >&6; }
9123
-if test "${ac_cv_header_stdc+set}" = set; then
9124
+if test "${ac_cv_header_stdc+set}" = set; then :
9125
$as_echo_n "(cached) " >&6
9127
- cat >conftest.$ac_ext <<_ACEOF
9130
-cat confdefs.h >>conftest.$ac_ext
9131
-cat >>conftest.$ac_ext <<_ACEOF
9132
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9133
/* end confdefs.h. */
9136
@@ -12984,48 +12210,23 @@ main ()
9140
-rm -f conftest.$ac_objext
9141
-if { (ac_try="$ac_compile"
9142
-case "(($ac_try" in
9143
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9144
- *) ac_try_echo=$ac_try;;
9146
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9147
-$as_echo "$ac_try_echo") >&5
9148
- (eval "$ac_compile") 2>conftest.er1
9150
- grep -v '^ *+' conftest.er1 >conftest.err
9151
- rm -f conftest.er1
9152
- cat conftest.err >&5
9153
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9154
- (exit $ac_status); } && {
9155
- test -z "$ac_c_werror_flag" ||
9156
- test ! -s conftest.err
9157
- } && test -s conftest.$ac_objext; then
9158
+if ac_fn_c_try_compile "$LINENO"; then :
9159
ac_cv_header_stdc=yes
9161
- $as_echo "$as_me: failed program was:" >&5
9162
-sed 's/^/| /' conftest.$ac_ext >&5
9164
- ac_cv_header_stdc=no
9165
+ ac_cv_header_stdc=no
9168
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9170
if test $ac_cv_header_stdc = yes; then
9171
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
9172
- cat >conftest.$ac_ext <<_ACEOF
9175
-cat confdefs.h >>conftest.$ac_ext
9176
-cat >>conftest.$ac_ext <<_ACEOF
9177
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9178
/* end confdefs.h. */
9182
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
9183
- $EGREP "memchr" >/dev/null 2>&1; then
9185
+ $EGREP "memchr" >/dev/null 2>&1; then :
9188
ac_cv_header_stdc=no
9190
@@ -13035,18 +12236,14 @@ fi
9192
if test $ac_cv_header_stdc = yes; then
9193
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
9194
- cat >conftest.$ac_ext <<_ACEOF
9197
-cat confdefs.h >>conftest.$ac_ext
9198
-cat >>conftest.$ac_ext <<_ACEOF
9199
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9200
/* end confdefs.h. */
9204
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
9205
- $EGREP "free" >/dev/null 2>&1; then
9207
+ $EGREP "free" >/dev/null 2>&1; then :
9210
ac_cv_header_stdc=no
9212
@@ -13056,14 +12253,10 @@ fi
9214
if test $ac_cv_header_stdc = yes; then
9215
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
9216
- if test "$cross_compiling" = yes; then
9217
+ if test "$cross_compiling" = yes; then :
9220
- cat >conftest.$ac_ext <<_ACEOF
9223
-cat confdefs.h >>conftest.$ac_ext
9224
-cat >>conftest.$ac_ext <<_ACEOF
9225
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9226
/* end confdefs.h. */
9229
@@ -13082,575 +12275,127 @@ cat >>conftest.$ac_ext <<_ACEOF
9234
- for (i = 0; i < 256; i++)
9235
- if (XOR (islower (i), ISLOWER (i))
9236
- || toupper (i) != TOUPPER (i))
9241
-rm -f conftest$ac_exeext
9242
-if { (ac_try="$ac_link"
9243
-case "(($ac_try" in
9244
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9245
- *) ac_try_echo=$ac_try;;
9247
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9248
-$as_echo "$ac_try_echo") >&5
9249
- (eval "$ac_link") 2>&5
9251
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9252
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9253
- { (case "(($ac_try" in
9254
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9255
- *) ac_try_echo=$ac_try;;
9257
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9258
-$as_echo "$ac_try_echo") >&5
9259
- (eval "$ac_try") 2>&5
9261
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9262
- (exit $ac_status); }; }; then
9265
- $as_echo "$as_me: program exited with status $ac_status" >&5
9266
-$as_echo "$as_me: failed program was:" >&5
9267
-sed 's/^/| /' conftest.$ac_ext >&5
9269
-( exit $ac_status )
9270
-ac_cv_header_stdc=no
9272
-rm -rf conftest.dSYM
9273
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9279
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
9280
-$as_echo "$ac_cv_header_stdc" >&6; }
9281
-if test $ac_cv_header_stdc = yes; then
9283
-cat >>confdefs.h <<\_ACEOF
9284
-#define STDC_HEADERS 1
9289
-if test "x${datadir}" = 'x${prefix}/share'; then
9290
- if test "x${prefix}" = "xNONE"; then
9292
-cat >>confdefs.h <<_ACEOF
9293
-#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9298
-cat >>confdefs.h <<_ACEOF
9299
-#define PACKAGE_DATA_DIR "${prefix}/share/"
9303
- elif test "x${datadir}" = 'x${datarootdir}'; then
9304
- if test "x${datarootdir}" = 'x${prefix}/share'; then
9305
- if test "x${prefix}" = "xNONE"; then
9307
-cat >>confdefs.h <<_ACEOF
9308
-#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9313
-cat >>confdefs.h <<_ACEOF
9314
-#define PACKAGE_DATA_DIR "${prefix}/share/"
9320
-cat >>confdefs.h <<_ACEOF
9321
-#define PACKAGE_DATA_DIR "${datarootdir}/"
9327
-cat >>confdefs.h <<_ACEOF
9328
-#define PACKAGE_DATA_DIR "${datadir}/"
9335
-for ac_header in camlib.h
9337
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9338
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9339
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9340
-$as_echo_n "checking for $ac_header... " >&6; }
9341
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9342
- $as_echo_n "(cached) " >&6
9344
-ac_res=`eval 'as_val=${'$as_ac_Header'}
9345
- $as_echo "$as_val"'`
9346
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9347
-$as_echo "$ac_res" >&6; }
9349
- # Is the header compilable?
9350
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
9351
-$as_echo_n "checking $ac_header usability... " >&6; }
9352
-cat >conftest.$ac_ext <<_ACEOF
9355
-cat confdefs.h >>conftest.$ac_ext
9356
-cat >>conftest.$ac_ext <<_ACEOF
9357
-/* end confdefs.h. */
9358
-$ac_includes_default
9359
-#include <$ac_header>
9361
-rm -f conftest.$ac_objext
9362
-if { (ac_try="$ac_compile"
9363
-case "(($ac_try" in
9364
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9365
- *) ac_try_echo=$ac_try;;
9367
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9368
-$as_echo "$ac_try_echo") >&5
9369
- (eval "$ac_compile") 2>conftest.er1
9371
- grep -v '^ *+' conftest.er1 >conftest.err
9372
- rm -f conftest.er1
9373
- cat conftest.err >&5
9374
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9375
- (exit $ac_status); } && {
9376
- test -z "$ac_c_werror_flag" ||
9377
- test ! -s conftest.err
9378
- } && test -s conftest.$ac_objext; then
9379
- ac_header_compiler=yes
9381
- $as_echo "$as_me: failed program was:" >&5
9382
-sed 's/^/| /' conftest.$ac_ext >&5
9384
- ac_header_compiler=no
9387
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9388
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
9389
-$as_echo "$ac_header_compiler" >&6; }
9391
-# Is the header present?
9392
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
9393
-$as_echo_n "checking $ac_header presence... " >&6; }
9394
-cat >conftest.$ac_ext <<_ACEOF
9397
-cat confdefs.h >>conftest.$ac_ext
9398
-cat >>conftest.$ac_ext <<_ACEOF
9399
-/* end confdefs.h. */
9400
-#include <$ac_header>
9402
-if { (ac_try="$ac_cpp conftest.$ac_ext"
9403
-case "(($ac_try" in
9404
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9405
- *) ac_try_echo=$ac_try;;
9407
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9408
-$as_echo "$ac_try_echo") >&5
9409
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
9411
- grep -v '^ *+' conftest.er1 >conftest.err
9412
- rm -f conftest.er1
9413
- cat conftest.err >&5
9414
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9415
- (exit $ac_status); } >/dev/null && {
9416
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
9417
- test ! -s conftest.err
9419
- ac_header_preproc=yes
9421
- $as_echo "$as_me: failed program was:" >&5
9422
-sed 's/^/| /' conftest.$ac_ext >&5
9424
- ac_header_preproc=no
9427
-rm -f conftest.err conftest.$ac_ext
9428
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
9429
-$as_echo "$ac_header_preproc" >&6; }
9431
-# So? What about this header?
9432
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
9434
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
9435
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
9436
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
9437
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
9438
- ac_header_preproc=yes
9441
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
9442
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
9443
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
9444
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
9445
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
9446
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
9447
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
9448
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
9449
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
9450
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
9451
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
9452
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
9456
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9457
-$as_echo_n "checking for $ac_header... " >&6; }
9458
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9459
- $as_echo_n "(cached) " >&6
9461
- eval "$as_ac_Header=\$ac_header_preproc"
9463
-ac_res=`eval 'as_val=${'$as_ac_Header'}
9464
- $as_echo "$as_val"'`
9465
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9466
-$as_echo "$ac_res" >&6; }
9469
-as_val=`eval 'as_val=${'$as_ac_Header'}
9470
- $as_echo "$as_val"'`
9471
- if test "x$as_val" = x""yes; then
9472
- cat >>confdefs.h <<_ACEOF
9473
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
9483
-{ $as_echo "$as_me:$LINENO: checking for sg_io_hdr_t" >&5
9484
-$as_echo_n "checking for sg_io_hdr_t... " >&6; }
9485
-if test "${ac_cv_type_sg_io_hdr_t+set}" = set; then
9486
- $as_echo_n "(cached) " >&6
9488
- ac_cv_type_sg_io_hdr_t=no
9489
-cat >conftest.$ac_ext <<_ACEOF
9492
-cat confdefs.h >>conftest.$ac_ext
9493
-cat >>conftest.$ac_ext <<_ACEOF
9494
-/* end confdefs.h. */
9495
-#include <sys/types.h>
9496
- #include <scsi/sg.h>
9501
-if (sizeof (sg_io_hdr_t))
9507
-rm -f conftest.$ac_objext
9508
-if { (ac_try="$ac_compile"
9509
-case "(($ac_try" in
9510
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9511
- *) ac_try_echo=$ac_try;;
9513
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9514
-$as_echo "$ac_try_echo") >&5
9515
- (eval "$ac_compile") 2>conftest.er1
9517
- grep -v '^ *+' conftest.er1 >conftest.err
9518
- rm -f conftest.er1
9519
- cat conftest.err >&5
9520
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9521
- (exit $ac_status); } && {
9522
- test -z "$ac_c_werror_flag" ||
9523
- test ! -s conftest.err
9524
- } && test -s conftest.$ac_objext; then
9525
- cat >conftest.$ac_ext <<_ACEOF
9528
-cat confdefs.h >>conftest.$ac_ext
9529
-cat >>conftest.$ac_ext <<_ACEOF
9530
-/* end confdefs.h. */
9531
-#include <sys/types.h>
9532
- #include <scsi/sg.h>
9537
-if (sizeof ((sg_io_hdr_t)))
9541
+ for (i = 0; i < 256; i++)
9542
+ if (XOR (islower (i), ISLOWER (i))
9543
+ || toupper (i) != TOUPPER (i))
9548
-rm -f conftest.$ac_objext
9549
-if { (ac_try="$ac_compile"
9550
-case "(($ac_try" in
9551
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9552
- *) ac_try_echo=$ac_try;;
9554
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9555
-$as_echo "$ac_try_echo") >&5
9556
- (eval "$ac_compile") 2>conftest.er1
9558
- grep -v '^ *+' conftest.er1 >conftest.err
9559
- rm -f conftest.er1
9560
- cat conftest.err >&5
9561
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9562
- (exit $ac_status); } && {
9563
- test -z "$ac_c_werror_flag" ||
9564
- test ! -s conftest.err
9565
- } && test -s conftest.$ac_objext; then
9568
- $as_echo "$as_me: failed program was:" >&5
9569
-sed 's/^/| /' conftest.$ac_ext >&5
9570
+if ac_fn_c_try_run "$LINENO"; then :
9572
- ac_cv_type_sg_io_hdr_t=yes
9574
+ ac_cv_header_stdc=no
9576
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
9577
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
9580
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9582
- $as_echo "$as_me: failed program was:" >&5
9583
-sed 's/^/| /' conftest.$ac_ext >&5
9586
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
9587
+$as_echo "$ac_cv_header_stdc" >&6; }
9588
+if test $ac_cv_header_stdc = yes; then
9590
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
9594
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9596
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sg_io_hdr_t" >&5
9597
-$as_echo "$ac_cv_type_sg_io_hdr_t" >&6; }
9598
-if test "x$ac_cv_type_sg_io_hdr_t" = x""yes; then
9599
+if test "x${datadir}" = 'x${prefix}/share'; then
9600
+ if test "x${prefix}" = "xNONE"; then
9602
cat >>confdefs.h <<_ACEOF
9603
-#define HAVE_SG_IO_HDR_T 1
9604
+#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9613
+cat >>confdefs.h <<_ACEOF
9614
+#define PACKAGE_DATA_DIR "${prefix}/share/"
9617
-{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5
9618
-$as_echo_n "checking for scsireq_t... " >&6; }
9619
-if test "${ac_cv_type_scsireq_t+set}" = set; then
9620
- $as_echo_n "(cached) " >&6
9622
- ac_cv_type_scsireq_t=no
9623
-cat >conftest.$ac_ext <<_ACEOF
9626
+ elif test "x${datadir}" = 'x${datarootdir}'; then
9627
+ if test "x${datarootdir}" = 'x${prefix}/share'; then
9628
+ if test "x${prefix}" = "xNONE"; then
9630
+cat >>confdefs.h <<_ACEOF
9631
+#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
9633
-cat confdefs.h >>conftest.$ac_ext
9634
-cat >>conftest.$ac_ext <<_ACEOF
9635
-/* end confdefs.h. */
9636
-#include <sys/types.h>
9637
- #include <sys/scsiio.h>
9642
-if (sizeof (scsireq_t))
9649
+cat >>confdefs.h <<_ACEOF
9650
+#define PACKAGE_DATA_DIR "${prefix}/share/"
9652
-rm -f conftest.$ac_objext
9653
-if { (ac_try="$ac_compile"
9654
-case "(($ac_try" in
9655
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9656
- *) ac_try_echo=$ac_try;;
9658
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9659
-$as_echo "$ac_try_echo") >&5
9660
- (eval "$ac_compile") 2>conftest.er1
9662
- grep -v '^ *+' conftest.er1 >conftest.err
9663
- rm -f conftest.er1
9664
- cat conftest.err >&5
9665
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9666
- (exit $ac_status); } && {
9667
- test -z "$ac_c_werror_flag" ||
9668
- test ! -s conftest.err
9669
- } && test -s conftest.$ac_objext; then
9670
- cat >conftest.$ac_ext <<_ACEOF
9676
+cat >>confdefs.h <<_ACEOF
9677
+#define PACKAGE_DATA_DIR "${datarootdir}/"
9679
-cat confdefs.h >>conftest.$ac_ext
9680
-cat >>conftest.$ac_ext <<_ACEOF
9681
-/* end confdefs.h. */
9682
-#include <sys/types.h>
9683
- #include <sys/scsiio.h>
9688
-if (sizeof ((scsireq_t)))
9696
+cat >>confdefs.h <<_ACEOF
9697
+#define PACKAGE_DATA_DIR "${datadir}/"
9699
-rm -f conftest.$ac_objext
9700
-if { (ac_try="$ac_compile"
9701
-case "(($ac_try" in
9702
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9703
- *) ac_try_echo=$ac_try;;
9705
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9706
-$as_echo "$ac_try_echo") >&5
9707
- (eval "$ac_compile") 2>conftest.er1
9709
- grep -v '^ *+' conftest.er1 >conftest.err
9710
- rm -f conftest.er1
9711
- cat conftest.err >&5
9712
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9713
- (exit $ac_status); } && {
9714
- test -z "$ac_c_werror_flag" ||
9715
- test ! -s conftest.err
9716
- } && test -s conftest.$ac_objext; then
9719
- $as_echo "$as_me: failed program was:" >&5
9720
-sed 's/^/| /' conftest.$ac_ext >&5
9722
- ac_cv_type_scsireq_t=yes
9725
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9727
+for ac_header in camlib.h
9729
+ ac_fn_c_check_header_mongrel "$LINENO" "camlib.h" "ac_cv_header_camlib_h" "$ac_includes_default"
9730
+if test "x$ac_cv_header_camlib_h" = x""yes; then :
9731
+ cat >>confdefs.h <<_ACEOF
9732
+#define HAVE_CAMLIB_H 1
9736
- $as_echo "$as_me: failed program was:" >&5
9737
-sed 's/^/| /' conftest.$ac_ext >&5
9745
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9747
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scsireq_t" >&5
9748
-$as_echo "$ac_cv_type_scsireq_t" >&6; }
9749
-if test "x$ac_cv_type_scsireq_t" = x""yes; then
9750
+ac_fn_c_check_type "$LINENO" "sg_io_hdr_t" "ac_cv_type_sg_io_hdr_t" "#include <sys/types.h>
9751
+ #include <scsi/sg.h>
9753
+if test "x$ac_cv_type_sg_io_hdr_t" = x""yes; then :
9755
cat >>confdefs.h <<_ACEOF
9756
-#define HAVE_SCSIREQ_T 1
9757
+#define HAVE_SG_IO_HDR_T 1
9768
-{ $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5
9769
-$as_echo_n "checking for struct uscsi_cmd... " >&6; }
9770
-if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then
9771
- $as_echo_n "(cached) " >&6
9773
- ac_cv_type_struct_uscsi_cmd=no
9774
-cat >conftest.$ac_ext <<_ACEOF
9777
-cat confdefs.h >>conftest.$ac_ext
9778
-cat >>conftest.$ac_ext <<_ACEOF
9779
-/* end confdefs.h. */
9780
-#include <sys/types.h>
9781
- #include <sys/scsi/impl/uscsi.h>
9782
+ac_fn_c_check_type "$LINENO" "scsireq_t" "ac_cv_type_scsireq_t" "#include <sys/types.h>
9783
+ #include <sys/scsiio.h>
9785
+if test "x$ac_cv_type_scsireq_t" = x""yes; then :
9790
-if (sizeof (struct uscsi_cmd))
9796
-rm -f conftest.$ac_objext
9797
-if { (ac_try="$ac_compile"
9798
-case "(($ac_try" in
9799
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9800
- *) ac_try_echo=$ac_try;;
9802
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9803
-$as_echo "$ac_try_echo") >&5
9804
- (eval "$ac_compile") 2>conftest.er1
9806
- grep -v '^ *+' conftest.er1 >conftest.err
9807
- rm -f conftest.er1
9808
- cat conftest.err >&5
9809
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9810
- (exit $ac_status); } && {
9811
- test -z "$ac_c_werror_flag" ||
9812
- test ! -s conftest.err
9813
- } && test -s conftest.$ac_objext; then
9814
- cat >conftest.$ac_ext <<_ACEOF
9816
+cat >>confdefs.h <<_ACEOF
9817
+#define HAVE_SCSIREQ_T 1
9819
-cat confdefs.h >>conftest.$ac_ext
9820
-cat >>conftest.$ac_ext <<_ACEOF
9821
-/* end confdefs.h. */
9822
-#include <sys/types.h>
9823
- #include <sys/scsi/impl/uscsi.h>
9828
-if (sizeof ((struct uscsi_cmd)))
9834
-rm -f conftest.$ac_objext
9835
-if { (ac_try="$ac_compile"
9836
-case "(($ac_try" in
9837
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9838
- *) ac_try_echo=$ac_try;;
9840
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9841
-$as_echo "$ac_try_echo") >&5
9842
- (eval "$ac_compile") 2>conftest.er1
9844
- grep -v '^ *+' conftest.er1 >conftest.err
9845
- rm -f conftest.er1
9846
- cat conftest.err >&5
9847
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9848
- (exit $ac_status); } && {
9849
- test -z "$ac_c_werror_flag" ||
9850
- test ! -s conftest.err
9851
- } && test -s conftest.$ac_objext; then
9855
- $as_echo "$as_me: failed program was:" >&5
9856
-sed 's/^/| /' conftest.$ac_ext >&5
9858
- ac_cv_type_struct_uscsi_cmd=yes
9862
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9864
- $as_echo "$as_me: failed program was:" >&5
9865
-sed 's/^/| /' conftest.$ac_ext >&5
9870
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9872
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_uscsi_cmd" >&5
9873
-$as_echo "$ac_cv_type_struct_uscsi_cmd" >&6; }
9874
-if test "x$ac_cv_type_struct_uscsi_cmd" = x""yes; then
9875
+ac_fn_c_check_type "$LINENO" "struct uscsi_cmd" "ac_cv_type_struct_uscsi_cmd" "#include <sys/types.h>
9876
+ #include <sys/scsi/impl/uscsi.h>
9878
+if test "x$ac_cv_type_struct_uscsi_cmd" = x""yes; then :
9880
cat >>confdefs.h <<_ACEOF
9881
#define HAVE_STRUCT_USCSI_CMD 1
9882
@@ -13671,9 +12416,7 @@ elif test x"$has_scsiio" = x"yes"; then
9883
elif test x"$has_uscsi" = x"yes"; then
9886
- { { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
9887
-$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
9888
- { (exit 1); exit 1; }; }
9889
+ as_fn_error "Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." "$LINENO" 5
9892
if test x"$has_cam" = "xyes"; then
9893
@@ -13711,15 +12454,15 @@ fi
9896
# Check whether --enable-largefile was given.
9897
-if test "${enable_largefile+set}" = set; then
9898
+if test "${enable_largefile+set}" = set; then :
9899
enableval=$enable_largefile;
9902
if test "$enable_largefile" != no; then
9904
- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
9905
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
9906
$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
9907
-if test "${ac_cv_sys_largefile_CC+set}" = set; then
9908
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
9909
$as_echo_n "(cached) " >&6
9911
ac_cv_sys_largefile_CC=no
9912
@@ -13728,11 +12471,7 @@ else
9914
# IRIX 6.2 and later do not support large files by default,
9915
# so use the C compiler's -n32 option if that helps.
9916
- cat >conftest.$ac_ext <<_ACEOF
9919
-cat confdefs.h >>conftest.$ac_ext
9920
-cat >>conftest.$ac_ext <<_ACEOF
9921
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9922
/* end confdefs.h. */
9923
#include <sys/types.h>
9924
/* Check that off_t can represent 2**63 - 1 correctly.
9925
@@ -13751,60 +12490,14 @@ main ()
9929
- rm -f conftest.$ac_objext
9930
-if { (ac_try="$ac_compile"
9931
-case "(($ac_try" in
9932
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9933
- *) ac_try_echo=$ac_try;;
9935
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9936
-$as_echo "$ac_try_echo") >&5
9937
- (eval "$ac_compile") 2>conftest.er1
9939
- grep -v '^ *+' conftest.er1 >conftest.err
9940
- rm -f conftest.er1
9941
- cat conftest.err >&5
9942
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9943
- (exit $ac_status); } && {
9944
- test -z "$ac_c_werror_flag" ||
9945
- test ! -s conftest.err
9946
- } && test -s conftest.$ac_objext; then
9947
+ if ac_fn_c_try_compile "$LINENO"; then :
9950
- $as_echo "$as_me: failed program was:" >&5
9951
-sed 's/^/| /' conftest.$ac_ext >&5
9956
rm -f core conftest.err conftest.$ac_objext
9958
- rm -f conftest.$ac_objext
9959
-if { (ac_try="$ac_compile"
9960
-case "(($ac_try" in
9961
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9962
- *) ac_try_echo=$ac_try;;
9964
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9965
-$as_echo "$ac_try_echo") >&5
9966
- (eval "$ac_compile") 2>conftest.er1
9968
- grep -v '^ *+' conftest.er1 >conftest.err
9969
- rm -f conftest.er1
9970
- cat conftest.err >&5
9971
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9972
- (exit $ac_status); } && {
9973
- test -z "$ac_c_werror_flag" ||
9974
- test ! -s conftest.err
9975
- } && test -s conftest.$ac_objext; then
9976
+ if ac_fn_c_try_compile "$LINENO"; then :
9977
ac_cv_sys_largefile_CC=' -n32'; break
9979
- $as_echo "$as_me: failed program was:" >&5
9980
-sed 's/^/| /' conftest.$ac_ext >&5
9985
rm -f core conftest.err conftest.$ac_objext
9988
@@ -13812,23 +12505,19 @@ rm -f core conftest.err conftest.$ac_obj
9989
rm -f conftest.$ac_ext
9992
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
9993
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
9994
$as_echo "$ac_cv_sys_largefile_CC" >&6; }
9995
if test "$ac_cv_sys_largefile_CC" != no; then
9996
CC=$CC$ac_cv_sys_largefile_CC
9999
- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
10000
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
10001
$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
10002
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then
10003
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
10004
$as_echo_n "(cached) " >&6
10007
- cat >conftest.$ac_ext <<_ACEOF
10010
-cat confdefs.h >>conftest.$ac_ext
10011
-cat >>conftest.$ac_ext <<_ACEOF
10012
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10013
/* end confdefs.h. */
10014
#include <sys/types.h>
10015
/* Check that off_t can represent 2**63 - 1 correctly.
10016
@@ -13847,38 +12536,11 @@ main ()
10020
-rm -f conftest.$ac_objext
10021
-if { (ac_try="$ac_compile"
10022
-case "(($ac_try" in
10023
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10024
- *) ac_try_echo=$ac_try;;
10026
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10027
-$as_echo "$ac_try_echo") >&5
10028
- (eval "$ac_compile") 2>conftest.er1
10030
- grep -v '^ *+' conftest.er1 >conftest.err
10031
- rm -f conftest.er1
10032
- cat conftest.err >&5
10033
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10034
- (exit $ac_status); } && {
10035
- test -z "$ac_c_werror_flag" ||
10036
- test ! -s conftest.err
10037
- } && test -s conftest.$ac_objext; then
10038
+if ac_fn_c_try_compile "$LINENO"; then :
10039
ac_cv_sys_file_offset_bits=no; break
10041
- $as_echo "$as_me: failed program was:" >&5
10042
-sed 's/^/| /' conftest.$ac_ext >&5
10047
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10048
- cat >conftest.$ac_ext <<_ACEOF
10051
-cat confdefs.h >>conftest.$ac_ext
10052
-cat >>conftest.$ac_ext <<_ACEOF
10053
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10054
/* end confdefs.h. */
10055
#define _FILE_OFFSET_BITS 64
10056
#include <sys/types.h>
10057
@@ -13887,49 +12549,26 @@ cat >>conftest.$ac_ext <<_ACEOF
10058
since some C++ compilers masquerading as C compilers
10059
incorrectly reject 9223372036854775807. */
10060
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
10061
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
10062
- && LARGE_OFF_T % 2147483647 == 1)
10072
-rm -f conftest.$ac_objext
10073
-if { (ac_try="$ac_compile"
10074
-case "(($ac_try" in
10075
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10076
- *) ac_try_echo=$ac_try;;
10078
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10079
-$as_echo "$ac_try_echo") >&5
10080
- (eval "$ac_compile") 2>conftest.er1
10082
- grep -v '^ *+' conftest.er1 >conftest.err
10083
- rm -f conftest.er1
10084
- cat conftest.err >&5
10085
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10086
- (exit $ac_status); } && {
10087
- test -z "$ac_c_werror_flag" ||
10088
- test ! -s conftest.err
10089
- } && test -s conftest.$ac_objext; then
10090
- ac_cv_sys_file_offset_bits=64; break
10092
- $as_echo "$as_me: failed program was:" >&5
10093
-sed 's/^/| /' conftest.$ac_ext >&5
10095
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
10096
+ && LARGE_OFF_T % 2147483647 == 1)
10106
+if ac_fn_c_try_compile "$LINENO"; then :
10107
+ ac_cv_sys_file_offset_bits=64; break
10110
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10111
ac_cv_sys_file_offset_bits=unknown
10115
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
10116
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
10117
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
10118
case $ac_cv_sys_file_offset_bits in #(
10120
@@ -13941,17 +12580,13 @@ _ACEOF
10123
if test $ac_cv_sys_file_offset_bits = unknown; then
10124
- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
10125
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
10126
$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
10127
-if test "${ac_cv_sys_large_files+set}" = set; then
10128
+if test "${ac_cv_sys_large_files+set}" = set; then :
10129
$as_echo_n "(cached) " >&6
10132
- cat >conftest.$ac_ext <<_ACEOF
10135
-cat confdefs.h >>conftest.$ac_ext
10136
-cat >>conftest.$ac_ext <<_ACEOF
10137
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10138
/* end confdefs.h. */
10139
#include <sys/types.h>
10140
/* Check that off_t can represent 2**63 - 1 correctly.
10141
@@ -13970,38 +12605,11 @@ main ()
10145
-rm -f conftest.$ac_objext
10146
-if { (ac_try="$ac_compile"
10147
-case "(($ac_try" in
10148
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10149
- *) ac_try_echo=$ac_try;;
10151
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10152
-$as_echo "$ac_try_echo") >&5
10153
- (eval "$ac_compile") 2>conftest.er1
10155
- grep -v '^ *+' conftest.er1 >conftest.err
10156
- rm -f conftest.er1
10157
- cat conftest.err >&5
10158
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10159
- (exit $ac_status); } && {
10160
- test -z "$ac_c_werror_flag" ||
10161
- test ! -s conftest.err
10162
- } && test -s conftest.$ac_objext; then
10163
+if ac_fn_c_try_compile "$LINENO"; then :
10164
ac_cv_sys_large_files=no; break
10166
- $as_echo "$as_me: failed program was:" >&5
10167
-sed 's/^/| /' conftest.$ac_ext >&5
10172
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10173
- cat >conftest.$ac_ext <<_ACEOF
10176
-cat confdefs.h >>conftest.$ac_ext
10177
-cat >>conftest.$ac_ext <<_ACEOF
10178
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10179
/* end confdefs.h. */
10180
#define _LARGE_FILES 1
10181
#include <sys/types.h>
10182
@@ -14021,38 +12629,15 @@ main ()
10186
-rm -f conftest.$ac_objext
10187
-if { (ac_try="$ac_compile"
10188
-case "(($ac_try" in
10189
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10190
- *) ac_try_echo=$ac_try;;
10192
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10193
-$as_echo "$ac_try_echo") >&5
10194
- (eval "$ac_compile") 2>conftest.er1
10196
- grep -v '^ *+' conftest.er1 >conftest.err
10197
- rm -f conftest.er1
10198
- cat conftest.err >&5
10199
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10200
- (exit $ac_status); } && {
10201
- test -z "$ac_c_werror_flag" ||
10202
- test ! -s conftest.err
10203
- } && test -s conftest.$ac_objext; then
10204
+if ac_fn_c_try_compile "$LINENO"; then :
10205
ac_cv_sys_large_files=1; break
10207
- $as_echo "$as_me: failed program was:" >&5
10208
-sed 's/^/| /' conftest.$ac_ext >&5
10213
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10214
ac_cv_sys_large_files=unknown
10218
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
10219
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
10220
$as_echo "$ac_cv_sys_large_files" >&6; }
10221
case $ac_cv_sys_large_files in #(
10223
@@ -14084,24 +12669,25 @@ CANBERRA_REQUIRED=0.1
10227
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GSTREAMER" >&5
10228
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GSTREAMER" >&5
10229
$as_echo_n "checking for BRASERO_GSTREAMER... " >&6; }
10231
-if test -n "$BRASERO_GSTREAMER_CFLAGS"; then
10232
- pkg_cv_BRASERO_GSTREAMER_CFLAGS="$BRASERO_GSTREAMER_CFLAGS"
10233
- elif test -n "$PKG_CONFIG"; then
10234
- if test -n "$PKG_CONFIG" && \
10235
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10236
+if test -n "$PKG_CONFIG"; then
10237
+ if test -n "$BRASERO_GSTREAMER_CFLAGS"; then
10238
+ pkg_cv_BRASERO_GSTREAMER_CFLAGS="$BRASERO_GSTREAMER_CFLAGS"
10240
+ if test -n "$PKG_CONFIG" && \
10241
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10242
gstreamer-0.10 >= \$GSTREAMER_REQUIRED \\
10243
gstreamer-interfaces-0.10 \\
10244
- gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\"") >&5
10245
+ gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\""; } >&5
10246
($PKG_CONFIG --exists --print-errors "\
10247
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10248
gstreamer-interfaces-0.10 \
10249
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED") 2>&5
10251
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10252
- (exit $ac_status); }; then
10253
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10254
+ test $ac_status = 0; }; then
10255
pkg_cv_BRASERO_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "\
10256
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10257
gstreamer-interfaces-0.10 \
10258
@@ -14109,24 +12695,26 @@ if test -n "$BRASERO_GSTREAMER_CFLAGS";
10263
- pkg_failed=untried
10266
+ pkg_failed=untried
10268
-if test -n "$BRASERO_GSTREAMER_LIBS"; then
10269
- pkg_cv_BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAMER_LIBS"
10270
- elif test -n "$PKG_CONFIG"; then
10271
- if test -n "$PKG_CONFIG" && \
10272
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10273
+if test -n "$PKG_CONFIG"; then
10274
+ if test -n "$BRASERO_GSTREAMER_LIBS"; then
10275
+ pkg_cv_BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAMER_LIBS"
10277
+ if test -n "$PKG_CONFIG" && \
10278
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10279
gstreamer-0.10 >= \$GSTREAMER_REQUIRED \\
10280
gstreamer-interfaces-0.10 \\
10281
- gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\"") >&5
10282
+ gstreamer-plugins-base-0.10 >= \$GSTREAMER_BASE_REQUIRED\""; } >&5
10283
($PKG_CONFIG --exists --print-errors "\
10284
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10285
gstreamer-interfaces-0.10 \
10286
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED") 2>&5
10288
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10289
- (exit $ac_status); }; then
10290
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10291
+ test $ac_status = 0; }; then
10292
pkg_cv_BRASERO_GSTREAMER_LIBS=`$PKG_CONFIG --libs "\
10293
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10294
gstreamer-interfaces-0.10 \
10295
@@ -14134,8 +12722,9 @@ if test -n "$BRASERO_GSTREAMER_LIBS"; th
10300
- pkg_failed=untried
10303
+ pkg_failed=untried
10307
@@ -14148,34 +12737,20 @@ else
10308
_pkg_short_errors_supported=no
10310
if test $_pkg_short_errors_supported = yes; then
10311
- BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10312
+ BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10313
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10314
gstreamer-interfaces-0.10 \
10315
- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED" 2>&1`
10316
+ gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED"`
10318
- BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10319
+ BRASERO_GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10320
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10321
gstreamer-interfaces-0.10 \
10322
- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED" 2>&1`
10323
+ gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED"`
10325
# Put the nasty error message in config.log where it belongs
10326
echo "$BRASERO_GSTREAMER_PKG_ERRORS" >&5
10328
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10329
- gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10330
- gstreamer-interfaces-0.10 \
10331
- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
10333
-$BRASERO_GSTREAMER_PKG_ERRORS
10335
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10336
-installed software in a non-standard prefix.
10338
-Alternatively, you may set the environment variables BRASERO_GSTREAMER_CFLAGS
10339
-and BRASERO_GSTREAMER_LIBS to avoid the need to call pkg-config.
10340
-See the pkg-config man page for more details.
10342
-$as_echo "$as_me: error: Package requirements (\
10343
+ as_fn_error "Package requirements (\
10344
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
10345
gstreamer-interfaces-0.10 \
10346
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
10347
@@ -14188,22 +12763,11 @@ installed software in a non-standard pre
10348
Alternatively, you may set the environment variables BRASERO_GSTREAMER_CFLAGS
10349
and BRASERO_GSTREAMER_LIBS to avoid the need to call pkg-config.
10350
See the pkg-config man page for more details.
10352
- { (exit 1); exit 1; }; }
10354
elif test $pkg_failed = untried; then
10355
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10356
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10357
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10358
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10359
-is in your PATH or set the PKG_CONFIG environment variable to the full
10360
-path to pkg-config.
10362
-Alternatively, you may set the environment variables BRASERO_GSTREAMER_CFLAGS
10363
-and BRASERO_GSTREAMER_LIBS to avoid the need to call pkg-config.
10364
-See the pkg-config man page for more details.
10366
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10367
-See \`config.log' for more details." >&5
10368
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10369
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10370
is in your PATH or set the PKG_CONFIG environment variable to the full
10371
path to pkg-config.
10373
@@ -14212,12 +12776,11 @@ and BRASERO_GSTREAMER_LIBS to avoid the
10374
See the pkg-config man page for more details.
10376
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10377
-See \`config.log' for more details." >&2;}
10378
- { (exit 1); exit 1; }; }; }
10379
+See \`config.log' for more details." "$LINENO" 5; }
10381
BRASERO_GSTREAMER_CFLAGS=$pkg_cv_BRASERO_GSTREAMER_CFLAGS
10382
BRASERO_GSTREAMER_LIBS=$pkg_cv_BRASERO_GSTREAMER_LIBS
10383
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10384
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10385
$as_echo "yes" >&6; }
10388
@@ -14229,46 +12792,50 @@ BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAM
10392
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GIO" >&5
10393
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GIO" >&5
10394
$as_echo_n "checking for BRASERO_GIO... " >&6; }
10396
-if test -n "$BRASERO_GIO_CFLAGS"; then
10397
- pkg_cv_BRASERO_GIO_CFLAGS="$BRASERO_GIO_CFLAGS"
10398
- elif test -n "$PKG_CONFIG"; then
10399
- if test -n "$PKG_CONFIG" && \
10400
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10401
- gio-2.0 >= \$GIO_REQUIRED\"") >&5
10402
+if test -n "$PKG_CONFIG"; then
10403
+ if test -n "$BRASERO_GIO_CFLAGS"; then
10404
+ pkg_cv_BRASERO_GIO_CFLAGS="$BRASERO_GIO_CFLAGS"
10406
+ if test -n "$PKG_CONFIG" && \
10407
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10408
+ gio-2.0 >= \$GIO_REQUIRED\""; } >&5
10409
($PKG_CONFIG --exists --print-errors "\
10410
gio-2.0 >= $GIO_REQUIRED") 2>&5
10412
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10413
- (exit $ac_status); }; then
10414
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10415
+ test $ac_status = 0; }; then
10416
pkg_cv_BRASERO_GIO_CFLAGS=`$PKG_CONFIG --cflags "\
10417
gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
10422
- pkg_failed=untried
10425
+ pkg_failed=untried
10427
-if test -n "$BRASERO_GIO_LIBS"; then
10428
- pkg_cv_BRASERO_GIO_LIBS="$BRASERO_GIO_LIBS"
10429
- elif test -n "$PKG_CONFIG"; then
10430
- if test -n "$PKG_CONFIG" && \
10431
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10432
- gio-2.0 >= \$GIO_REQUIRED\"") >&5
10433
+if test -n "$PKG_CONFIG"; then
10434
+ if test -n "$BRASERO_GIO_LIBS"; then
10435
+ pkg_cv_BRASERO_GIO_LIBS="$BRASERO_GIO_LIBS"
10437
+ if test -n "$PKG_CONFIG" && \
10438
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10439
+ gio-2.0 >= \$GIO_REQUIRED\""; } >&5
10440
($PKG_CONFIG --exists --print-errors "\
10441
gio-2.0 >= $GIO_REQUIRED") 2>&5
10443
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10444
- (exit $ac_status); }; then
10445
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10446
+ test $ac_status = 0; }; then
10447
pkg_cv_BRASERO_GIO_LIBS=`$PKG_CONFIG --libs "\
10448
gio-2.0 >= $GIO_REQUIRED" 2>/dev/null`
10453
- pkg_failed=untried
10456
+ pkg_failed=untried
10460
@@ -14281,28 +12848,16 @@ else
10461
_pkg_short_errors_supported=no
10463
if test $_pkg_short_errors_supported = yes; then
10464
- BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10465
- gio-2.0 >= $GIO_REQUIRED" 2>&1`
10466
+ BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10467
+ gio-2.0 >= $GIO_REQUIRED"`
10469
- BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10470
- gio-2.0 >= $GIO_REQUIRED" 2>&1`
10471
+ BRASERO_GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10472
+ gio-2.0 >= $GIO_REQUIRED"`
10474
# Put the nasty error message in config.log where it belongs
10475
echo "$BRASERO_GIO_PKG_ERRORS" >&5
10477
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10478
- gio-2.0 >= $GIO_REQUIRED) were not met:
10480
-$BRASERO_GIO_PKG_ERRORS
10482
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10483
-installed software in a non-standard prefix.
10485
-Alternatively, you may set the environment variables BRASERO_GIO_CFLAGS
10486
-and BRASERO_GIO_LIBS to avoid the need to call pkg-config.
10487
-See the pkg-config man page for more details.
10489
-$as_echo "$as_me: error: Package requirements (\
10490
+ as_fn_error "Package requirements (\
10491
gio-2.0 >= $GIO_REQUIRED) were not met:
10493
$BRASERO_GIO_PKG_ERRORS
10494
@@ -14313,12 +12868,11 @@ installed software in a non-standard pre
10495
Alternatively, you may set the environment variables BRASERO_GIO_CFLAGS
10496
and BRASERO_GIO_LIBS to avoid the need to call pkg-config.
10497
See the pkg-config man page for more details.
10499
- { (exit 1); exit 1; }; }
10501
elif test $pkg_failed = untried; then
10502
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10503
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10504
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10505
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10506
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10507
is in your PATH or set the PKG_CONFIG environment variable to the full
10508
path to pkg-config.
10510
@@ -14327,22 +12881,11 @@ and BRASERO_GIO_LIBS to avoid the need t
10511
See the pkg-config man page for more details.
10513
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10514
-See \`config.log' for more details." >&5
10515
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10516
-is in your PATH or set the PKG_CONFIG environment variable to the full
10517
-path to pkg-config.
10519
-Alternatively, you may set the environment variables BRASERO_GIO_CFLAGS
10520
-and BRASERO_GIO_LIBS to avoid the need to call pkg-config.
10521
-See the pkg-config man page for more details.
10523
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10524
-See \`config.log' for more details." >&2;}
10525
- { (exit 1); exit 1; }; }; }
10526
+See \`config.log' for more details." "$LINENO" 5; }
10528
BRASERO_GIO_CFLAGS=$pkg_cv_BRASERO_GIO_CFLAGS
10529
BRASERO_GIO_LIBS=$pkg_cv_BRASERO_GIO_LIBS
10530
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10531
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10532
$as_echo "yes" >&6; }
10535
@@ -14352,46 +12895,50 @@ fi
10539
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_LIBXML" >&5
10540
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_LIBXML" >&5
10541
$as_echo_n "checking for BRASERO_LIBXML... " >&6; }
10543
-if test -n "$BRASERO_LIBXML_CFLAGS"; then
10544
- pkg_cv_BRASERO_LIBXML_CFLAGS="$BRASERO_LIBXML_CFLAGS"
10545
- elif test -n "$PKG_CONFIG"; then
10546
- if test -n "$PKG_CONFIG" && \
10547
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10548
- libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
10549
+if test -n "$PKG_CONFIG"; then
10550
+ if test -n "$BRASERO_LIBXML_CFLAGS"; then
10551
+ pkg_cv_BRASERO_LIBXML_CFLAGS="$BRASERO_LIBXML_CFLAGS"
10553
+ if test -n "$PKG_CONFIG" && \
10554
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10555
+ libxml-2.0 >= \$LIBXML2_REQUIRED\""; } >&5
10556
($PKG_CONFIG --exists --print-errors "\
10557
libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
10559
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10560
- (exit $ac_status); }; then
10561
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10562
+ test $ac_status = 0; }; then
10563
pkg_cv_BRASERO_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "\
10564
libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
10569
- pkg_failed=untried
10572
+ pkg_failed=untried
10574
-if test -n "$BRASERO_LIBXML_LIBS"; then
10575
- pkg_cv_BRASERO_LIBXML_LIBS="$BRASERO_LIBXML_LIBS"
10576
- elif test -n "$PKG_CONFIG"; then
10577
- if test -n "$PKG_CONFIG" && \
10578
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10579
- libxml-2.0 >= \$LIBXML2_REQUIRED\"") >&5
10580
+if test -n "$PKG_CONFIG"; then
10581
+ if test -n "$BRASERO_LIBXML_LIBS"; then
10582
+ pkg_cv_BRASERO_LIBXML_LIBS="$BRASERO_LIBXML_LIBS"
10584
+ if test -n "$PKG_CONFIG" && \
10585
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10586
+ libxml-2.0 >= \$LIBXML2_REQUIRED\""; } >&5
10587
($PKG_CONFIG --exists --print-errors "\
10588
libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
10590
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10591
- (exit $ac_status); }; then
10592
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10593
+ test $ac_status = 0; }; then
10594
pkg_cv_BRASERO_LIBXML_LIBS=`$PKG_CONFIG --libs "\
10595
libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
10600
- pkg_failed=untried
10603
+ pkg_failed=untried
10607
@@ -14404,28 +12951,16 @@ else
10608
_pkg_short_errors_supported=no
10610
if test $_pkg_short_errors_supported = yes; then
10611
- BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10612
- libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
10613
+ BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10614
+ libxml-2.0 >= $LIBXML2_REQUIRED"`
10616
- BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10617
- libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
10618
+ BRASERO_LIBXML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10619
+ libxml-2.0 >= $LIBXML2_REQUIRED"`
10621
# Put the nasty error message in config.log where it belongs
10622
echo "$BRASERO_LIBXML_PKG_ERRORS" >&5
10624
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10625
- libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
10627
-$BRASERO_LIBXML_PKG_ERRORS
10629
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10630
-installed software in a non-standard prefix.
10632
-Alternatively, you may set the environment variables BRASERO_LIBXML_CFLAGS
10633
-and BRASERO_LIBXML_LIBS to avoid the need to call pkg-config.
10634
-See the pkg-config man page for more details.
10636
-$as_echo "$as_me: error: Package requirements (\
10637
+ as_fn_error "Package requirements (\
10638
libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
10640
$BRASERO_LIBXML_PKG_ERRORS
10641
@@ -14436,22 +12971,11 @@ installed software in a non-standard pre
10642
Alternatively, you may set the environment variables BRASERO_LIBXML_CFLAGS
10643
and BRASERO_LIBXML_LIBS to avoid the need to call pkg-config.
10644
See the pkg-config man page for more details.
10646
- { (exit 1); exit 1; }; }
10648
elif test $pkg_failed = untried; then
10649
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10650
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10651
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10652
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10653
-is in your PATH or set the PKG_CONFIG environment variable to the full
10654
-path to pkg-config.
10656
-Alternatively, you may set the environment variables BRASERO_LIBXML_CFLAGS
10657
-and BRASERO_LIBXML_LIBS to avoid the need to call pkg-config.
10658
-See the pkg-config man page for more details.
10660
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10661
-See \`config.log' for more details." >&5
10662
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10663
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10664
is in your PATH or set the PKG_CONFIG environment variable to the full
10665
path to pkg-config.
10667
@@ -14460,12 +12984,11 @@ and BRASERO_LIBXML_LIBS to avoid the nee
10668
See the pkg-config man page for more details.
10670
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10671
-See \`config.log' for more details." >&2;}
10672
- { (exit 1); exit 1; }; }; }
10673
+See \`config.log' for more details." "$LINENO" 5; }
10675
BRASERO_LIBXML_CFLAGS=$pkg_cv_BRASERO_LIBXML_CFLAGS
10676
BRASERO_LIBXML_LIBS=$pkg_cv_BRASERO_LIBXML_LIBS
10677
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10678
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10679
$as_echo "yes" >&6; }
10682
@@ -14475,46 +12998,50 @@ fi
10686
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_LIBUNIQUE" >&5
10687
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_LIBUNIQUE" >&5
10688
$as_echo_n "checking for BRASERO_LIBUNIQUE... " >&6; }
10690
-if test -n "$BRASERO_LIBUNIQUE_CFLAGS"; then
10691
- pkg_cv_BRASERO_LIBUNIQUE_CFLAGS="$BRASERO_LIBUNIQUE_CFLAGS"
10692
- elif test -n "$PKG_CONFIG"; then
10693
- if test -n "$PKG_CONFIG" && \
10694
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10695
- unique-1.0 >= \$LIBUNIQUE_REQUIRED\"") >&5
10696
+if test -n "$PKG_CONFIG"; then
10697
+ if test -n "$BRASERO_LIBUNIQUE_CFLAGS"; then
10698
+ pkg_cv_BRASERO_LIBUNIQUE_CFLAGS="$BRASERO_LIBUNIQUE_CFLAGS"
10700
+ if test -n "$PKG_CONFIG" && \
10701
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10702
+ unique-1.0 >= \$LIBUNIQUE_REQUIRED\""; } >&5
10703
($PKG_CONFIG --exists --print-errors "\
10704
unique-1.0 >= $LIBUNIQUE_REQUIRED") 2>&5
10706
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10707
- (exit $ac_status); }; then
10708
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10709
+ test $ac_status = 0; }; then
10710
pkg_cv_BRASERO_LIBUNIQUE_CFLAGS=`$PKG_CONFIG --cflags "\
10711
unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>/dev/null`
10716
- pkg_failed=untried
10719
+ pkg_failed=untried
10721
-if test -n "$BRASERO_LIBUNIQUE_LIBS"; then
10722
- pkg_cv_BRASERO_LIBUNIQUE_LIBS="$BRASERO_LIBUNIQUE_LIBS"
10723
- elif test -n "$PKG_CONFIG"; then
10724
- if test -n "$PKG_CONFIG" && \
10725
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10726
- unique-1.0 >= \$LIBUNIQUE_REQUIRED\"") >&5
10727
+if test -n "$PKG_CONFIG"; then
10728
+ if test -n "$BRASERO_LIBUNIQUE_LIBS"; then
10729
+ pkg_cv_BRASERO_LIBUNIQUE_LIBS="$BRASERO_LIBUNIQUE_LIBS"
10731
+ if test -n "$PKG_CONFIG" && \
10732
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10733
+ unique-1.0 >= \$LIBUNIQUE_REQUIRED\""; } >&5
10734
($PKG_CONFIG --exists --print-errors "\
10735
unique-1.0 >= $LIBUNIQUE_REQUIRED") 2>&5
10737
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10738
- (exit $ac_status); }; then
10739
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10740
+ test $ac_status = 0; }; then
10741
pkg_cv_BRASERO_LIBUNIQUE_LIBS=`$PKG_CONFIG --libs "\
10742
unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>/dev/null`
10747
- pkg_failed=untried
10750
+ pkg_failed=untried
10754
@@ -14527,28 +13054,16 @@ else
10755
_pkg_short_errors_supported=no
10757
if test $_pkg_short_errors_supported = yes; then
10758
- BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10759
- unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>&1`
10760
+ BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10761
+ unique-1.0 >= $LIBUNIQUE_REQUIRED"`
10763
- BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10764
- unique-1.0 >= $LIBUNIQUE_REQUIRED" 2>&1`
10765
+ BRASERO_LIBUNIQUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10766
+ unique-1.0 >= $LIBUNIQUE_REQUIRED"`
10768
# Put the nasty error message in config.log where it belongs
10769
echo "$BRASERO_LIBUNIQUE_PKG_ERRORS" >&5
10771
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10772
- unique-1.0 >= $LIBUNIQUE_REQUIRED) were not met:
10774
-$BRASERO_LIBUNIQUE_PKG_ERRORS
10776
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10777
-installed software in a non-standard prefix.
10779
-Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
10780
-and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
10781
-See the pkg-config man page for more details.
10783
-$as_echo "$as_me: error: Package requirements (\
10784
+ as_fn_error "Package requirements (\
10785
unique-1.0 >= $LIBUNIQUE_REQUIRED) were not met:
10787
$BRASERO_LIBUNIQUE_PKG_ERRORS
10788
@@ -14559,22 +13074,11 @@ installed software in a non-standard pre
10789
Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
10790
and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
10791
See the pkg-config man page for more details.
10793
- { (exit 1); exit 1; }; }
10795
elif test $pkg_failed = untried; then
10796
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10797
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10798
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10799
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10800
-is in your PATH or set the PKG_CONFIG environment variable to the full
10801
-path to pkg-config.
10803
-Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
10804
-and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
10805
-See the pkg-config man page for more details.
10807
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10808
-See \`config.log' for more details." >&5
10809
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10810
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10811
is in your PATH or set the PKG_CONFIG environment variable to the full
10812
path to pkg-config.
10814
@@ -14583,12 +13087,11 @@ and BRASERO_LIBUNIQUE_LIBS to avoid the
10815
See the pkg-config man page for more details.
10817
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10818
-See \`config.log' for more details." >&2;}
10819
- { (exit 1); exit 1; }; }; }
10820
+See \`config.log' for more details." "$LINENO" 5; }
10822
BRASERO_LIBUNIQUE_CFLAGS=$pkg_cv_BRASERO_LIBUNIQUE_CFLAGS
10823
BRASERO_LIBUNIQUE_LIBS=$pkg_cv_BRASERO_LIBUNIQUE_LIBS
10824
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10825
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10826
$as_echo "yes" >&6; }
10829
@@ -14598,46 +13101,50 @@ fi
10833
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GTHREAD" >&5
10834
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GTHREAD" >&5
10835
$as_echo_n "checking for BRASERO_GTHREAD... " >&6; }
10837
-if test -n "$BRASERO_GTHREAD_CFLAGS"; then
10838
- pkg_cv_BRASERO_GTHREAD_CFLAGS="$BRASERO_GTHREAD_CFLAGS"
10839
- elif test -n "$PKG_CONFIG"; then
10840
- if test -n "$PKG_CONFIG" && \
10841
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10842
- gthread-2.0 >= \$GTHREAD_REQUIRED\"") >&5
10843
+if test -n "$PKG_CONFIG"; then
10844
+ if test -n "$BRASERO_GTHREAD_CFLAGS"; then
10845
+ pkg_cv_BRASERO_GTHREAD_CFLAGS="$BRASERO_GTHREAD_CFLAGS"
10847
+ if test -n "$PKG_CONFIG" && \
10848
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10849
+ gthread-2.0 >= \$GTHREAD_REQUIRED\""; } >&5
10850
($PKG_CONFIG --exists --print-errors "\
10851
gthread-2.0 >= $GTHREAD_REQUIRED") 2>&5
10853
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10854
- (exit $ac_status); }; then
10855
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10856
+ test $ac_status = 0; }; then
10857
pkg_cv_BRASERO_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "\
10858
gthread-2.0 >= $GTHREAD_REQUIRED" 2>/dev/null`
10863
- pkg_failed=untried
10866
+ pkg_failed=untried
10868
-if test -n "$BRASERO_GTHREAD_LIBS"; then
10869
- pkg_cv_BRASERO_GTHREAD_LIBS="$BRASERO_GTHREAD_LIBS"
10870
- elif test -n "$PKG_CONFIG"; then
10871
- if test -n "$PKG_CONFIG" && \
10872
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10873
- gthread-2.0 >= \$GTHREAD_REQUIRED\"") >&5
10874
+if test -n "$PKG_CONFIG"; then
10875
+ if test -n "$BRASERO_GTHREAD_LIBS"; then
10876
+ pkg_cv_BRASERO_GTHREAD_LIBS="$BRASERO_GTHREAD_LIBS"
10878
+ if test -n "$PKG_CONFIG" && \
10879
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10880
+ gthread-2.0 >= \$GTHREAD_REQUIRED\""; } >&5
10881
($PKG_CONFIG --exists --print-errors "\
10882
gthread-2.0 >= $GTHREAD_REQUIRED") 2>&5
10884
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10885
- (exit $ac_status); }; then
10886
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10887
+ test $ac_status = 0; }; then
10888
pkg_cv_BRASERO_GTHREAD_LIBS=`$PKG_CONFIG --libs "\
10889
gthread-2.0 >= $GTHREAD_REQUIRED" 2>/dev/null`
10894
- pkg_failed=untried
10897
+ pkg_failed=untried
10901
@@ -14650,16 +13157,16 @@ else
10902
_pkg_short_errors_supported=no
10904
if test $_pkg_short_errors_supported = yes; then
10905
- BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
10906
- gthread-2.0 >= $GTHREAD_REQUIRED" 2>&1`
10907
+ BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
10908
+ gthread-2.0 >= $GTHREAD_REQUIRED"`
10910
- BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
10911
- gthread-2.0 >= $GTHREAD_REQUIRED" 2>&1`
10912
+ BRASERO_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
10913
+ gthread-2.0 >= $GTHREAD_REQUIRED"`
10915
# Put the nasty error message in config.log where it belongs
10916
echo "$BRASERO_GTHREAD_PKG_ERRORS" >&5
10918
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
10919
+ as_fn_error "Package requirements (\
10920
gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
10922
$BRASERO_GTHREAD_PKG_ERRORS
10923
@@ -14670,34 +13177,11 @@ installed software in a non-standard pre
10924
Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
10925
and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
10926
See the pkg-config man page for more details.
10928
-$as_echo "$as_me: error: Package requirements (\
10929
- gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
10931
-$BRASERO_GTHREAD_PKG_ERRORS
10933
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10934
-installed software in a non-standard prefix.
10936
-Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
10937
-and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
10938
-See the pkg-config man page for more details.
10940
- { (exit 1); exit 1; }; }
10942
elif test $pkg_failed = untried; then
10943
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10944
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10945
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10946
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10947
-is in your PATH or set the PKG_CONFIG environment variable to the full
10948
-path to pkg-config.
10950
-Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
10951
-and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
10952
-See the pkg-config man page for more details.
10954
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10955
-See \`config.log' for more details." >&5
10956
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10957
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10958
is in your PATH or set the PKG_CONFIG environment variable to the full
10959
path to pkg-config.
10961
@@ -14706,12 +13190,11 @@ and BRASERO_GTHREAD_LIBS to avoid the ne
10962
See the pkg-config man page for more details.
10964
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10965
-See \`config.log' for more details." >&2;}
10966
- { (exit 1); exit 1; }; }; }
10967
+See \`config.log' for more details." "$LINENO" 5; }
10969
BRASERO_GTHREAD_CFLAGS=$pkg_cv_BRASERO_GTHREAD_CFLAGS
10970
BRASERO_GTHREAD_LIBS=$pkg_cv_BRASERO_GTHREAD_LIBS
10971
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10972
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10973
$as_echo "yes" >&6; }
10976
@@ -14721,52 +13204,56 @@ fi
10980
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GLIB" >&5
10981
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GLIB" >&5
10982
$as_echo_n "checking for BRASERO_GLIB... " >&6; }
10984
-if test -n "$BRASERO_GLIB_CFLAGS"; then
10985
- pkg_cv_BRASERO_GLIB_CFLAGS="$BRASERO_GLIB_CFLAGS"
10986
- elif test -n "$PKG_CONFIG"; then
10987
- if test -n "$PKG_CONFIG" && \
10988
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
10989
+if test -n "$PKG_CONFIG"; then
10990
+ if test -n "$BRASERO_GLIB_CFLAGS"; then
10991
+ pkg_cv_BRASERO_GLIB_CFLAGS="$BRASERO_GLIB_CFLAGS"
10993
+ if test -n "$PKG_CONFIG" && \
10994
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
10995
gobject-2.0 >= \$GLIB_REQUIRED \\
10996
- glib-2.0 >= \$GLIB_REQUIRED\"") >&5
10997
+ glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
10998
($PKG_CONFIG --exists --print-errors "\
10999
gobject-2.0 >= $GLIB_REQUIRED \
11000
glib-2.0 >= $GLIB_REQUIRED") 2>&5
11002
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11003
- (exit $ac_status); }; then
11004
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11005
+ test $ac_status = 0; }; then
11006
pkg_cv_BRASERO_GLIB_CFLAGS=`$PKG_CONFIG --cflags "\
11007
gobject-2.0 >= $GLIB_REQUIRED \
11008
glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
11013
- pkg_failed=untried
11016
+ pkg_failed=untried
11018
-if test -n "$BRASERO_GLIB_LIBS"; then
11019
- pkg_cv_BRASERO_GLIB_LIBS="$BRASERO_GLIB_LIBS"
11020
- elif test -n "$PKG_CONFIG"; then
11021
- if test -n "$PKG_CONFIG" && \
11022
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11023
+if test -n "$PKG_CONFIG"; then
11024
+ if test -n "$BRASERO_GLIB_LIBS"; then
11025
+ pkg_cv_BRASERO_GLIB_LIBS="$BRASERO_GLIB_LIBS"
11027
+ if test -n "$PKG_CONFIG" && \
11028
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11029
gobject-2.0 >= \$GLIB_REQUIRED \\
11030
- glib-2.0 >= \$GLIB_REQUIRED\"") >&5
11031
+ glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
11032
($PKG_CONFIG --exists --print-errors "\
11033
gobject-2.0 >= $GLIB_REQUIRED \
11034
glib-2.0 >= $GLIB_REQUIRED") 2>&5
11036
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11037
- (exit $ac_status); }; then
11038
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11039
+ test $ac_status = 0; }; then
11040
pkg_cv_BRASERO_GLIB_LIBS=`$PKG_CONFIG --libs "\
11041
gobject-2.0 >= $GLIB_REQUIRED \
11042
glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
11047
- pkg_failed=untried
11050
+ pkg_failed=untried
11054
@@ -14779,31 +13266,18 @@ else
11055
_pkg_short_errors_supported=no
11057
if test $_pkg_short_errors_supported = yes; then
11058
- BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11059
+ BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11060
gobject-2.0 >= $GLIB_REQUIRED \
11061
- glib-2.0 >= $GLIB_REQUIRED" 2>&1`
11062
+ glib-2.0 >= $GLIB_REQUIRED"`
11064
- BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11065
+ BRASERO_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11066
gobject-2.0 >= $GLIB_REQUIRED \
11067
- glib-2.0 >= $GLIB_REQUIRED" 2>&1`
11068
+ glib-2.0 >= $GLIB_REQUIRED"`
11070
# Put the nasty error message in config.log where it belongs
11071
echo "$BRASERO_GLIB_PKG_ERRORS" >&5
11073
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11074
- gobject-2.0 >= $GLIB_REQUIRED \
11075
- glib-2.0 >= $GLIB_REQUIRED) were not met:
11077
-$BRASERO_GLIB_PKG_ERRORS
11079
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11080
-installed software in a non-standard prefix.
11082
-Alternatively, you may set the environment variables BRASERO_GLIB_CFLAGS
11083
-and BRASERO_GLIB_LIBS to avoid the need to call pkg-config.
11084
-See the pkg-config man page for more details.
11086
-$as_echo "$as_me: error: Package requirements (\
11087
+ as_fn_error "Package requirements (\
11088
gobject-2.0 >= $GLIB_REQUIRED \
11089
glib-2.0 >= $GLIB_REQUIRED) were not met:
11091
@@ -14815,22 +13289,11 @@ installed software in a non-standard pre
11092
Alternatively, you may set the environment variables BRASERO_GLIB_CFLAGS
11093
and BRASERO_GLIB_LIBS to avoid the need to call pkg-config.
11094
See the pkg-config man page for more details.
11096
- { (exit 1); exit 1; }; }
11098
elif test $pkg_failed = untried; then
11099
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11100
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11101
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11102
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11103
-is in your PATH or set the PKG_CONFIG environment variable to the full
11104
-path to pkg-config.
11106
-Alternatively, you may set the environment variables BRASERO_GLIB_CFLAGS
11107
-and BRASERO_GLIB_LIBS to avoid the need to call pkg-config.
11108
-See the pkg-config man page for more details.
11110
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11111
-See \`config.log' for more details." >&5
11112
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11113
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11114
is in your PATH or set the PKG_CONFIG environment variable to the full
11115
path to pkg-config.
11117
@@ -14839,12 +13302,11 @@ and BRASERO_GLIB_LIBS to avoid the need
11118
See the pkg-config man page for more details.
11120
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11121
-See \`config.log' for more details." >&2;}
11122
- { (exit 1); exit 1; }; }; }
11123
+See \`config.log' for more details." "$LINENO" 5; }
11125
BRASERO_GLIB_CFLAGS=$pkg_cv_BRASERO_GLIB_CFLAGS
11126
BRASERO_GLIB_LIBS=$pkg_cv_BRASERO_GLIB_LIBS
11127
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11128
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11129
$as_echo "yes" >&6; }
11132
@@ -14854,46 +13316,50 @@ fi
11136
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GCONF" >&5
11137
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GCONF" >&5
11138
$as_echo_n "checking for BRASERO_GCONF... " >&6; }
11140
-if test -n "$BRASERO_GCONF_CFLAGS"; then
11141
- pkg_cv_BRASERO_GCONF_CFLAGS="$BRASERO_GCONF_CFLAGS"
11142
- elif test -n "$PKG_CONFIG"; then
11143
- if test -n "$PKG_CONFIG" && \
11144
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11145
- gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
11146
+if test -n "$PKG_CONFIG"; then
11147
+ if test -n "$BRASERO_GCONF_CFLAGS"; then
11148
+ pkg_cv_BRASERO_GCONF_CFLAGS="$BRASERO_GCONF_CFLAGS"
11150
+ if test -n "$PKG_CONFIG" && \
11151
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11152
+ gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
11153
($PKG_CONFIG --exists --print-errors "\
11154
gconf-2.0 >= $GCONF_REQUIRED") 2>&5
11156
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11157
- (exit $ac_status); }; then
11158
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11159
+ test $ac_status = 0; }; then
11160
pkg_cv_BRASERO_GCONF_CFLAGS=`$PKG_CONFIG --cflags "\
11161
gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
11166
- pkg_failed=untried
11169
+ pkg_failed=untried
11171
-if test -n "$BRASERO_GCONF_LIBS"; then
11172
- pkg_cv_BRASERO_GCONF_LIBS="$BRASERO_GCONF_LIBS"
11173
- elif test -n "$PKG_CONFIG"; then
11174
- if test -n "$PKG_CONFIG" && \
11175
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11176
- gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
11177
+if test -n "$PKG_CONFIG"; then
11178
+ if test -n "$BRASERO_GCONF_LIBS"; then
11179
+ pkg_cv_BRASERO_GCONF_LIBS="$BRASERO_GCONF_LIBS"
11181
+ if test -n "$PKG_CONFIG" && \
11182
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11183
+ gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
11184
($PKG_CONFIG --exists --print-errors "\
11185
gconf-2.0 >= $GCONF_REQUIRED") 2>&5
11187
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11188
- (exit $ac_status); }; then
11189
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11190
+ test $ac_status = 0; }; then
11191
pkg_cv_BRASERO_GCONF_LIBS=`$PKG_CONFIG --libs "\
11192
gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
11197
- pkg_failed=untried
11200
+ pkg_failed=untried
11204
@@ -14906,28 +13372,16 @@ else
11205
_pkg_short_errors_supported=no
11207
if test $_pkg_short_errors_supported = yes; then
11208
- BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11209
- gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
11210
+ BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11211
+ gconf-2.0 >= $GCONF_REQUIRED"`
11213
- BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11214
- gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
11215
+ BRASERO_GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11216
+ gconf-2.0 >= $GCONF_REQUIRED"`
11218
# Put the nasty error message in config.log where it belongs
11219
echo "$BRASERO_GCONF_PKG_ERRORS" >&5
11221
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11222
- gconf-2.0 >= $GCONF_REQUIRED) were not met:
11224
-$BRASERO_GCONF_PKG_ERRORS
11226
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11227
-installed software in a non-standard prefix.
11229
-Alternatively, you may set the environment variables BRASERO_GCONF_CFLAGS
11230
-and BRASERO_GCONF_LIBS to avoid the need to call pkg-config.
11231
-See the pkg-config man page for more details.
11233
-$as_echo "$as_me: error: Package requirements (\
11234
+ as_fn_error "Package requirements (\
11235
gconf-2.0 >= $GCONF_REQUIRED) were not met:
11237
$BRASERO_GCONF_PKG_ERRORS
11238
@@ -14938,22 +13392,11 @@ installed software in a non-standard pre
11239
Alternatively, you may set the environment variables BRASERO_GCONF_CFLAGS
11240
and BRASERO_GCONF_LIBS to avoid the need to call pkg-config.
11241
See the pkg-config man page for more details.
11243
- { (exit 1); exit 1; }; }
11245
elif test $pkg_failed = untried; then
11246
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11247
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11248
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11249
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11250
-is in your PATH or set the PKG_CONFIG environment variable to the full
11251
-path to pkg-config.
11253
-Alternatively, you may set the environment variables BRASERO_GCONF_CFLAGS
11254
-and BRASERO_GCONF_LIBS to avoid the need to call pkg-config.
11255
-See the pkg-config man page for more details.
11257
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11258
-See \`config.log' for more details." >&5
11259
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11260
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11261
is in your PATH or set the PKG_CONFIG environment variable to the full
11262
path to pkg-config.
11264
@@ -14962,12 +13405,11 @@ and BRASERO_GCONF_LIBS to avoid the need
11265
See the pkg-config man page for more details.
11267
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11268
-See \`config.log' for more details." >&2;}
11269
- { (exit 1); exit 1; }; }; }
11270
+See \`config.log' for more details." "$LINENO" 5; }
11272
BRASERO_GCONF_CFLAGS=$pkg_cv_BRASERO_GCONF_CFLAGS
11273
BRASERO_GCONF_LIBS=$pkg_cv_BRASERO_GCONF_LIBS
11274
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11275
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11276
$as_echo "yes" >&6; }
11279
@@ -14977,46 +13419,50 @@ fi
11283
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GMODULE" >&5
11284
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GMODULE" >&5
11285
$as_echo_n "checking for BRASERO_GMODULE... " >&6; }
11287
-if test -n "$BRASERO_GMODULE_CFLAGS"; then
11288
- pkg_cv_BRASERO_GMODULE_CFLAGS="$BRASERO_GMODULE_CFLAGS"
11289
- elif test -n "$PKG_CONFIG"; then
11290
- if test -n "$PKG_CONFIG" && \
11291
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11292
- gmodule-2.0 >= \$GMODULE_REQUIRED\"") >&5
11293
+if test -n "$PKG_CONFIG"; then
11294
+ if test -n "$BRASERO_GMODULE_CFLAGS"; then
11295
+ pkg_cv_BRASERO_GMODULE_CFLAGS="$BRASERO_GMODULE_CFLAGS"
11297
+ if test -n "$PKG_CONFIG" && \
11298
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11299
+ gmodule-2.0 >= \$GMODULE_REQUIRED\""; } >&5
11300
($PKG_CONFIG --exists --print-errors "\
11301
gmodule-2.0 >= $GMODULE_REQUIRED") 2>&5
11303
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11304
- (exit $ac_status); }; then
11305
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11306
+ test $ac_status = 0; }; then
11307
pkg_cv_BRASERO_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "\
11308
gmodule-2.0 >= $GMODULE_REQUIRED" 2>/dev/null`
11313
- pkg_failed=untried
11316
+ pkg_failed=untried
11318
-if test -n "$BRASERO_GMODULE_LIBS"; then
11319
- pkg_cv_BRASERO_GMODULE_LIBS="$BRASERO_GMODULE_LIBS"
11320
- elif test -n "$PKG_CONFIG"; then
11321
- if test -n "$PKG_CONFIG" && \
11322
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11323
- gmodule-2.0 >= \$GMODULE_REQUIRED\"") >&5
11324
+if test -n "$PKG_CONFIG"; then
11325
+ if test -n "$BRASERO_GMODULE_LIBS"; then
11326
+ pkg_cv_BRASERO_GMODULE_LIBS="$BRASERO_GMODULE_LIBS"
11328
+ if test -n "$PKG_CONFIG" && \
11329
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11330
+ gmodule-2.0 >= \$GMODULE_REQUIRED\""; } >&5
11331
($PKG_CONFIG --exists --print-errors "\
11332
gmodule-2.0 >= $GMODULE_REQUIRED") 2>&5
11334
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11335
- (exit $ac_status); }; then
11336
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11337
+ test $ac_status = 0; }; then
11338
pkg_cv_BRASERO_GMODULE_LIBS=`$PKG_CONFIG --libs "\
11339
gmodule-2.0 >= $GMODULE_REQUIRED" 2>/dev/null`
11344
- pkg_failed=untried
11347
+ pkg_failed=untried
11351
@@ -15029,28 +13475,16 @@ else
11352
_pkg_short_errors_supported=no
11354
if test $_pkg_short_errors_supported = yes; then
11355
- BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11356
- gmodule-2.0 >= $GMODULE_REQUIRED" 2>&1`
11357
+ BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11358
+ gmodule-2.0 >= $GMODULE_REQUIRED"`
11360
- BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11361
- gmodule-2.0 >= $GMODULE_REQUIRED" 2>&1`
11362
+ BRASERO_GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11363
+ gmodule-2.0 >= $GMODULE_REQUIRED"`
11365
# Put the nasty error message in config.log where it belongs
11366
echo "$BRASERO_GMODULE_PKG_ERRORS" >&5
11368
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11369
- gmodule-2.0 >= $GMODULE_REQUIRED) were not met:
11371
-$BRASERO_GMODULE_PKG_ERRORS
11373
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11374
-installed software in a non-standard prefix.
11376
-Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
11377
-and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
11378
-See the pkg-config man page for more details.
11380
-$as_echo "$as_me: error: Package requirements (\
11381
+ as_fn_error "Package requirements (\
11382
gmodule-2.0 >= $GMODULE_REQUIRED) were not met:
11384
$BRASERO_GMODULE_PKG_ERRORS
11385
@@ -15061,22 +13495,11 @@ installed software in a non-standard pre
11386
Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
11387
and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
11388
See the pkg-config man page for more details.
11390
- { (exit 1); exit 1; }; }
11392
elif test $pkg_failed = untried; then
11393
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11394
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11395
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11396
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11397
-is in your PATH or set the PKG_CONFIG environment variable to the full
11398
-path to pkg-config.
11400
-Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
11401
-and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
11402
-See the pkg-config man page for more details.
11404
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11405
-See \`config.log' for more details." >&5
11406
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11407
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11408
is in your PATH or set the PKG_CONFIG environment variable to the full
11409
path to pkg-config.
11411
@@ -15085,12 +13508,11 @@ and BRASERO_GMODULE_LIBS to avoid the ne
11412
See the pkg-config man page for more details.
11414
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11415
-See \`config.log' for more details." >&2;}
11416
- { (exit 1); exit 1; }; }; }
11417
+See \`config.log' for more details." "$LINENO" 5; }
11419
BRASERO_GMODULE_CFLAGS=$pkg_cv_BRASERO_GMODULE_CFLAGS
11420
BRASERO_GMODULE_LIBS=$pkg_cv_BRASERO_GMODULE_LIBS
11421
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11422
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11423
$as_echo "yes" >&6; }
11426
@@ -15100,46 +13522,50 @@ fi
11430
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GMODULE_EXPORT" >&5
11431
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GMODULE_EXPORT" >&5
11432
$as_echo_n "checking for BRASERO_GMODULE_EXPORT... " >&6; }
11434
-if test -n "$BRASERO_GMODULE_EXPORT_CFLAGS"; then
11435
- pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS="$BRASERO_GMODULE_EXPORT_CFLAGS"
11436
- elif test -n "$PKG_CONFIG"; then
11437
- if test -n "$PKG_CONFIG" && \
11438
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11439
- gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\"") >&5
11440
+if test -n "$PKG_CONFIG"; then
11441
+ if test -n "$BRASERO_GMODULE_EXPORT_CFLAGS"; then
11442
+ pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS="$BRASERO_GMODULE_EXPORT_CFLAGS"
11444
+ if test -n "$PKG_CONFIG" && \
11445
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11446
+ gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\""; } >&5
11447
($PKG_CONFIG --exists --print-errors "\
11448
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED") 2>&5
11450
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11451
- (exit $ac_status); }; then
11452
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11453
+ test $ac_status = 0; }; then
11454
pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS=`$PKG_CONFIG --cflags "\
11455
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>/dev/null`
11460
- pkg_failed=untried
11463
+ pkg_failed=untried
11465
-if test -n "$BRASERO_GMODULE_EXPORT_LIBS"; then
11466
- pkg_cv_BRASERO_GMODULE_EXPORT_LIBS="$BRASERO_GMODULE_EXPORT_LIBS"
11467
- elif test -n "$PKG_CONFIG"; then
11468
- if test -n "$PKG_CONFIG" && \
11469
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11470
- gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\"") >&5
11471
+if test -n "$PKG_CONFIG"; then
11472
+ if test -n "$BRASERO_GMODULE_EXPORT_LIBS"; then
11473
+ pkg_cv_BRASERO_GMODULE_EXPORT_LIBS="$BRASERO_GMODULE_EXPORT_LIBS"
11475
+ if test -n "$PKG_CONFIG" && \
11476
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11477
+ gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\""; } >&5
11478
($PKG_CONFIG --exists --print-errors "\
11479
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED") 2>&5
11481
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11482
- (exit $ac_status); }; then
11483
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11484
+ test $ac_status = 0; }; then
11485
pkg_cv_BRASERO_GMODULE_EXPORT_LIBS=`$PKG_CONFIG --libs "\
11486
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>/dev/null`
11491
- pkg_failed=untried
11494
+ pkg_failed=untried
11498
@@ -15152,28 +13578,16 @@ else
11499
_pkg_short_errors_supported=no
11501
if test $_pkg_short_errors_supported = yes; then
11502
- BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11503
- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>&1`
11504
+ BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11505
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED"`
11507
- BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11508
- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>&1`
11509
+ BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11510
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED"`
11512
# Put the nasty error message in config.log where it belongs
11513
echo "$BRASERO_GMODULE_EXPORT_PKG_ERRORS" >&5
11515
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11516
- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED) were not met:
11518
-$BRASERO_GMODULE_EXPORT_PKG_ERRORS
11520
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11521
-installed software in a non-standard prefix.
11523
-Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
11524
-and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
11525
-See the pkg-config man page for more details.
11527
-$as_echo "$as_me: error: Package requirements (\
11528
+ as_fn_error "Package requirements (\
11529
gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED) were not met:
11531
$BRASERO_GMODULE_EXPORT_PKG_ERRORS
11532
@@ -15184,22 +13598,11 @@ installed software in a non-standard pre
11533
Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
11534
and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
11535
See the pkg-config man page for more details.
11537
- { (exit 1); exit 1; }; }
11539
elif test $pkg_failed = untried; then
11540
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11541
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11542
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11543
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11544
-is in your PATH or set the PKG_CONFIG environment variable to the full
11545
-path to pkg-config.
11547
-Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
11548
-and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
11549
-See the pkg-config man page for more details.
11551
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11552
-See \`config.log' for more details." >&5
11553
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11554
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11555
is in your PATH or set the PKG_CONFIG environment variable to the full
11556
path to pkg-config.
11558
@@ -15208,12 +13611,11 @@ and BRASERO_GMODULE_EXPORT_LIBS to avoid
11559
See the pkg-config man page for more details.
11561
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11562
-See \`config.log' for more details." >&2;}
11563
- { (exit 1); exit 1; }; }; }
11564
+See \`config.log' for more details." "$LINENO" 5; }
11566
BRASERO_GMODULE_EXPORT_CFLAGS=$pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS
11567
BRASERO_GMODULE_EXPORT_LIBS=$pkg_cv_BRASERO_GMODULE_EXPORT_LIBS
11568
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11569
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11570
$as_echo "yes" >&6; }
11573
@@ -15223,52 +13625,56 @@ fi
11577
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GTK" >&5
11578
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GTK" >&5
11579
$as_echo_n "checking for BRASERO_GTK... " >&6; }
11581
-if test -n "$BRASERO_GTK_CFLAGS"; then
11582
- pkg_cv_BRASERO_GTK_CFLAGS="$BRASERO_GTK_CFLAGS"
11583
- elif test -n "$PKG_CONFIG"; then
11584
- if test -n "$PKG_CONFIG" && \
11585
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11586
+if test -n "$PKG_CONFIG"; then
11587
+ if test -n "$BRASERO_GTK_CFLAGS"; then
11588
+ pkg_cv_BRASERO_GTK_CFLAGS="$BRASERO_GTK_CFLAGS"
11590
+ if test -n "$PKG_CONFIG" && \
11591
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11592
gdk-2.0 >= \$GDK_REQUIRED \\
11593
- gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
11594
+ gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
11595
($PKG_CONFIG --exists --print-errors "\
11596
gdk-2.0 >= $GDK_REQUIRED \
11597
gtk+-2.0 >= $GTK_REQUIRED") 2>&5
11599
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11600
- (exit $ac_status); }; then
11601
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11602
+ test $ac_status = 0; }; then
11603
pkg_cv_BRASERO_GTK_CFLAGS=`$PKG_CONFIG --cflags "\
11604
gdk-2.0 >= $GDK_REQUIRED \
11605
gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
11610
- pkg_failed=untried
11613
+ pkg_failed=untried
11615
-if test -n "$BRASERO_GTK_LIBS"; then
11616
- pkg_cv_BRASERO_GTK_LIBS="$BRASERO_GTK_LIBS"
11617
- elif test -n "$PKG_CONFIG"; then
11618
- if test -n "$PKG_CONFIG" && \
11619
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11620
+if test -n "$PKG_CONFIG"; then
11621
+ if test -n "$BRASERO_GTK_LIBS"; then
11622
+ pkg_cv_BRASERO_GTK_LIBS="$BRASERO_GTK_LIBS"
11624
+ if test -n "$PKG_CONFIG" && \
11625
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11626
gdk-2.0 >= \$GDK_REQUIRED \\
11627
- gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
11628
+ gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
11629
($PKG_CONFIG --exists --print-errors "\
11630
gdk-2.0 >= $GDK_REQUIRED \
11631
gtk+-2.0 >= $GTK_REQUIRED") 2>&5
11633
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11634
- (exit $ac_status); }; then
11635
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11636
+ test $ac_status = 0; }; then
11637
pkg_cv_BRASERO_GTK_LIBS=`$PKG_CONFIG --libs "\
11638
gdk-2.0 >= $GDK_REQUIRED \
11639
gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
11644
- pkg_failed=untried
11647
+ pkg_failed=untried
11651
@@ -15281,31 +13687,18 @@ else
11652
_pkg_short_errors_supported=no
11654
if test $_pkg_short_errors_supported = yes; then
11655
- BRASERO_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11656
+ BRASERO_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11657
gdk-2.0 >= $GDK_REQUIRED \
11658
- gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
11659
+ gtk+-2.0 >= $GTK_REQUIRED"`
11661
- BRASERO_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11662
+ BRASERO_GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11663
gdk-2.0 >= $GDK_REQUIRED \
11664
- gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
11665
+ gtk+-2.0 >= $GTK_REQUIRED"`
11667
# Put the nasty error message in config.log where it belongs
11668
echo "$BRASERO_GTK_PKG_ERRORS" >&5
11670
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11671
- gdk-2.0 >= $GDK_REQUIRED \
11672
- gtk+-2.0 >= $GTK_REQUIRED) were not met:
11674
-$BRASERO_GTK_PKG_ERRORS
11676
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11677
-installed software in a non-standard prefix.
11679
-Alternatively, you may set the environment variables BRASERO_GTK_CFLAGS
11680
-and BRASERO_GTK_LIBS to avoid the need to call pkg-config.
11681
-See the pkg-config man page for more details.
11683
-$as_echo "$as_me: error: Package requirements (\
11684
+ as_fn_error "Package requirements (\
11685
gdk-2.0 >= $GDK_REQUIRED \
11686
gtk+-2.0 >= $GTK_REQUIRED) were not met:
11688
@@ -15317,22 +13710,11 @@ installed software in a non-standard pre
11689
Alternatively, you may set the environment variables BRASERO_GTK_CFLAGS
11690
and BRASERO_GTK_LIBS to avoid the need to call pkg-config.
11691
See the pkg-config man page for more details.
11693
- { (exit 1); exit 1; }; }
11695
elif test $pkg_failed = untried; then
11696
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11697
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11698
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11699
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11700
-is in your PATH or set the PKG_CONFIG environment variable to the full
11701
-path to pkg-config.
11703
-Alternatively, you may set the environment variables BRASERO_GTK_CFLAGS
11704
-and BRASERO_GTK_LIBS to avoid the need to call pkg-config.
11705
-See the pkg-config man page for more details.
11707
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11708
-See \`config.log' for more details." >&5
11709
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11710
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11711
is in your PATH or set the PKG_CONFIG environment variable to the full
11712
path to pkg-config.
11714
@@ -15341,12 +13723,11 @@ and BRASERO_GTK_LIBS to avoid the need t
11715
See the pkg-config man page for more details.
11717
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11718
-See \`config.log' for more details." >&2;}
11719
- { (exit 1); exit 1; }; }; }
11720
+See \`config.log' for more details." "$LINENO" 5; }
11722
BRASERO_GTK_CFLAGS=$pkg_cv_BRASERO_GTK_CFLAGS
11723
BRASERO_GTK_LIBS=$pkg_cv_BRASERO_GTK_LIBS
11724
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11725
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11726
$as_echo "yes" >&6; }
11729
@@ -15356,46 +13737,50 @@ fi
11733
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_DBUS" >&5
11734
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_DBUS" >&5
11735
$as_echo_n "checking for BRASERO_DBUS... " >&6; }
11737
-if test -n "$BRASERO_DBUS_CFLAGS"; then
11738
- pkg_cv_BRASERO_DBUS_CFLAGS="$BRASERO_DBUS_CFLAGS"
11739
- elif test -n "$PKG_CONFIG"; then
11740
- if test -n "$PKG_CONFIG" && \
11741
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11742
- dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5
11743
+if test -n "$PKG_CONFIG"; then
11744
+ if test -n "$BRASERO_DBUS_CFLAGS"; then
11745
+ pkg_cv_BRASERO_DBUS_CFLAGS="$BRASERO_DBUS_CFLAGS"
11747
+ if test -n "$PKG_CONFIG" && \
11748
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11749
+ dbus-glib-1 >= \$DBUS_REQUIRED\""; } >&5
11750
($PKG_CONFIG --exists --print-errors "\
11751
dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
11753
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11754
- (exit $ac_status); }; then
11755
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11756
+ test $ac_status = 0; }; then
11757
pkg_cv_BRASERO_DBUS_CFLAGS=`$PKG_CONFIG --cflags "\
11758
dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null`
11763
- pkg_failed=untried
11766
+ pkg_failed=untried
11768
-if test -n "$BRASERO_DBUS_LIBS"; then
11769
- pkg_cv_BRASERO_DBUS_LIBS="$BRASERO_DBUS_LIBS"
11770
- elif test -n "$PKG_CONFIG"; then
11771
- if test -n "$PKG_CONFIG" && \
11772
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11773
- dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5
11774
+if test -n "$PKG_CONFIG"; then
11775
+ if test -n "$BRASERO_DBUS_LIBS"; then
11776
+ pkg_cv_BRASERO_DBUS_LIBS="$BRASERO_DBUS_LIBS"
11778
+ if test -n "$PKG_CONFIG" && \
11779
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11780
+ dbus-glib-1 >= \$DBUS_REQUIRED\""; } >&5
11781
($PKG_CONFIG --exists --print-errors "\
11782
dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
11784
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11785
- (exit $ac_status); }; then
11786
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11787
+ test $ac_status = 0; }; then
11788
pkg_cv_BRASERO_DBUS_LIBS=`$PKG_CONFIG --libs "\
11789
dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null`
11794
- pkg_failed=untried
11797
+ pkg_failed=untried
11801
@@ -15408,28 +13793,16 @@ else
11802
_pkg_short_errors_supported=no
11804
if test $_pkg_short_errors_supported = yes; then
11805
- BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11806
- dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
11807
+ BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11808
+ dbus-glib-1 >= $DBUS_REQUIRED"`
11810
- BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11811
- dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
11812
+ BRASERO_DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11813
+ dbus-glib-1 >= $DBUS_REQUIRED"`
11815
# Put the nasty error message in config.log where it belongs
11816
echo "$BRASERO_DBUS_PKG_ERRORS" >&5
11818
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11819
- dbus-glib-1 >= $DBUS_REQUIRED) were not met:
11821
-$BRASERO_DBUS_PKG_ERRORS
11823
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11824
-installed software in a non-standard prefix.
11826
-Alternatively, you may set the environment variables BRASERO_DBUS_CFLAGS
11827
-and BRASERO_DBUS_LIBS to avoid the need to call pkg-config.
11828
-See the pkg-config man page for more details.
11830
-$as_echo "$as_me: error: Package requirements (\
11831
+ as_fn_error "Package requirements (\
11832
dbus-glib-1 >= $DBUS_REQUIRED) were not met:
11834
$BRASERO_DBUS_PKG_ERRORS
11835
@@ -15440,12 +13813,11 @@ installed software in a non-standard pre
11836
Alternatively, you may set the environment variables BRASERO_DBUS_CFLAGS
11837
and BRASERO_DBUS_LIBS to avoid the need to call pkg-config.
11838
See the pkg-config man page for more details.
11840
- { (exit 1); exit 1; }; }
11842
elif test $pkg_failed = untried; then
11843
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11844
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11845
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11846
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
11847
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
11848
is in your PATH or set the PKG_CONFIG environment variable to the full
11849
path to pkg-config.
11851
@@ -15454,22 +13826,11 @@ and BRASERO_DBUS_LIBS to avoid the need
11852
See the pkg-config man page for more details.
11854
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11855
-See \`config.log' for more details." >&5
11856
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
11857
-is in your PATH or set the PKG_CONFIG environment variable to the full
11858
-path to pkg-config.
11860
-Alternatively, you may set the environment variables BRASERO_DBUS_CFLAGS
11861
-and BRASERO_DBUS_LIBS to avoid the need to call pkg-config.
11862
-See the pkg-config man page for more details.
11864
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
11865
-See \`config.log' for more details." >&2;}
11866
- { (exit 1); exit 1; }; }; }
11867
+See \`config.log' for more details." "$LINENO" 5; }
11869
BRASERO_DBUS_CFLAGS=$pkg_cv_BRASERO_DBUS_CFLAGS
11870
BRASERO_DBUS_LIBS=$pkg_cv_BRASERO_DBUS_LIBS
11871
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11872
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11873
$as_echo "yes" >&6; }
11876
@@ -15479,46 +13840,50 @@ fi
11880
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SM" >&5
11881
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SM" >&5
11882
$as_echo_n "checking for BRASERO_SM... " >&6; }
11884
-if test -n "$BRASERO_SM_CFLAGS"; then
11885
- pkg_cv_BRASERO_SM_CFLAGS="$BRASERO_SM_CFLAGS"
11886
- elif test -n "$PKG_CONFIG"; then
11887
- if test -n "$PKG_CONFIG" && \
11888
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11890
+if test -n "$PKG_CONFIG"; then
11891
+ if test -n "$BRASERO_SM_CFLAGS"; then
11892
+ pkg_cv_BRASERO_SM_CFLAGS="$BRASERO_SM_CFLAGS"
11894
+ if test -n "$PKG_CONFIG" && \
11895
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
4082
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11896
4084
+ ice sm\""; } >&5
11897
4085
($PKG_CONFIG --exists --print-errors "\
11899
4087
+ ice sm") 2>&5
11901
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11902
- (exit $ac_status); }; then
11903
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11904
+ test $ac_status = 0; }; then
4089
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4090
test $ac_status = 0; }; then
11905
4091
pkg_cv_BRASERO_SM_CFLAGS=`$PKG_CONFIG --cflags "\
11906
4092
- sm" 2>/dev/null`
11907
4093
+ ice sm" 2>/dev/null`
11909
4095
pkg_failed=yes
11912
- pkg_failed=untried
11915
+ pkg_failed=untried
11917
-if test -n "$BRASERO_SM_LIBS"; then
11918
- pkg_cv_BRASERO_SM_LIBS="$BRASERO_SM_LIBS"
11919
- elif test -n "$PKG_CONFIG"; then
11920
- if test -n "$PKG_CONFIG" && \
11921
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
11923
+if test -n "$PKG_CONFIG"; then
11924
+ if test -n "$BRASERO_SM_LIBS"; then
11925
+ pkg_cv_BRASERO_SM_LIBS="$BRASERO_SM_LIBS"
11927
+ if test -n "$PKG_CONFIG" && \
11928
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
4097
@@ -13996,14 +13867,14 @@
4098
elif test -n "$PKG_CONFIG"; then
4099
if test -n "$PKG_CONFIG" && \
4100
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
11929
4102
+ ice sm\""; } >&5
11930
4103
($PKG_CONFIG --exists --print-errors "\
11932
4105
+ ice sm") 2>&5
11934
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11935
- (exit $ac_status); }; then
11936
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11937
+ test $ac_status = 0; }; then
4107
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4108
test $ac_status = 0; }; then
11938
4109
pkg_cv_BRASERO_SM_LIBS=`$PKG_CONFIG --libs "\
11939
4110
- sm" 2>/dev/null`
11940
4111
+ ice sm" 2>/dev/null`
11942
4113
pkg_failed=yes
11945
- pkg_failed=untried
11948
+ pkg_failed=untried
11952
@@ -15531,29 +13896,17 @@ else
11953
_pkg_short_errors_supported=no
4115
@@ -14024,16 +13895,16 @@
11955
4117
if test $_pkg_short_errors_supported = yes; then
11956
- BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
4118
BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
11958
+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
11961
- BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
4122
BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
11963
+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
11966
4126
# Put the nasty error message in config.log where it belongs
11967
4127
echo "$BRASERO_SM_PKG_ERRORS" >&5
11969
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
11970
- sm) were not met:
11972
-$BRASERO_SM_PKG_ERRORS
11974
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
11975
-installed software in a non-standard prefix.
11977
-Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
11978
-and BRASERO_SM_LIBS to avoid the need to call pkg-config.
11979
-See the pkg-config man page for more details.
11981
-$as_echo "$as_me: error: Package requirements (\
11982
- sm) were not met:
11983
+ as_fn_error "Package requirements (\
4129
as_fn_error "Package requirements (\
11984
4131
+ ice sm) were not met:
11986
4133
$BRASERO_SM_PKG_ERRORS
11988
@@ -15563,22 +13916,11 @@ installed software in a non-standard pre
11989
Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
11990
and BRASERO_SM_LIBS to avoid the need to call pkg-config.
11991
See the pkg-config man page for more details.
11993
- { (exit 1); exit 1; }; }
11995
elif test $pkg_failed = untried; then
11996
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
11997
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11998
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11999
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
12000
-is in your PATH or set the PKG_CONFIG environment variable to the full
12001
-path to pkg-config.
12003
-Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
12004
-and BRASERO_SM_LIBS to avoid the need to call pkg-config.
12005
-See the pkg-config man page for more details.
12007
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12008
-See \`config.log' for more details." >&5
12009
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
12010
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
12011
is in your PATH or set the PKG_CONFIG environment variable to the full
12012
path to pkg-config.
12014
@@ -15587,12 +13929,11 @@ and BRASERO_SM_LIBS to avoid the need to
12015
See the pkg-config man page for more details.
12017
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12018
-See \`config.log' for more details." >&2;}
12019
- { (exit 1); exit 1; }; }; }
12020
+See \`config.log' for more details." "$LINENO" 5; }
12022
BRASERO_SM_CFLAGS=$pkg_cv_BRASERO_SM_CFLAGS
12023
BRASERO_SM_LIBS=$pkg_cv_BRASERO_SM_LIBS
12024
- { $as_echo "$as_me:$LINENO: result: yes" >&5
12025
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12026
$as_echo "yes" >&6; }
12029
@@ -15602,52 +13943,56 @@ fi
12033
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_CANBERRA" >&5
12034
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_CANBERRA" >&5
12035
$as_echo_n "checking for BRASERO_CANBERRA... " >&6; }
12037
-if test -n "$BRASERO_CANBERRA_CFLAGS"; then
12038
- pkg_cv_BRASERO_CANBERRA_CFLAGS="$BRASERO_CANBERRA_CFLAGS"
12039
- elif test -n "$PKG_CONFIG"; then
12040
- if test -n "$PKG_CONFIG" && \
12041
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
12042
+if test -n "$PKG_CONFIG"; then
12043
+ if test -n "$BRASERO_CANBERRA_CFLAGS"; then
12044
+ pkg_cv_BRASERO_CANBERRA_CFLAGS="$BRASERO_CANBERRA_CFLAGS"
12046
+ if test -n "$PKG_CONFIG" && \
12047
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
12048
libcanberra >= \$CANBERRA_REQUIRED \\
12049
- libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
12050
+ libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
12051
($PKG_CONFIG --exists --print-errors "\
12052
libcanberra >= $CANBERRA_REQUIRED \
12053
libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
12055
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12056
- (exit $ac_status); }; then
12057
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12058
+ test $ac_status = 0; }; then
12059
pkg_cv_BRASERO_CANBERRA_CFLAGS=`$PKG_CONFIG --cflags "\
12060
libcanberra >= $CANBERRA_REQUIRED \
12061
libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
12066
- pkg_failed=untried
12069
+ pkg_failed=untried
12071
-if test -n "$BRASERO_CANBERRA_LIBS"; then
12072
- pkg_cv_BRASERO_CANBERRA_LIBS="$BRASERO_CANBERRA_LIBS"
12073
- elif test -n "$PKG_CONFIG"; then
12074
- if test -n "$PKG_CONFIG" && \
12075
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
12076
+if test -n "$PKG_CONFIG"; then
12077
+ if test -n "$BRASERO_CANBERRA_LIBS"; then
12078
+ pkg_cv_BRASERO_CANBERRA_LIBS="$BRASERO_CANBERRA_LIBS"
12080
+ if test -n "$PKG_CONFIG" && \
12081
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
12082
libcanberra >= \$CANBERRA_REQUIRED \\
12083
- libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
12084
+ libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
12085
($PKG_CONFIG --exists --print-errors "\
12086
libcanberra >= $CANBERRA_REQUIRED \
12087
libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
12089
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12090
- (exit $ac_status); }; then
12091
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12092
+ test $ac_status = 0; }; then
12093
pkg_cv_BRASERO_CANBERRA_LIBS=`$PKG_CONFIG --libs "\
12094
libcanberra >= $CANBERRA_REQUIRED \
12095
libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
12100
- pkg_failed=untried
12103
+ pkg_failed=untried
12107
@@ -15660,31 +14005,18 @@ else
12108
_pkg_short_errors_supported=no
12110
if test $_pkg_short_errors_supported = yes; then
12111
- BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
12112
+ BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
12113
libcanberra >= $CANBERRA_REQUIRED \
12114
- libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1`
12115
+ libcanberra-gtk >= $CANBERRA_REQUIRED"`
12117
- BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
12118
+ BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
12119
libcanberra >= $CANBERRA_REQUIRED \
12120
- libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1`
12121
+ libcanberra-gtk >= $CANBERRA_REQUIRED"`
12123
# Put the nasty error message in config.log where it belongs
12124
echo "$BRASERO_CANBERRA_PKG_ERRORS" >&5
12126
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
12127
- libcanberra >= $CANBERRA_REQUIRED \
12128
- libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
12130
-$BRASERO_CANBERRA_PKG_ERRORS
12132
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
12133
-installed software in a non-standard prefix.
12135
-Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
12136
-and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
12137
-See the pkg-config man page for more details.
12139
-$as_echo "$as_me: error: Package requirements (\
12140
+ as_fn_error "Package requirements (\
12141
libcanberra >= $CANBERRA_REQUIRED \
12142
libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
12144
@@ -15696,22 +14028,11 @@ installed software in a non-standard pre
12145
Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
12146
and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
12147
See the pkg-config man page for more details.
12149
- { (exit 1); exit 1; }; }
12151
elif test $pkg_failed = untried; then
12152
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
12153
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12154
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12155
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
12156
-is in your PATH or set the PKG_CONFIG environment variable to the full
12157
-path to pkg-config.
12159
-Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
12160
-and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
12161
-See the pkg-config man page for more details.
12163
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12164
-See \`config.log' for more details." >&5
12165
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
12166
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
12167
is in your PATH or set the PKG_CONFIG environment variable to the full
12168
path to pkg-config.
12170
@@ -15720,12 +14041,11 @@ and BRASERO_CANBERRA_LIBS to avoid the n
12171
See the pkg-config man page for more details.
12173
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12174
-See \`config.log' for more details." >&2;}
12175
- { (exit 1); exit 1; }; }; }
12176
+See \`config.log' for more details." "$LINENO" 5; }
12178
BRASERO_CANBERRA_CFLAGS=$pkg_cv_BRASERO_CANBERRA_CFLAGS
12179
BRASERO_CANBERRA_LIBS=$pkg_cv_BRASERO_CANBERRA_LIBS
12180
- { $as_echo "$as_me:$LINENO: result: yes" >&5
12181
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12182
$as_echo "yes" >&6; }
12185
@@ -15736,7 +14056,7 @@ fi
12186
NAUTILUS_REQUIRED=2.22.2
12188
# Check whether --enable-nautilus was given.
12189
-if test "${enable_nautilus+set}" = set; then
12190
+if test "${enable_nautilus+set}" = set; then :
12191
enableval=$enable_nautilus; enable_nautilus=$enableval
12193
enable_nautilus="yes"
12194
@@ -15745,7 +14065,7 @@ fi
12197
# Check whether --with-nautilusdir was given.
12198
-if test "${with_nautilusdir+set}" = set; then
12199
+if test "${with_nautilusdir+set}" = set; then :
12200
withval=$with_nautilusdir; ac_with_nautilusdir=$withval
12202
ac_with_nautilusdir=""
12203
@@ -15755,40 +14075,44 @@ fi
12204
if test x"$enable_nautilus" = "xyes"; then
12207
-{ $as_echo "$as_me:$LINENO: checking for NAUTILUS_EXTENSION" >&5
12208
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS_EXTENSION" >&5
12209
$as_echo_n "checking for NAUTILUS_EXTENSION... " >&6; }
12211
-if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then
12212
- pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS"
12213
- elif test -n "$PKG_CONFIG"; then
12214
- if test -n "$PKG_CONFIG" && \
12215
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\"") >&5
12216
+if test -n "$PKG_CONFIG"; then
12217
+ if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then
12218
+ pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS"
12220
+ if test -n "$PKG_CONFIG" && \
12221
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\""; } >&5
12222
($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED") 2>&5
12224
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12225
- (exit $ac_status); }; then
12226
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12227
+ test $ac_status = 0; }; then
12228
pkg_cv_NAUTILUS_EXTENSION_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>/dev/null`
12233
- pkg_failed=untried
12236
+ pkg_failed=untried
12238
-if test -n "$NAUTILUS_EXTENSION_LIBS"; then
12239
- pkg_cv_NAUTILUS_EXTENSION_LIBS="$NAUTILUS_EXTENSION_LIBS"
12240
- elif test -n "$PKG_CONFIG"; then
12241
- if test -n "$PKG_CONFIG" && \
12242
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\"") >&5
12243
+if test -n "$PKG_CONFIG"; then
12244
+ if test -n "$NAUTILUS_EXTENSION_LIBS"; then
12245
+ pkg_cv_NAUTILUS_EXTENSION_LIBS="$NAUTILUS_EXTENSION_LIBS"
12247
+ if test -n "$PKG_CONFIG" && \
12248
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\""; } >&5
12249
($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED") 2>&5
12251
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12252
- (exit $ac_status); }; then
12253
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12254
+ test $ac_status = 0; }; then
12255
pkg_cv_NAUTILUS_EXTENSION_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>/dev/null`
12260
- pkg_failed=untried
12263
+ pkg_failed=untried
12267
@@ -15801,183 +14125,49 @@ else
12268
_pkg_short_errors_supported=no
12270
if test $_pkg_short_errors_supported = yes; then
12271
- NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>&1`
12272
+ NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED"`
12274
- NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>&1`
12275
+ NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED"`
12277
# Put the nasty error message in config.log where it belongs
12278
echo "$NAUTILUS_EXTENSION_PKG_ERRORS" >&5
12280
- { $as_echo "$as_me:$LINENO: result: no" >&5
12281
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12282
$as_echo "no" >&6; }
12284
elif test $pkg_failed = untried; then
12287
- NAUTILUS_EXTENSION_CFLAGS=$pkg_cv_NAUTILUS_EXTENSION_CFLAGS
12288
- NAUTILUS_EXTENSION_LIBS=$pkg_cv_NAUTILUS_EXTENSION_LIBS
12289
- { $as_echo "$as_me:$LINENO: result: yes" >&5
12290
-$as_echo "yes" >&6; }
12291
- build_nautilus=yes
12294
- build_nautilus="no"
12297
-if test x"$build_nautilus" = "xyes"; then
12298
- NAUTILUS_EXTENSION_CFLAGS="$BRASERO_GLIB_CFLAGS $BRASERO_UI_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
12299
- NAUTILUS_EXTENSION_LIBS="$BRASERO_GLIB_LIBS $BRASERO_UI_LIBS $NAUTILUS_EXTENSION_LIBS"
12301
- if test "${ac_with_nautilusdir}" = ""; then
12302
- ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
12305
- { $as_echo "$as_me:$LINENO: installing plugin in ${ac_with_nautilusdir}" >&5
12306
-$as_echo "$as_me: installing plugin in ${ac_with_nautilusdir}" >&6;}
12307
- NAUTILUSDIR=${ac_with_nautilusdir}
12312
-for ac_header in locale.h
12314
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
12315
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
12316
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
12317
-$as_echo_n "checking for $ac_header... " >&6; }
12318
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
12319
- $as_echo_n "(cached) " >&6
12321
-ac_res=`eval 'as_val=${'$as_ac_Header'}
12322
- $as_echo "$as_val"'`
12323
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
12324
-$as_echo "$ac_res" >&6; }
12326
- # Is the header compilable?
12327
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
12328
-$as_echo_n "checking $ac_header usability... " >&6; }
12329
-cat >conftest.$ac_ext <<_ACEOF
12332
-cat confdefs.h >>conftest.$ac_ext
12333
-cat >>conftest.$ac_ext <<_ACEOF
12334
-/* end confdefs.h. */
12335
-$ac_includes_default
12336
-#include <$ac_header>
12338
-rm -f conftest.$ac_objext
12339
-if { (ac_try="$ac_compile"
12340
-case "(($ac_try" in
12341
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12342
- *) ac_try_echo=$ac_try;;
12344
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12345
-$as_echo "$ac_try_echo") >&5
12346
- (eval "$ac_compile") 2>conftest.er1
12348
- grep -v '^ *+' conftest.er1 >conftest.err
12349
- rm -f conftest.er1
12350
- cat conftest.err >&5
12351
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12352
- (exit $ac_status); } && {
12353
- test -z "$ac_c_werror_flag" ||
12354
- test ! -s conftest.err
12355
- } && test -s conftest.$ac_objext; then
12356
- ac_header_compiler=yes
12358
- $as_echo "$as_me: failed program was:" >&5
12359
-sed 's/^/| /' conftest.$ac_ext >&5
12361
- ac_header_compiler=no
12364
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12365
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
12366
-$as_echo "$ac_header_compiler" >&6; }
12368
-# Is the header present?
12369
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
12370
-$as_echo_n "checking $ac_header presence... " >&6; }
12371
-cat >conftest.$ac_ext <<_ACEOF
12374
-cat confdefs.h >>conftest.$ac_ext
12375
-cat >>conftest.$ac_ext <<_ACEOF
12376
-/* end confdefs.h. */
12377
-#include <$ac_header>
12379
-if { (ac_try="$ac_cpp conftest.$ac_ext"
12380
-case "(($ac_try" in
12381
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12382
- *) ac_try_echo=$ac_try;;
12384
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12385
-$as_echo "$ac_try_echo") >&5
12386
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
12388
- grep -v '^ *+' conftest.er1 >conftest.err
12389
- rm -f conftest.er1
12390
- cat conftest.err >&5
12391
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12392
- (exit $ac_status); } >/dev/null && {
12393
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
12394
- test ! -s conftest.err
12396
- ac_header_preproc=yes
12398
- $as_echo "$as_me: failed program was:" >&5
12399
-sed 's/^/| /' conftest.$ac_ext >&5
12401
- ac_header_preproc=no
12402
+ NAUTILUS_EXTENSION_CFLAGS=$pkg_cv_NAUTILUS_EXTENSION_CFLAGS
12403
+ NAUTILUS_EXTENSION_LIBS=$pkg_cv_NAUTILUS_EXTENSION_LIBS
12404
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12405
+$as_echo "yes" >&6; }
12406
+ build_nautilus=yes
12409
+ build_nautilus="no"
12412
-rm -f conftest.err conftest.$ac_ext
12413
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
12414
-$as_echo "$ac_header_preproc" >&6; }
12415
+if test x"$build_nautilus" = "xyes"; then
12416
+ NAUTILUS_EXTENSION_CFLAGS="$BRASERO_GLIB_CFLAGS $BRASERO_UI_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
12417
+ NAUTILUS_EXTENSION_LIBS="$BRASERO_GLIB_LIBS $BRASERO_UI_LIBS $NAUTILUS_EXTENSION_LIBS"
12419
-# So? What about this header?
12420
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
12422
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
12423
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
12424
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
12425
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
12426
- ac_header_preproc=yes
12429
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
12430
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
12431
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
12432
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
12433
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
12434
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
12435
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
12436
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
12437
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
12438
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
12439
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
12440
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
12441
+ if test "${ac_with_nautilusdir}" = ""; then
12442
+ ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
12447
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
12448
-$as_echo_n "checking for $ac_header... " >&6; }
12449
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
12450
- $as_echo_n "(cached) " >&6
12452
- eval "$as_ac_Header=\$ac_header_preproc"
12454
-ac_res=`eval 'as_val=${'$as_ac_Header'}
12455
- $as_echo "$as_val"'`
12456
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
12457
-$as_echo "$ac_res" >&6; }
12458
+ { $as_echo "$as_me:${as_lineno-$LINENO}: installing plugin in ${ac_with_nautilusdir}" >&5
12459
+$as_echo "$as_me: installing plugin in ${ac_with_nautilusdir}" >&6;}
12460
+ NAUTILUSDIR=${ac_with_nautilusdir}
12463
-as_val=`eval 'as_val=${'$as_ac_Header'}
12464
- $as_echo "$as_val"'`
12465
- if test "x$as_val" = x""yes; then
12468
+ for ac_header in locale.h
12470
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
12471
+if test "x$ac_cv_header_locale_h" = x""yes; then :
12472
cat >>confdefs.h <<_ACEOF
12473
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
12474
+#define HAVE_LOCALE_H 1
12478
@@ -15985,16 +14175,12 @@ fi
12481
if test $ac_cv_header_locale_h = yes; then
12482
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
12483
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
12484
$as_echo_n "checking for LC_MESSAGES... " >&6; }
12485
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
12486
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
12487
$as_echo_n "(cached) " >&6
12489
- cat >conftest.$ac_ext <<_ACEOF
12492
-cat confdefs.h >>conftest.$ac_ext
12493
-cat >>conftest.$ac_ext <<_ACEOF
12494
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12495
/* end confdefs.h. */
12496
#include <locale.h>
12498
@@ -16005,46 +14191,19 @@ return LC_MESSAGES
12502
-rm -f conftest.$ac_objext conftest$ac_exeext
12503
-if { (ac_try="$ac_link"
12504
-case "(($ac_try" in
12505
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12506
- *) ac_try_echo=$ac_try;;
12508
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12509
-$as_echo "$ac_try_echo") >&5
12510
- (eval "$ac_link") 2>conftest.er1
12512
- grep -v '^ *+' conftest.er1 >conftest.err
12513
- rm -f conftest.er1
12514
- cat conftest.err >&5
12515
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12516
- (exit $ac_status); } && {
12517
- test -z "$ac_c_werror_flag" ||
12518
- test ! -s conftest.err
12519
- } && test -s conftest$ac_exeext && {
12520
- test "$cross_compiling" = yes ||
12521
- $as_test_x conftest$ac_exeext
12523
+if ac_fn_c_try_link "$LINENO"; then :
12524
am_cv_val_LC_MESSAGES=yes
12526
- $as_echo "$as_me: failed program was:" >&5
12527
-sed 's/^/| /' conftest.$ac_ext >&5
12529
- am_cv_val_LC_MESSAGES=no
12530
+ am_cv_val_LC_MESSAGES=no
12533
-rm -rf conftest.dSYM
12534
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12535
- conftest$ac_exeext conftest.$ac_ext
12536
+rm -f core conftest.err conftest.$ac_objext \
12537
+ conftest$ac_exeext conftest.$ac_ext
12539
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
12540
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
12541
$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
12542
if test $am_cv_val_LC_MESSAGES = yes; then
12544
-cat >>confdefs.h <<\_ACEOF
12545
-#define HAVE_LC_MESSAGES 1
12547
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
12551
@@ -16057,150 +14216,20 @@ _ACEOF
12555
- if test "${ac_cv_header_libintl_h+set}" = set; then
12556
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
12557
-$as_echo_n "checking for libintl.h... " >&6; }
12558
-if test "${ac_cv_header_libintl_h+set}" = set; then
12559
- $as_echo_n "(cached) " >&6
12561
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
12562
-$as_echo "$ac_cv_header_libintl_h" >&6; }
12564
- # Is the header compilable?
12565
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
12566
-$as_echo_n "checking libintl.h usability... " >&6; }
12567
-cat >conftest.$ac_ext <<_ACEOF
12570
-cat confdefs.h >>conftest.$ac_ext
12571
-cat >>conftest.$ac_ext <<_ACEOF
12572
-/* end confdefs.h. */
12573
-$ac_includes_default
12574
-#include <libintl.h>
12576
-rm -f conftest.$ac_objext
12577
-if { (ac_try="$ac_compile"
12578
-case "(($ac_try" in
12579
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12580
- *) ac_try_echo=$ac_try;;
12582
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12583
-$as_echo "$ac_try_echo") >&5
12584
- (eval "$ac_compile") 2>conftest.er1
12586
- grep -v '^ *+' conftest.er1 >conftest.err
12587
- rm -f conftest.er1
12588
- cat conftest.err >&5
12589
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12590
- (exit $ac_status); } && {
12591
- test -z "$ac_c_werror_flag" ||
12592
- test ! -s conftest.err
12593
- } && test -s conftest.$ac_objext; then
12594
- ac_header_compiler=yes
12596
- $as_echo "$as_me: failed program was:" >&5
12597
-sed 's/^/| /' conftest.$ac_ext >&5
12599
- ac_header_compiler=no
12602
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12603
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
12604
-$as_echo "$ac_header_compiler" >&6; }
12606
-# Is the header present?
12607
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
12608
-$as_echo_n "checking libintl.h presence... " >&6; }
12609
-cat >conftest.$ac_ext <<_ACEOF
12612
-cat confdefs.h >>conftest.$ac_ext
12613
-cat >>conftest.$ac_ext <<_ACEOF
12614
-/* end confdefs.h. */
12615
-#include <libintl.h>
12617
-if { (ac_try="$ac_cpp conftest.$ac_ext"
12618
-case "(($ac_try" in
12619
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12620
- *) ac_try_echo=$ac_try;;
12622
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12623
-$as_echo "$ac_try_echo") >&5
12624
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
12626
- grep -v '^ *+' conftest.er1 >conftest.err
12627
- rm -f conftest.er1
12628
- cat conftest.err >&5
12629
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12630
- (exit $ac_status); } >/dev/null && {
12631
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
12632
- test ! -s conftest.err
12634
- ac_header_preproc=yes
12636
- $as_echo "$as_me: failed program was:" >&5
12637
-sed 's/^/| /' conftest.$ac_ext >&5
12639
- ac_header_preproc=no
12642
-rm -f conftest.err conftest.$ac_ext
12643
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
12644
-$as_echo "$ac_header_preproc" >&6; }
12646
-# So? What about this header?
12647
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
12649
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
12650
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
12651
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
12652
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
12653
- ac_header_preproc=yes
12656
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
12657
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
12658
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
12659
-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
12660
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
12661
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
12662
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
12663
-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
12664
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
12665
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
12666
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
12667
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
12671
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
12672
-$as_echo_n "checking for libintl.h... " >&6; }
12673
-if test "${ac_cv_header_libintl_h+set}" = set; then
12674
- $as_echo_n "(cached) " >&6
12676
- ac_cv_header_libintl_h=$ac_header_preproc
12678
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
12679
-$as_echo "$ac_cv_header_libintl_h" >&6; }
12682
-if test "x$ac_cv_header_libintl_h" = x""yes; then
12683
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
12684
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
12685
gt_cv_func_dgettext_libintl="no"
12686
libintl_extra_libs=""
12689
# First check in libc
12691
- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
12692
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
12693
$as_echo_n "checking for ngettext in libc... " >&6; }
12694
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
12695
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
12696
$as_echo_n "(cached) " >&6
12698
- cat >conftest.$ac_ext <<_ACEOF
12701
-cat confdefs.h >>conftest.$ac_ext
12702
-cat >>conftest.$ac_ext <<_ACEOF
12703
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12704
/* end confdefs.h. */
12706
#include <libintl.h>
12707
@@ -16213,54 +14242,25 @@ return !ngettext ("","", 1)
12711
-rm -f conftest.$ac_objext conftest$ac_exeext
12712
-if { (ac_try="$ac_link"
12713
-case "(($ac_try" in
12714
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12715
- *) ac_try_echo=$ac_try;;
12717
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12718
-$as_echo "$ac_try_echo") >&5
12719
- (eval "$ac_link") 2>conftest.er1
12721
- grep -v '^ *+' conftest.er1 >conftest.err
12722
- rm -f conftest.er1
12723
- cat conftest.err >&5
12724
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12725
- (exit $ac_status); } && {
12726
- test -z "$ac_c_werror_flag" ||
12727
- test ! -s conftest.err
12728
- } && test -s conftest$ac_exeext && {
12729
- test "$cross_compiling" = yes ||
12730
- $as_test_x conftest$ac_exeext
12732
+if ac_fn_c_try_link "$LINENO"; then :
12733
gt_cv_func_ngettext_libc=yes
12735
- $as_echo "$as_me: failed program was:" >&5
12736
-sed 's/^/| /' conftest.$ac_ext >&5
12738
- gt_cv_func_ngettext_libc=no
12739
+ gt_cv_func_ngettext_libc=no
12742
-rm -rf conftest.dSYM
12743
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12744
- conftest$ac_exeext conftest.$ac_ext
12745
+rm -f core conftest.err conftest.$ac_objext \
12746
+ conftest$ac_exeext conftest.$ac_ext
12749
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
12750
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
12751
$as_echo "$gt_cv_func_ngettext_libc" >&6; }
12753
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
12754
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
12755
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
12756
$as_echo_n "checking for dgettext in libc... " >&6; }
12757
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
12758
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
12759
$as_echo_n "(cached) " >&6
12761
- cat >conftest.$ac_ext <<_ACEOF
12764
-cat confdefs.h >>conftest.$ac_ext
12765
-cat >>conftest.$ac_ext <<_ACEOF
12766
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12767
/* end confdefs.h. */
12769
#include <libintl.h>
12770
@@ -16273,141 +14273,26 @@ return !dgettext ("","")
12774
-rm -f conftest.$ac_objext conftest$ac_exeext
12775
-if { (ac_try="$ac_link"
12776
-case "(($ac_try" in
12777
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12778
- *) ac_try_echo=$ac_try;;
12780
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12781
-$as_echo "$ac_try_echo") >&5
12782
- (eval "$ac_link") 2>conftest.er1
12784
- grep -v '^ *+' conftest.er1 >conftest.err
12785
- rm -f conftest.er1
12786
- cat conftest.err >&5
12787
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12788
- (exit $ac_status); } && {
12789
- test -z "$ac_c_werror_flag" ||
12790
- test ! -s conftest.err
12791
- } && test -s conftest$ac_exeext && {
12792
- test "$cross_compiling" = yes ||
12793
- $as_test_x conftest$ac_exeext
12795
+if ac_fn_c_try_link "$LINENO"; then :
12796
gt_cv_func_dgettext_libc=yes
12798
- $as_echo "$as_me: failed program was:" >&5
12799
-sed 's/^/| /' conftest.$ac_ext >&5
12801
- gt_cv_func_dgettext_libc=no
12802
+ gt_cv_func_dgettext_libc=no
12805
-rm -rf conftest.dSYM
12806
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12807
- conftest$ac_exeext conftest.$ac_ext
12808
+rm -f core conftest.err conftest.$ac_objext \
12809
+ conftest$ac_exeext conftest.$ac_ext
12812
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
12813
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
12814
$as_echo "$gt_cv_func_dgettext_libc" >&6; }
12817
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
12819
-for ac_func in bind_textdomain_codeset
12821
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12822
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
12823
-$as_echo_n "checking for $ac_func... " >&6; }
12824
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
12825
- $as_echo_n "(cached) " >&6
12827
- cat >conftest.$ac_ext <<_ACEOF
12830
-cat confdefs.h >>conftest.$ac_ext
12831
-cat >>conftest.$ac_ext <<_ACEOF
12832
-/* end confdefs.h. */
12833
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
12834
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
12835
-#define $ac_func innocuous_$ac_func
12837
-/* System header to define __stub macros and hopefully few prototypes,
12838
- which can conflict with char $ac_func (); below.
12839
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
12840
- <limits.h> exists even on freestanding compilers. */
12843
-# include <limits.h>
12845
-# include <assert.h>
12850
-/* Override any GCC internal prototype to avoid an error.
12851
- Use char because int might match the return type of a GCC
12852
- builtin and then its argument prototype would still apply. */
12853
-#ifdef __cplusplus
12857
-/* The GNU C library defines this for functions which it implements
12858
- to always fail with ENOSYS. Some functions are actually named
12859
- something starting with __ and the normal name is an alias. */
12860
-#if defined __stub_$ac_func || defined __stub___$ac_func
12867
-return $ac_func ();
12872
-rm -f conftest.$ac_objext conftest$ac_exeext
12873
-if { (ac_try="$ac_link"
12874
-case "(($ac_try" in
12875
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12876
- *) ac_try_echo=$ac_try;;
12878
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12879
-$as_echo "$ac_try_echo") >&5
12880
- (eval "$ac_link") 2>conftest.er1
12882
- grep -v '^ *+' conftest.er1 >conftest.err
12883
- rm -f conftest.er1
12884
- cat conftest.err >&5
12885
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12886
- (exit $ac_status); } && {
12887
- test -z "$ac_c_werror_flag" ||
12888
- test ! -s conftest.err
12889
- } && test -s conftest$ac_exeext && {
12890
- test "$cross_compiling" = yes ||
12891
- $as_test_x conftest$ac_exeext
12893
- eval "$as_ac_var=yes"
12895
- $as_echo "$as_me: failed program was:" >&5
12896
-sed 's/^/| /' conftest.$ac_ext >&5
12898
- eval "$as_ac_var=no"
12901
-rm -rf conftest.dSYM
12902
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12903
- conftest$ac_exeext conftest.$ac_ext
12905
-ac_res=`eval 'as_val=${'$as_ac_var'}
12906
- $as_echo "$as_val"'`
12907
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
12908
-$as_echo "$ac_res" >&6; }
12909
-as_val=`eval 'as_val=${'$as_ac_var'}
12910
- $as_echo "$as_val"'`
12911
- if test "x$as_val" = x""yes; then
12912
+ for ac_func in bind_textdomain_codeset
12914
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
12915
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
12916
cat >>confdefs.h <<_ACEOF
12917
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
12918
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
12922
@@ -16422,18 +14307,14 @@ done
12923
|| test "$gt_cv_func_ngettext_libc" != "yes" \
12924
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
12926
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
12927
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
12928
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
12929
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
12930
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
12931
$as_echo_n "(cached) " >&6
12933
ac_check_lib_save_LIBS=$LIBS
12934
LIBS="-lintl $LIBS"
12935
-cat >conftest.$ac_ext <<_ACEOF
12938
-cat confdefs.h >>conftest.$ac_ext
12939
-cat >>conftest.$ac_ext <<_ACEOF
12940
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12941
/* end confdefs.h. */
12943
/* Override any GCC internal prototype to avoid an error.
12944
@@ -16451,55 +14332,26 @@ return bindtextdomain ();
12948
-rm -f conftest.$ac_objext conftest$ac_exeext
12949
-if { (ac_try="$ac_link"
12950
-case "(($ac_try" in
12951
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12952
- *) ac_try_echo=$ac_try;;
12954
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12955
-$as_echo "$ac_try_echo") >&5
12956
- (eval "$ac_link") 2>conftest.er1
12958
- grep -v '^ *+' conftest.er1 >conftest.err
12959
- rm -f conftest.er1
12960
- cat conftest.err >&5
12961
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12962
- (exit $ac_status); } && {
12963
- test -z "$ac_c_werror_flag" ||
12964
- test ! -s conftest.err
12965
- } && test -s conftest$ac_exeext && {
12966
- test "$cross_compiling" = yes ||
12967
- $as_test_x conftest$ac_exeext
12969
+if ac_fn_c_try_link "$LINENO"; then :
12970
ac_cv_lib_intl_bindtextdomain=yes
12972
- $as_echo "$as_me: failed program was:" >&5
12973
-sed 's/^/| /' conftest.$ac_ext >&5
12975
- ac_cv_lib_intl_bindtextdomain=no
12976
+ ac_cv_lib_intl_bindtextdomain=no
12979
-rm -rf conftest.dSYM
12980
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12981
- conftest$ac_exeext conftest.$ac_ext
12982
+rm -f core conftest.err conftest.$ac_objext \
12983
+ conftest$ac_exeext conftest.$ac_ext
12984
LIBS=$ac_check_lib_save_LIBS
12986
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
12987
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
12988
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
12989
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
12990
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
12991
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
12992
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
12993
$as_echo_n "checking for ngettext in -lintl... " >&6; }
12994
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
12995
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
12996
$as_echo_n "(cached) " >&6
12998
ac_check_lib_save_LIBS=$LIBS
12999
LIBS="-lintl $LIBS"
13000
-cat >conftest.$ac_ext <<_ACEOF
13003
-cat confdefs.h >>conftest.$ac_ext
13004
-cat >>conftest.$ac_ext <<_ACEOF
13005
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13006
/* end confdefs.h. */
13008
/* Override any GCC internal prototype to avoid an error.
13009
@@ -16517,55 +14369,26 @@ return ngettext ();
13013
-rm -f conftest.$ac_objext conftest$ac_exeext
13014
-if { (ac_try="$ac_link"
13015
-case "(($ac_try" in
13016
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13017
- *) ac_try_echo=$ac_try;;
13019
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13020
-$as_echo "$ac_try_echo") >&5
13021
- (eval "$ac_link") 2>conftest.er1
13023
- grep -v '^ *+' conftest.er1 >conftest.err
13024
- rm -f conftest.er1
13025
- cat conftest.err >&5
13026
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13027
- (exit $ac_status); } && {
13028
- test -z "$ac_c_werror_flag" ||
13029
- test ! -s conftest.err
13030
- } && test -s conftest$ac_exeext && {
13031
- test "$cross_compiling" = yes ||
13032
- $as_test_x conftest$ac_exeext
13034
+if ac_fn_c_try_link "$LINENO"; then :
13035
ac_cv_lib_intl_ngettext=yes
13037
- $as_echo "$as_me: failed program was:" >&5
13038
-sed 's/^/| /' conftest.$ac_ext >&5
13040
- ac_cv_lib_intl_ngettext=no
13041
+ ac_cv_lib_intl_ngettext=no
13044
-rm -rf conftest.dSYM
13045
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13046
- conftest$ac_exeext conftest.$ac_ext
13047
+rm -f core conftest.err conftest.$ac_objext \
13048
+ conftest$ac_exeext conftest.$ac_ext
13049
LIBS=$ac_check_lib_save_LIBS
13051
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
13052
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
13053
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
13054
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
13055
- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
13056
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
13057
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
13058
$as_echo_n "checking for dgettext in -lintl... " >&6; }
13059
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
13060
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
13061
$as_echo_n "(cached) " >&6
13063
ac_check_lib_save_LIBS=$LIBS
13064
LIBS="-lintl $LIBS"
13065
-cat >conftest.$ac_ext <<_ACEOF
13068
-cat confdefs.h >>conftest.$ac_ext
13069
-cat >>conftest.$ac_ext <<_ACEOF
13070
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13071
/* end confdefs.h. */
13073
/* Override any GCC internal prototype to avoid an error.
13074
@@ -16574,52 +14397,27 @@ cat >>conftest.$ac_ext <<_ACEOF
13082
-return dgettext ();
13087
-rm -f conftest.$ac_objext conftest$ac_exeext
13088
-if { (ac_try="$ac_link"
13089
-case "(($ac_try" in
13090
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13091
- *) ac_try_echo=$ac_try;;
13093
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13094
-$as_echo "$ac_try_echo") >&5
13095
- (eval "$ac_link") 2>conftest.er1
13097
- grep -v '^ *+' conftest.er1 >conftest.err
13098
- rm -f conftest.er1
13099
- cat conftest.err >&5
13100
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13101
- (exit $ac_status); } && {
13102
- test -z "$ac_c_werror_flag" ||
13103
- test ! -s conftest.err
13104
- } && test -s conftest$ac_exeext && {
13105
- test "$cross_compiling" = yes ||
13106
- $as_test_x conftest$ac_exeext
13112
+return dgettext ();
13117
+if ac_fn_c_try_link "$LINENO"; then :
13118
ac_cv_lib_intl_dgettext=yes
13120
- $as_echo "$as_me: failed program was:" >&5
13121
-sed 's/^/| /' conftest.$ac_ext >&5
13123
- ac_cv_lib_intl_dgettext=no
13124
+ ac_cv_lib_intl_dgettext=no
13127
-rm -rf conftest.dSYM
13128
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13129
- conftest$ac_exeext conftest.$ac_ext
13130
+rm -f core conftest.err conftest.$ac_objext \
13131
+ conftest$ac_exeext conftest.$ac_ext
13132
LIBS=$ac_check_lib_save_LIBS
13134
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
13135
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
13136
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
13137
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
13138
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
13139
gt_cv_func_dgettext_libintl=yes
13142
@@ -16629,22 +14427,18 @@ fi
13145
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
13146
- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
13147
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
13148
$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
13149
- { $as_echo "$as_me:$LINENO: result: " >&5
13150
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
13152
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
13153
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
13154
$as_echo_n "checking for ngettext in -lintl... " >&6; }
13155
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
13156
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
13157
$as_echo_n "(cached) " >&6
13159
ac_check_lib_save_LIBS=$LIBS
13160
LIBS="-lintl -liconv $LIBS"
13161
-cat >conftest.$ac_ext <<_ACEOF
13164
-cat confdefs.h >>conftest.$ac_ext
13165
-cat >>conftest.$ac_ext <<_ACEOF
13166
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13167
/* end confdefs.h. */
13169
/* Override any GCC internal prototype to avoid an error.
13170
@@ -16662,55 +14456,26 @@ return ngettext ();
13174
-rm -f conftest.$ac_objext conftest$ac_exeext
13175
-if { (ac_try="$ac_link"
13176
-case "(($ac_try" in
13177
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13178
- *) ac_try_echo=$ac_try;;
13180
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13181
-$as_echo "$ac_try_echo") >&5
13182
- (eval "$ac_link") 2>conftest.er1
13184
- grep -v '^ *+' conftest.er1 >conftest.err
13185
- rm -f conftest.er1
13186
- cat conftest.err >&5
13187
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13188
- (exit $ac_status); } && {
13189
- test -z "$ac_c_werror_flag" ||
13190
- test ! -s conftest.err
13191
- } && test -s conftest$ac_exeext && {
13192
- test "$cross_compiling" = yes ||
13193
- $as_test_x conftest$ac_exeext
13195
+if ac_fn_c_try_link "$LINENO"; then :
13196
ac_cv_lib_intl_ngettext=yes
13198
- $as_echo "$as_me: failed program was:" >&5
13199
-sed 's/^/| /' conftest.$ac_ext >&5
13201
- ac_cv_lib_intl_ngettext=no
13202
+ ac_cv_lib_intl_ngettext=no
13205
-rm -rf conftest.dSYM
13206
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13207
- conftest$ac_exeext conftest.$ac_ext
13208
+rm -f core conftest.err conftest.$ac_objext \
13209
+ conftest$ac_exeext conftest.$ac_ext
13210
LIBS=$ac_check_lib_save_LIBS
13212
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
13213
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
13214
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
13215
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
13216
- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
13217
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
13218
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
13219
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
13220
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
13221
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
13222
$as_echo_n "(cached) " >&6
13224
ac_check_lib_save_LIBS=$LIBS
13225
LIBS="-lintl -liconv $LIBS"
13226
-cat >conftest.$ac_ext <<_ACEOF
13229
-cat confdefs.h >>conftest.$ac_ext
13230
-cat >>conftest.$ac_ext <<_ACEOF
13231
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13232
/* end confdefs.h. */
13234
/* Override any GCC internal prototype to avoid an error.
13235
@@ -16728,43 +14493,18 @@ return dcgettext ();
13239
-rm -f conftest.$ac_objext conftest$ac_exeext
13240
-if { (ac_try="$ac_link"
13241
-case "(($ac_try" in
13242
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13243
- *) ac_try_echo=$ac_try;;
13245
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13246
-$as_echo "$ac_try_echo") >&5
13247
- (eval "$ac_link") 2>conftest.er1
13249
- grep -v '^ *+' conftest.er1 >conftest.err
13250
- rm -f conftest.er1
13251
- cat conftest.err >&5
13252
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13253
- (exit $ac_status); } && {
13254
- test -z "$ac_c_werror_flag" ||
13255
- test ! -s conftest.err
13256
- } && test -s conftest$ac_exeext && {
13257
- test "$cross_compiling" = yes ||
13258
- $as_test_x conftest$ac_exeext
13260
+if ac_fn_c_try_link "$LINENO"; then :
13261
ac_cv_lib_intl_dcgettext=yes
13263
- $as_echo "$as_me: failed program was:" >&5
13264
-sed 's/^/| /' conftest.$ac_ext >&5
13266
- ac_cv_lib_intl_dcgettext=no
13267
+ ac_cv_lib_intl_dcgettext=no
13270
-rm -rf conftest.dSYM
13271
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13272
- conftest$ac_exeext conftest.$ac_ext
13273
+rm -f core conftest.err conftest.$ac_objext \
13274
+ conftest$ac_exeext conftest.$ac_ext
13275
LIBS=$ac_check_lib_save_LIBS
13277
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
13278
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
13279
$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
13280
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
13281
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
13282
gt_cv_func_dgettext_libintl=yes
13283
libintl_extra_libs=-liconv
13285
@@ -16786,102 +14526,12 @@ fi
13286
glib_save_LIBS="$LIBS"
13287
LIBS="$LIBS -lintl $libintl_extra_libs"
13288
unset ac_cv_func_bind_textdomain_codeset
13290
-for ac_func in bind_textdomain_codeset
13292
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13293
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
13294
-$as_echo_n "checking for $ac_func... " >&6; }
13295
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
13296
- $as_echo_n "(cached) " >&6
13298
- cat >conftest.$ac_ext <<_ACEOF
13301
-cat confdefs.h >>conftest.$ac_ext
13302
-cat >>conftest.$ac_ext <<_ACEOF
13303
-/* end confdefs.h. */
13304
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
13305
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13306
-#define $ac_func innocuous_$ac_func
13308
-/* System header to define __stub macros and hopefully few prototypes,
13309
- which can conflict with char $ac_func (); below.
13310
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13311
- <limits.h> exists even on freestanding compilers. */
13314
-# include <limits.h>
13316
-# include <assert.h>
13321
-/* Override any GCC internal prototype to avoid an error.
13322
- Use char because int might match the return type of a GCC
13323
- builtin and then its argument prototype would still apply. */
13324
-#ifdef __cplusplus
13328
-/* The GNU C library defines this for functions which it implements
13329
- to always fail with ENOSYS. Some functions are actually named
13330
- something starting with __ and the normal name is an alias. */
13331
-#if defined __stub_$ac_func || defined __stub___$ac_func
13338
-return $ac_func ();
13343
-rm -f conftest.$ac_objext conftest$ac_exeext
13344
-if { (ac_try="$ac_link"
13345
-case "(($ac_try" in
13346
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13347
- *) ac_try_echo=$ac_try;;
13349
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13350
-$as_echo "$ac_try_echo") >&5
13351
- (eval "$ac_link") 2>conftest.er1
13353
- grep -v '^ *+' conftest.er1 >conftest.err
13354
- rm -f conftest.er1
13355
- cat conftest.err >&5
13356
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13357
- (exit $ac_status); } && {
13358
- test -z "$ac_c_werror_flag" ||
13359
- test ! -s conftest.err
13360
- } && test -s conftest$ac_exeext && {
13361
- test "$cross_compiling" = yes ||
13362
- $as_test_x conftest$ac_exeext
13364
- eval "$as_ac_var=yes"
13366
- $as_echo "$as_me: failed program was:" >&5
13367
-sed 's/^/| /' conftest.$ac_ext >&5
13369
- eval "$as_ac_var=no"
13372
-rm -rf conftest.dSYM
13373
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13374
- conftest$ac_exeext conftest.$ac_ext
13376
-ac_res=`eval 'as_val=${'$as_ac_var'}
13377
- $as_echo "$as_val"'`
13378
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
13379
-$as_echo "$ac_res" >&6; }
13380
-as_val=`eval 'as_val=${'$as_ac_var'}
13381
- $as_echo "$as_val"'`
13382
- if test "x$as_val" = x""yes; then
13383
+ for ac_func in bind_textdomain_codeset
13385
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
13386
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
13387
cat >>confdefs.h <<_ACEOF
13388
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13389
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
13393
@@ -16911,15 +14561,13 @@ done
13395
if test "$gt_cv_have_gettext" = "yes"; then
13397
-cat >>confdefs.h <<\_ACEOF
13398
-#define HAVE_GETTEXT 1
13400
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
13402
# Extract the first word of "msgfmt", so it can be a program name with args.
13403
set dummy msgfmt; ac_word=$2
13404
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
13405
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13406
$as_echo_n "checking for $ac_word... " >&6; }
13407
-if test "${ac_cv_path_MSGFMT+set}" = set; then
13408
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
13409
$as_echo_n "(cached) " >&6
13412
@@ -16944,118 +14592,28 @@ esac
13414
MSGFMT="$ac_cv_path_MSGFMT"
13415
if test "$MSGFMT" != "no"; then
13416
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
13417
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
13418
$as_echo "$MSGFMT" >&6; }
13420
- { $as_echo "$as_me:$LINENO: result: no" >&5
13421
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13422
$as_echo "no" >&6; }
13424
if test "$MSGFMT" != "no"; then
13425
glib_save_LIBS="$LIBS"
13426
LIBS="$LIBS $INTLLIBS"
13428
-for ac_func in dcgettext
13430
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13431
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
13432
-$as_echo_n "checking for $ac_func... " >&6; }
13433
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
13434
- $as_echo_n "(cached) " >&6
13436
- cat >conftest.$ac_ext <<_ACEOF
13439
-cat confdefs.h >>conftest.$ac_ext
13440
-cat >>conftest.$ac_ext <<_ACEOF
13441
-/* end confdefs.h. */
13442
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
13443
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13444
-#define $ac_func innocuous_$ac_func
13446
-/* System header to define __stub macros and hopefully few prototypes,
13447
- which can conflict with char $ac_func (); below.
13448
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13449
- <limits.h> exists even on freestanding compilers. */
13452
-# include <limits.h>
13454
-# include <assert.h>
13459
-/* Override any GCC internal prototype to avoid an error.
13460
- Use char because int might match the return type of a GCC
13461
- builtin and then its argument prototype would still apply. */
13462
-#ifdef __cplusplus
13466
-/* The GNU C library defines this for functions which it implements
13467
- to always fail with ENOSYS. Some functions are actually named
13468
- something starting with __ and the normal name is an alias. */
13469
-#if defined __stub_$ac_func || defined __stub___$ac_func
13476
-return $ac_func ();
13481
-rm -f conftest.$ac_objext conftest$ac_exeext
13482
-if { (ac_try="$ac_link"
13483
-case "(($ac_try" in
13484
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13485
- *) ac_try_echo=$ac_try;;
13487
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13488
-$as_echo "$ac_try_echo") >&5
13489
- (eval "$ac_link") 2>conftest.er1
13491
- grep -v '^ *+' conftest.er1 >conftest.err
13492
- rm -f conftest.er1
13493
- cat conftest.err >&5
13494
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13495
- (exit $ac_status); } && {
13496
- test -z "$ac_c_werror_flag" ||
13497
- test ! -s conftest.err
13498
- } && test -s conftest$ac_exeext && {
13499
- test "$cross_compiling" = yes ||
13500
- $as_test_x conftest$ac_exeext
13502
- eval "$as_ac_var=yes"
13504
- $as_echo "$as_me: failed program was:" >&5
13505
-sed 's/^/| /' conftest.$ac_ext >&5
13507
- eval "$as_ac_var=no"
13510
-rm -rf conftest.dSYM
13511
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13512
- conftest$ac_exeext conftest.$ac_ext
13514
-ac_res=`eval 'as_val=${'$as_ac_var'}
13515
- $as_echo "$as_val"'`
13516
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
13517
-$as_echo "$ac_res" >&6; }
13518
-as_val=`eval 'as_val=${'$as_ac_var'}
13519
- $as_echo "$as_val"'`
13520
- if test "x$as_val" = x""yes; then
13521
+ for ac_func in dcgettext
13523
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
13524
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
13525
cat >>confdefs.h <<_ACEOF
13526
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13527
+#define HAVE_DCGETTEXT 1
13534
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
13535
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
13536
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
13537
cat >conftest.foo <<_ACEOF
13539
@@ -17070,14 +14628,14 @@ msgstr ""
13540
"Content-Transfer-Encoding: 8bit\n"
13543
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
13544
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
13545
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
13547
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13548
- (exit $ac_status); }; then
13549
- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
13550
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13551
+ test $ac_status = 0; }; then
13552
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13553
$as_echo "yes" >&6; }
13554
-else { $as_echo "$as_me:$LINENO: result: no" >&5
13555
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13556
$as_echo "no" >&6; }
13557
echo "$as_me: failed input was:" >&5
13558
sed 's/^/| /' conftest.foo >&5
13559
@@ -17085,9 +14643,9 @@ fi
13561
# Extract the first word of "gmsgfmt", so it can be a program name with args.
13562
set dummy gmsgfmt; ac_word=$2
13563
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
13564
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13565
$as_echo_n "checking for $ac_word... " >&6; }
13566
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
13567
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
13568
$as_echo_n "(cached) " >&6
13571
@@ -17100,14 +14658,14 @@ for as_dir in $PATH
13574
test -z "$as_dir" && as_dir=.
13575
- for ac_exec_ext in '' $ac_executable_extensions; do
13576
+ for ac_exec_ext in '' $ac_executable_extensions; do
13577
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13578
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
13579
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
13580
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13588
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
13589
@@ -17116,19 +14674,19 @@ esac
13591
GMSGFMT=$ac_cv_path_GMSGFMT
13592
if test -n "$GMSGFMT"; then
13593
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
13594
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
13595
$as_echo "$GMSGFMT" >&6; }
13597
- { $as_echo "$as_me:$LINENO: result: no" >&5
13598
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13599
$as_echo "no" >&6; }
13603
# Extract the first word of "xgettext", so it can be a program name with args.
13604
set dummy xgettext; ac_word=$2
13605
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
13606
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13607
$as_echo_n "checking for $ac_word... " >&6; }
13608
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
13609
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
13610
$as_echo_n "(cached) " >&6
13612
case "$XGETTEXT" in
13613
@@ -17153,18 +14711,14 @@ esac
13615
XGETTEXT="$ac_cv_path_XGETTEXT"
13616
if test "$XGETTEXT" != ":"; then
13617
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
13618
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
13619
$as_echo "$XGETTEXT" >&6; }
13621
- { $as_echo "$as_me:$LINENO: result: no" >&5
13622
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13623
$as_echo "no" >&6; }
13626
- cat >conftest.$ac_ext <<_ACEOF
13629
-cat confdefs.h >>conftest.$ac_ext
13630
-cat >>conftest.$ac_ext <<_ACEOF
13631
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13632
/* end confdefs.h. */
13635
@@ -17176,121 +14730,14 @@ extern int _nl_msg_cat_cntr;
13639
-rm -f conftest.$ac_objext conftest$ac_exeext
13640
-if { (ac_try="$ac_link"
13641
-case "(($ac_try" in
13642
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13643
- *) ac_try_echo=$ac_try;;
13645
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13646
-$as_echo "$ac_try_echo") >&5
13647
- (eval "$ac_link") 2>conftest.er1
13649
- grep -v '^ *+' conftest.er1 >conftest.err
13650
- rm -f conftest.er1
13651
- cat conftest.err >&5
13652
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13653
- (exit $ac_status); } && {
13654
- test -z "$ac_c_werror_flag" ||
13655
- test ! -s conftest.err
13656
- } && test -s conftest$ac_exeext && {
13657
- test "$cross_compiling" = yes ||
13658
- $as_test_x conftest$ac_exeext
13660
+if ac_fn_c_try_link "$LINENO"; then :
13664
- $as_echo "$as_me: failed program was:" >&5
13665
-sed 's/^/| /' conftest.$ac_ext >&5
13670
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
13671
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
13672
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
13673
- $as_echo_n "(cached) " >&6
13675
- cat >conftest.$ac_ext <<_ACEOF
13678
-cat confdefs.h >>conftest.$ac_ext
13679
-cat >>conftest.$ac_ext <<_ACEOF
13680
-/* end confdefs.h. */
13681
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
13682
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13683
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
13685
-/* System header to define __stub macros and hopefully few prototypes,
13686
- which can conflict with char bind_textdomain_codeset (); below.
13687
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13688
- <limits.h> exists even on freestanding compilers. */
13691
-# include <limits.h>
13693
-# include <assert.h>
13696
-#undef bind_textdomain_codeset
13698
-/* Override any GCC internal prototype to avoid an error.
13699
- Use char because int might match the return type of a GCC
13700
- builtin and then its argument prototype would still apply. */
13701
-#ifdef __cplusplus
13704
-char bind_textdomain_codeset ();
13705
-/* The GNU C library defines this for functions which it implements
13706
- to always fail with ENOSYS. Some functions are actually named
13707
- something starting with __ and the normal name is an alias. */
13708
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
13715
-return bind_textdomain_codeset ();
13720
-rm -f conftest.$ac_objext conftest$ac_exeext
13721
-if { (ac_try="$ac_link"
13722
-case "(($ac_try" in
13723
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13724
- *) ac_try_echo=$ac_try;;
13726
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13727
-$as_echo "$ac_try_echo") >&5
13728
- (eval "$ac_link") 2>conftest.er1
13730
- grep -v '^ *+' conftest.er1 >conftest.err
13731
- rm -f conftest.er1
13732
- cat conftest.err >&5
13733
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13734
- (exit $ac_status); } && {
13735
- test -z "$ac_c_werror_flag" ||
13736
- test ! -s conftest.err
13737
- } && test -s conftest$ac_exeext && {
13738
- test "$cross_compiling" = yes ||
13739
- $as_test_x conftest$ac_exeext
13741
- ac_cv_func_bind_textdomain_codeset=yes
13743
- $as_echo "$as_me: failed program was:" >&5
13744
-sed 's/^/| /' conftest.$ac_ext >&5
13746
- ac_cv_func_bind_textdomain_codeset=no
13749
-rm -rf conftest.dSYM
13750
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13751
- conftest$ac_exeext conftest.$ac_ext
13753
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
13754
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
13755
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
13756
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
13757
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
13761
@@ -17305,10 +14752,8 @@ fi
13766
-rm -rf conftest.dSYM
13767
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13768
- conftest$ac_exeext conftest.$ac_ext
13769
+rm -f core conftest.err conftest.$ac_objext \
13770
+ conftest$ac_exeext conftest.$ac_ext
13771
LIBS="$glib_save_LIBS"
13774
@@ -17322,9 +14767,7 @@ fi
13776
if test "$gt_cv_have_gettext" = "yes" ; then
13778
-cat >>confdefs.h <<\_ACEOF
13779
-#define ENABLE_NLS 1
13781
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
13785
@@ -17332,7 +14775,7 @@ _ACEOF
13786
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
13789
- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
13790
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
13791
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
13794
@@ -17365,7 +14808,7 @@ $as_echo "found xgettext program is not
13795
if test "x$ALL_LINGUAS" = "x"; then
13798
- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
13799
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
13800
$as_echo_n "checking for catalogs to be installed... " >&6; }
13802
for presentlang in $ALL_LINGUAS; do
13803
@@ -17390,7 +14833,7 @@ $as_echo_n "checking for catalogs to be
13806
LINGUAS=$NEW_LINGUAS
13807
- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
13808
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
13809
$as_echo "$LINGUAS" >&6; }
13812
@@ -17457,7 +14900,7 @@ LIBBURN_REQUIRED=0.4.0
13813
LIBISOFS_REQUIRED=0.6.4
13815
# Check whether --enable-libburnia was given.
13816
-if test "${enable_libburnia+set}" = set; then
13817
+if test "${enable_libburnia+set}" = set; then :
13818
enableval=$enable_libburnia; enable_libburnia=$enableval
13820
enable_libburnia="yes"
13821
@@ -17467,40 +14910,44 @@ fi
13822
if test x"$enable_libburnia" = "xyes"; then
13825
-{ $as_echo "$as_me:$LINENO: checking for LIBBURNIA" >&5
13826
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBBURNIA" >&5
13827
$as_echo_n "checking for LIBBURNIA... " >&6; }
13829
-if test -n "$LIBBURNIA_CFLAGS"; then
13830
- pkg_cv_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
13831
- elif test -n "$PKG_CONFIG"; then
13832
- if test -n "$PKG_CONFIG" && \
13833
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\"") >&5
13834
+if test -n "$PKG_CONFIG"; then
13835
+ if test -n "$LIBBURNIA_CFLAGS"; then
13836
+ pkg_cv_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
13838
+ if test -n "$PKG_CONFIG" && \
13839
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\""; } >&5
13840
($PKG_CONFIG --exists --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED") 2>&5
13842
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13843
- (exit $ac_status); }; then
13844
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13845
+ test $ac_status = 0; }; then
13846
pkg_cv_LIBBURNIA_CFLAGS=`$PKG_CONFIG --cflags "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>/dev/null`
13851
- pkg_failed=untried
13854
+ pkg_failed=untried
13856
-if test -n "$LIBBURNIA_LIBS"; then
13857
- pkg_cv_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
13858
- elif test -n "$PKG_CONFIG"; then
13859
- if test -n "$PKG_CONFIG" && \
13860
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\"") >&5
13861
+if test -n "$PKG_CONFIG"; then
13862
+ if test -n "$LIBBURNIA_LIBS"; then
13863
+ pkg_cv_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
13865
+ if test -n "$PKG_CONFIG" && \
13866
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libburn-1 >= \$LIBBURN_REQUIRED libisofs-1 >= \$LIBISOFS_REQUIRED\""; } >&5
13867
($PKG_CONFIG --exists --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED") 2>&5
13869
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13870
- (exit $ac_status); }; then
13871
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13872
+ test $ac_status = 0; }; then
13873
pkg_cv_LIBBURNIA_LIBS=`$PKG_CONFIG --libs "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>/dev/null`
13878
- pkg_failed=untried
13881
+ pkg_failed=untried
13885
@@ -17513,14 +14960,14 @@ else
13886
_pkg_short_errors_supported=no
13888
if test $_pkg_short_errors_supported = yes; then
13889
- LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>&1`
13890
+ LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED"`
13892
- LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED" 2>&1`
13893
+ LIBBURNIA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libburn-1 >= $LIBBURN_REQUIRED libisofs-1 >= $LIBISOFS_REQUIRED"`
13895
# Put the nasty error message in config.log where it belongs
13896
echo "$LIBBURNIA_PKG_ERRORS" >&5
13898
- { $as_echo "$as_me:$LINENO: result: no" >&5
13899
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13900
$as_echo "no" >&6; }
13902
elif test $pkg_failed = untried; then
13903
@@ -17528,7 +14975,7 @@ elif test $pkg_failed = untried; then
13905
LIBBURNIA_CFLAGS=$pkg_cv_LIBBURNIA_CFLAGS
13906
LIBBURNIA_LIBS=$pkg_cv_LIBBURNIA_LIBS
13907
- { $as_echo "$as_me:$LINENO: result: yes" >&5
13908
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13909
$as_echo "yes" >&6; }
13910
build_libburnia=yes
13912
@@ -17543,9 +14990,7 @@ if test x"$build_libburnia" = "xyes"; th
13913
BRASERO_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
13914
BRASERO_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
13916
-cat >>confdefs.h <<\_ACEOF
13917
-#define BUILD_LIBBURNIA 1
13919
+$as_echo "#define BUILD_LIBBURNIA 1" >>confdefs.h
13922
if test x"$build_libburnia" = "xyes"; then
13923
@@ -17558,7 +15003,7 @@ fi
13926
# Check whether --enable-cdrtools was given.
13927
-if test "${enable_cdrtools+set}" = set; then
13928
+if test "${enable_cdrtools+set}" = set; then :
13929
enableval=$enable_cdrtools; build_cdrtools=$enableval
13931
build_cdrtools="yes"
13932
@@ -17567,9 +15012,7 @@ fi
13934
if test x"$build_cdrtools" = "xyes"; then
13936
-cat >>confdefs.h <<\_ACEOF
13937
-#define BUILD_CDRTOOLS 1
13939
+$as_echo "#define BUILD_CDRTOOLS 1" >>confdefs.h
13942
build_cdrtools="no"
13943
@@ -17584,7 +15027,7 @@ fi
13946
# Check whether --enable-cdrdao was given.
13947
-if test "${enable_cdrdao+set}" = set; then
13948
+if test "${enable_cdrdao+set}" = set; then :
13949
enableval=$enable_cdrdao; build_cdrdao=$enableval
13952
@@ -17593,9 +15036,7 @@ fi
13954
if test x"$build_cdrdao" = "xyes"; then
13956
-cat >>confdefs.h <<\_ACEOF
13957
-#define BUILD_CDRDAO 1
13959
+$as_echo "#define BUILD_CDRDAO 1" >>confdefs.h
13963
@@ -17610,7 +15051,7 @@ fi
13966
# Check whether --enable-cdrkit was given.
13967
-if test "${enable_cdrkit+set}" = set; then
13968
+if test "${enable_cdrkit+set}" = set; then :
13969
enableval=$enable_cdrkit; build_cdrkit=$enableval
13972
@@ -17619,9 +15060,7 @@ fi
13974
if test x"$build_cdrkit" = "xyes"; then
13976
-cat >>confdefs.h <<\_ACEOF
13977
-#define BUILD_CDRKIT 1
13979
+$as_echo "#define BUILD_CDRKIT 1" >>confdefs.h
13983
@@ -17636,7 +15075,7 @@ fi
13986
# Check whether --enable-growisofs was given.
13987
-if test "${enable_growisofs+set}" = set; then
13988
+if test "${enable_growisofs+set}" = set; then :
13989
enableval=$enable_growisofs; build_growisofs=$enableval
13991
build_growisofs="yes"
13992
@@ -17645,9 +15084,7 @@ fi
13994
if test x"$build_growisofs" = "xyes"; then
13996
-cat >>confdefs.h <<\_ACEOF
13997
-#define BUILD_GROWISOFS 1
13999
+$as_echo "#define BUILD_GROWISOFS 1" >>confdefs.h
14002
build_growisofs="no"
14003
@@ -17669,7 +15106,7 @@ BEAGLE_REQUIRED=0.3.0
14004
TRACKER_REQUIRED=0.8.0
14006
# Check whether --enable-search was given.
14007
-if test "${enable_search+set}" = set; then
14008
+if test "${enable_search+set}" = set; then :
14009
enableval=$enable_search; case "$enableval" in
14010
"auto") enable_search="yes" ;;
14011
"yes") enable_search="yes" ;;
14012
@@ -17686,40 +15123,44 @@ fi
14013
if test x"$enable_search" = "xtracker"; then
14016
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
14017
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
14018
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
14020
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
14021
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14022
- elif test -n "$PKG_CONFIG"; then
14023
- if test -n "$PKG_CONFIG" && \
14024
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
14025
+if test -n "$PKG_CONFIG"; then
14026
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
14027
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14029
+ if test -n "$PKG_CONFIG" && \
14030
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
14031
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
14033
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14034
- (exit $ac_status); }; then
14035
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14036
+ test $ac_status = 0; }; then
14037
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
14042
- pkg_failed=untried
14045
+ pkg_failed=untried
14047
-if test -n "$BRASERO_SEARCH_LIBS"; then
14048
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14049
- elif test -n "$PKG_CONFIG"; then
14050
- if test -n "$PKG_CONFIG" && \
14051
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
14052
+if test -n "$PKG_CONFIG"; then
14053
+ if test -n "$BRASERO_SEARCH_LIBS"; then
14054
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14056
+ if test -n "$PKG_CONFIG" && \
14057
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
14058
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
14060
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14061
- (exit $ac_status); }; then
14062
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14063
+ test $ac_status = 0; }; then
14064
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
14069
- pkg_failed=untried
14072
+ pkg_failed=untried
14076
@@ -17732,25 +15173,14 @@ else
14077
_pkg_short_errors_supported=no
14079
if test $_pkg_short_errors_supported = yes; then
14080
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14081
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14083
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14084
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14086
# Put the nasty error message in config.log where it belongs
14087
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14089
- { { $as_echo "$as_me:$LINENO: error: Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
14091
-$BRASERO_SEARCH_PKG_ERRORS
14093
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
14094
-installed software in a non-standard prefix.
14096
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14097
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14098
-See the pkg-config man page for more details.
14100
-$as_echo "$as_me: error: Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
14101
+ as_fn_error "Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
14103
$BRASERO_SEARCH_PKG_ERRORS
14105
@@ -17760,22 +15190,11 @@ installed software in a non-standard pre
14106
Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14107
and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14108
See the pkg-config man page for more details.
14110
- { (exit 1); exit 1; }; }
14112
elif test $pkg_failed = untried; then
14113
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
14114
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14115
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14116
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
14117
-is in your PATH or set the PKG_CONFIG environment variable to the full
14118
-path to pkg-config.
14120
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14121
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14122
-See the pkg-config man page for more details.
14124
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14125
-See \`config.log' for more details." >&5
14126
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
14127
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
14128
is in your PATH or set the PKG_CONFIG environment variable to the full
14129
path to pkg-config.
14131
@@ -17784,24 +15203,19 @@ and BRASERO_SEARCH_LIBS to avoid the nee
14132
See the pkg-config man page for more details.
14134
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14135
-See \`config.log' for more details." >&2;}
14136
- { (exit 1); exit 1; }; }; }
14137
+See \`config.log' for more details." "$LINENO" 5; }
14139
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14140
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14141
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14142
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14143
$as_echo "yes" >&6; }
14147
-cat >>confdefs.h <<\_ACEOF
14148
-#define BUILD_SEARCH 1
14150
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14153
-cat >>confdefs.h <<\_ACEOF
14154
-#define BUILD_TRACKER 1
14156
+$as_echo "#define BUILD_TRACKER 1" >>confdefs.h
14160
@@ -17811,40 +15225,44 @@ _ACEOF
14161
elif test x"$enable_search" = "xbeagle"; then
14164
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
14165
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
14166
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
14168
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
14169
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14170
- elif test -n "$PKG_CONFIG"; then
14171
- if test -n "$PKG_CONFIG" && \
14172
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14173
+if test -n "$PKG_CONFIG"; then
14174
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
14175
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14177
+ if test -n "$PKG_CONFIG" && \
14178
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14179
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14181
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14182
- (exit $ac_status); }; then
14183
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14184
+ test $ac_status = 0; }; then
14185
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14190
- pkg_failed=untried
14193
+ pkg_failed=untried
14195
-if test -n "$BRASERO_SEARCH_LIBS"; then
14196
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14197
- elif test -n "$PKG_CONFIG"; then
14198
- if test -n "$PKG_CONFIG" && \
14199
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14200
+if test -n "$PKG_CONFIG"; then
14201
+ if test -n "$BRASERO_SEARCH_LIBS"; then
14202
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14204
+ if test -n "$PKG_CONFIG" && \
14205
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14206
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14208
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14209
- (exit $ac_status); }; then
14210
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14211
+ test $ac_status = 0; }; then
14212
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14217
- pkg_failed=untried
14220
+ pkg_failed=untried
14224
@@ -17857,25 +15275,14 @@ else
14225
_pkg_short_errors_supported=no
14227
if test $_pkg_short_errors_supported = yes; then
14228
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14229
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14231
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14232
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14234
# Put the nasty error message in config.log where it belongs
14235
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14237
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
14239
-$BRASERO_SEARCH_PKG_ERRORS
14241
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
14242
-installed software in a non-standard prefix.
14244
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14245
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14246
-See the pkg-config man page for more details.
14248
-$as_echo "$as_me: error: Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
14249
+ as_fn_error "Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
14251
$BRASERO_SEARCH_PKG_ERRORS
14253
@@ -17885,22 +15292,11 @@ installed software in a non-standard pre
14254
Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14255
and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14256
See the pkg-config man page for more details.
14258
- { (exit 1); exit 1; }; }
14260
elif test $pkg_failed = untried; then
14261
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
14262
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14263
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14264
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
14265
-is in your PATH or set the PKG_CONFIG environment variable to the full
14266
-path to pkg-config.
14268
-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
14269
-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
14270
-See the pkg-config man page for more details.
14272
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14273
-See \`config.log' for more details." >&5
14274
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
14275
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
14276
is in your PATH or set the PKG_CONFIG environment variable to the full
14277
path to pkg-config.
14279
@@ -17909,24 +15305,19 @@ and BRASERO_SEARCH_LIBS to avoid the nee
14280
See the pkg-config man page for more details.
14282
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14283
-See \`config.log' for more details." >&2;}
14284
- { (exit 1); exit 1; }; }; }
14285
+See \`config.log' for more details." "$LINENO" 5; }
14287
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14288
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14289
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14290
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14291
$as_echo "yes" >&6; }
14295
-cat >>confdefs.h <<\_ACEOF
14296
-#define BUILD_SEARCH 1
14298
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14301
-cat >>confdefs.h <<\_ACEOF
14302
-#define BUILD_BEAGLE 1
14304
+$as_echo "#define BUILD_BEAGLE 1" >>confdefs.h
14308
@@ -17936,40 +15327,44 @@ _ACEOF
14309
elif test x"$enable_search" = "xyes"; then
14312
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
14313
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
14314
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
14316
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
14317
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14318
- elif test -n "$PKG_CONFIG"; then
14319
- if test -n "$PKG_CONFIG" && \
14320
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
14321
+if test -n "$PKG_CONFIG"; then
14322
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
14323
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14325
+ if test -n "$PKG_CONFIG" && \
14326
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
14327
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
14329
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14330
- (exit $ac_status); }; then
14331
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14332
+ test $ac_status = 0; }; then
14333
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
14338
- pkg_failed=untried
14341
+ pkg_failed=untried
14343
-if test -n "$BRASERO_SEARCH_LIBS"; then
14344
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14345
- elif test -n "$PKG_CONFIG"; then
14346
- if test -n "$PKG_CONFIG" && \
14347
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
14348
+if test -n "$PKG_CONFIG"; then
14349
+ if test -n "$BRASERO_SEARCH_LIBS"; then
14350
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14352
+ if test -n "$PKG_CONFIG" && \
14353
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
14354
($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
14356
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14357
- (exit $ac_status); }; then
14358
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14359
+ test $ac_status = 0; }; then
14360
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
14365
- pkg_failed=untried
14368
+ pkg_failed=untried
14372
@@ -17982,14 +15377,14 @@ else
14373
_pkg_short_errors_supported=no
14375
if test $_pkg_short_errors_supported = yes; then
14376
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14377
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14379
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
14380
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
14382
# Put the nasty error message in config.log where it belongs
14383
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14385
- { $as_echo "$as_me:$LINENO: result: no" >&5
14386
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14387
$as_echo "no" >&6; }
14389
elif test $pkg_failed = untried; then
14390
@@ -17997,20 +15392,16 @@ elif test $pkg_failed = untried; then
14392
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14393
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14394
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14395
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14396
$as_echo "yes" >&6; }
14399
if test x"$build_search" = "xyes"; then
14401
-cat >>confdefs.h <<\_ACEOF
14402
-#define BUILD_SEARCH 1
14404
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14407
-cat >>confdefs.h <<\_ACEOF
14408
-#define BUILD_TRACKER 1
14410
+$as_echo "#define BUILD_TRACKER 1" >>confdefs.h
14414
@@ -18021,40 +15412,44 @@ _ACEOF
14418
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
14419
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
14420
$as_echo_n "checking for BRASERO_SEARCH... " >&6; }
14422
-if test -n "$BRASERO_SEARCH_CFLAGS"; then
14423
- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14424
- elif test -n "$PKG_CONFIG"; then
14425
- if test -n "$PKG_CONFIG" && \
14426
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14427
+if test -n "$PKG_CONFIG"; then
14428
+ if test -n "$BRASERO_SEARCH_CFLAGS"; then
14429
+ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
14431
+ if test -n "$PKG_CONFIG" && \
14432
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14433
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14435
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14436
- (exit $ac_status); }; then
14437
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14438
+ test $ac_status = 0; }; then
14439
pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14444
- pkg_failed=untried
14447
+ pkg_failed=untried
14449
-if test -n "$BRASERO_SEARCH_LIBS"; then
14450
- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14451
- elif test -n "$PKG_CONFIG"; then
14452
- if test -n "$PKG_CONFIG" && \
14453
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
14454
+if test -n "$PKG_CONFIG"; then
14455
+ if test -n "$BRASERO_SEARCH_LIBS"; then
14456
+ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
14458
+ if test -n "$PKG_CONFIG" && \
14459
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
14460
($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
14462
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14463
- (exit $ac_status); }; then
14464
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14465
+ test $ac_status = 0; }; then
14466
pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
14471
- pkg_failed=untried
14474
+ pkg_failed=untried
14478
@@ -18067,14 +15462,14 @@ else
14479
_pkg_short_errors_supported=no
14481
if test $_pkg_short_errors_supported = yes; then
14482
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14483
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14485
- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
14486
+ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
14488
# Put the nasty error message in config.log where it belongs
14489
echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
14491
- { $as_echo "$as_me:$LINENO: result: no" >&5
14492
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14493
$as_echo "no" >&6; }
14495
elif test $pkg_failed = untried; then
14496
@@ -18082,20 +15477,16 @@ elif test $pkg_failed = untried; then
14498
BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
14499
BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
14500
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14501
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14502
$as_echo "yes" >&6; }
14505
if test x"$build_search" = "xyes"; then
14507
-cat >>confdefs.h <<\_ACEOF
14508
-#define BUILD_SEARCH 1
14510
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
14513
-cat >>confdefs.h <<\_ACEOF
14514
-#define BUILD_BEAGLE 1
14516
+$as_echo "#define BUILD_BEAGLE 1" >>confdefs.h
14520
@@ -18137,7 +15528,7 @@ fi
14521
TOTEM_REQUIRED=2.29.1
14523
# Check whether --enable-playlist was given.
14524
-if test "${enable_playlist+set}" = set; then
14525
+if test "${enable_playlist+set}" = set; then :
14526
enableval=$enable_playlist; enable_playlist=$enableval
14528
enable_playlist="yes"
14529
@@ -18147,40 +15538,44 @@ fi
14530
if test x"$enable_playlist" = "xyes"; then
14533
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_PL_PARSER" >&5
14534
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_PL_PARSER" >&5
14535
$as_echo_n "checking for BRASERO_PL_PARSER... " >&6; }
14537
-if test -n "$BRASERO_PL_PARSER_CFLAGS"; then
14538
- pkg_cv_BRASERO_PL_PARSER_CFLAGS="$BRASERO_PL_PARSER_CFLAGS"
14539
- elif test -n "$PKG_CONFIG"; then
14540
- if test -n "$PKG_CONFIG" && \
14541
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\"") >&5
14542
+if test -n "$PKG_CONFIG"; then
14543
+ if test -n "$BRASERO_PL_PARSER_CFLAGS"; then
14544
+ pkg_cv_BRASERO_PL_PARSER_CFLAGS="$BRASERO_PL_PARSER_CFLAGS"
14546
+ if test -n "$PKG_CONFIG" && \
14547
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\""; } >&5
14548
($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_REQUIRED") 2>&5
14550
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14551
- (exit $ac_status); }; then
14552
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14553
+ test $ac_status = 0; }; then
14554
pkg_cv_BRASERO_PL_PARSER_CFLAGS=`$PKG_CONFIG --cflags "totem-plparser >= $TOTEM_REQUIRED" 2>/dev/null`
14559
- pkg_failed=untried
14562
+ pkg_failed=untried
14564
-if test -n "$BRASERO_PL_PARSER_LIBS"; then
14565
- pkg_cv_BRASERO_PL_PARSER_LIBS="$BRASERO_PL_PARSER_LIBS"
14566
- elif test -n "$PKG_CONFIG"; then
14567
- if test -n "$PKG_CONFIG" && \
14568
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\"") >&5
14569
+if test -n "$PKG_CONFIG"; then
14570
+ if test -n "$BRASERO_PL_PARSER_LIBS"; then
14571
+ pkg_cv_BRASERO_PL_PARSER_LIBS="$BRASERO_PL_PARSER_LIBS"
14573
+ if test -n "$PKG_CONFIG" && \
14574
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_REQUIRED\""; } >&5
14575
($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_REQUIRED") 2>&5
14577
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14578
- (exit $ac_status); }; then
14579
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14580
+ test $ac_status = 0; }; then
14581
pkg_cv_BRASERO_PL_PARSER_LIBS=`$PKG_CONFIG --libs "totem-plparser >= $TOTEM_REQUIRED" 2>/dev/null`
14586
- pkg_failed=untried
14589
+ pkg_failed=untried
14593
@@ -18193,14 +15588,14 @@ else
14594
_pkg_short_errors_supported=no
14596
if test $_pkg_short_errors_supported = yes; then
14597
- BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "totem-plparser >= $TOTEM_REQUIRED" 2>&1`
14598
+ BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_REQUIRED"`
14600
- BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "totem-plparser >= $TOTEM_REQUIRED" 2>&1`
14601
+ BRASERO_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_REQUIRED"`
14603
# Put the nasty error message in config.log where it belongs
14604
echo "$BRASERO_PL_PARSER_PKG_ERRORS" >&5
14606
- { $as_echo "$as_me:$LINENO: result: no" >&5
14607
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14608
$as_echo "no" >&6; }
14610
elif test $pkg_failed = untried; then
14611
@@ -18208,7 +15603,7 @@ elif test $pkg_failed = untried; then
14613
BRASERO_PL_PARSER_CFLAGS=$pkg_cv_BRASERO_PL_PARSER_CFLAGS
14614
BRASERO_PL_PARSER_LIBS=$pkg_cv_BRASERO_PL_PARSER_LIBS
14615
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14616
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14617
$as_echo "yes" >&6; }
14620
@@ -18218,9 +15613,7 @@ fi
14622
if test x"$build_totem" = "xyes"; then
14624
-cat >>confdefs.h <<\_ACEOF
14625
-#define BUILD_PLAYLIST 1
14627
+$as_echo "#define BUILD_PLAYLIST 1" >>confdefs.h
14631
@@ -18238,7 +15631,7 @@ fi
14633
GSTREAMER_MODULE_REQUIRED=0.10.0
14634
# Check whether --enable-preview was given.
14635
-if test "${enable_preview+set}" = set; then
14636
+if test "${enable_preview+set}" = set; then :
14637
enableval=$enable_preview; enable_preview=$enableval
14639
enable_preview="yes"
14640
@@ -18248,40 +15641,44 @@ fi
14641
if test x"$enable_preview" = "xyes"; then
14644
-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GSTREAMER_BASE" >&5
14645
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GSTREAMER_BASE" >&5
14646
$as_echo_n "checking for BRASERO_GSTREAMER_BASE... " >&6; }
14648
-if test -n "$BRASERO_GSTREAMER_BASE_CFLAGS"; then
14649
- pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS="$BRASERO_GSTREAMER_BASE_CFLAGS"
14650
- elif test -n "$PKG_CONFIG"; then
14651
- if test -n "$PKG_CONFIG" && \
14652
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\"") >&5
14653
+if test -n "$PKG_CONFIG"; then
14654
+ if test -n "$BRASERO_GSTREAMER_BASE_CFLAGS"; then
14655
+ pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS="$BRASERO_GSTREAMER_BASE_CFLAGS"
14657
+ if test -n "$PKG_CONFIG" && \
14658
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\""; } >&5
14659
($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED") 2>&5
14661
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14662
- (exit $ac_status); }; then
14663
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14664
+ test $ac_status = 0; }; then
14665
pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>/dev/null`
14670
- pkg_failed=untried
14673
+ pkg_failed=untried
14675
-if test -n "$BRASERO_GSTREAMER_BASE_LIBS"; then
14676
- pkg_cv_BRASERO_GSTREAMER_BASE_LIBS="$BRASERO_GSTREAMER_BASE_LIBS"
14677
- elif test -n "$PKG_CONFIG"; then
14678
- if test -n "$PKG_CONFIG" && \
14679
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\"") >&5
14680
+if test -n "$PKG_CONFIG"; then
14681
+ if test -n "$BRASERO_GSTREAMER_BASE_LIBS"; then
14682
+ pkg_cv_BRASERO_GSTREAMER_BASE_LIBS="$BRASERO_GSTREAMER_BASE_LIBS"
14684
+ if test -n "$PKG_CONFIG" && \
14685
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= \$GSTREAMER_MODULE_REQUIRED\""; } >&5
14686
($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED") 2>&5
14688
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14689
- (exit $ac_status); }; then
14690
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14691
+ test $ac_status = 0; }; then
14692
pkg_cv_BRASERO_GSTREAMER_BASE_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>/dev/null`
14697
- pkg_failed=untried
14700
+ pkg_failed=untried
14704
@@ -18294,14 +15691,14 @@ else
14705
_pkg_short_errors_supported=no
14707
if test $_pkg_short_errors_supported = yes; then
14708
- BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>&1`
14709
+ BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED"`
14711
- BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED" 2>&1`
14712
+ BRASERO_GSTREAMER_BASE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10 >= $GSTREAMER_MODULE_REQUIRED"`
14714
# Put the nasty error message in config.log where it belongs
14715
echo "$BRASERO_GSTREAMER_BASE_PKG_ERRORS" >&5
14717
- { $as_echo "$as_me:$LINENO: result: no" >&5
14718
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14719
$as_echo "no" >&6; }
14721
elif test $pkg_failed = untried; then
14722
@@ -18309,7 +15706,7 @@ elif test $pkg_failed = untried; then
14724
BRASERO_GSTREAMER_BASE_CFLAGS=$pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS
14725
BRASERO_GSTREAMER_BASE_LIBS=$pkg_cv_BRASERO_GSTREAMER_BASE_LIBS
14726
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14727
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14728
$as_echo "yes" >&6; }
14731
@@ -18319,9 +15716,7 @@ fi
14733
if test x"$build_preview" = "xyes"; then
14735
-cat >>confdefs.h <<\_ACEOF
14736
-#define BUILD_PREVIEW 1
14738
+$as_echo "#define BUILD_PREVIEW 1" >>confdefs.h
14742
@@ -18338,7 +15733,7 @@ fi
14745
# Check whether --enable-inotify was given.
14746
-if test "${enable_inotify+set}" = set; then
14747
+if test "${enable_inotify+set}" = set; then :
14748
enableval=$enable_inotify; enable_inotify=$enableval
14750
enable_inotify="yes"
14751
@@ -18347,9 +15742,7 @@ fi
14753
if test x"$enable_inotify" = "xyes"; then
14755
-cat >>confdefs.h <<\_ACEOF
14756
-#define BUILD_INOTIFY 1
14758
+$as_echo "#define BUILD_INOTIFY 1" >>confdefs.h
14761
if test x"$enable_inotify" = "xyes"; then
14762
@@ -18365,7 +15758,7 @@ fi
14763
GOBJECT_INTROSPECTION_REQUIRED=0.6.3
14765
# Check whether --enable-introspection was given.
14766
-if test "${enable_introspection+set}" = set; then
14767
+if test "${enable_introspection+set}" = set; then :
14768
enableval=$enable_introspection; enable_introspection=$enableval
14770
enable_introspection="auto"
14771
@@ -18374,7 +15767,7 @@ fi
14774
# Check whether --with-girdir was given.
14775
-if test "${with_girdir+set}" = set; then
14776
+if test "${with_girdir+set}" = set; then :
14777
withval=$with_girdir; ac_with_girdir=$withval
14780
@@ -18383,62 +15776,59 @@ fi
14783
# Check whether --with-typelibdir was given.
14784
-if test "${with_typelibdir+set}" = set; then
14785
+if test "${with_typelibdir+set}" = set; then :
14786
withval=$with_typelibdir; ac_with_typelibdir=$withval
14788
ac_with_typelibdir=""
14792
-{ $as_echo "$as_me:$LINENO: checking for gobject-introspection" >&5
14793
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
14794
$as_echo_n "checking for gobject-introspection... " >&6; }
14796
-case $enable_introspection in
14797
- no) found_introspection="no (disabled, use --enable-introspection to enable)"
14799
- yes) if test -n "$PKG_CONFIG" && \
14800
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\"") >&5
14801
+case $enable_introspection in #(
14803
+ found_introspection="no (disabled, use --enable-introspection to enable)"
14806
+ if test -n "$PKG_CONFIG" && \
14807
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
14808
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
14810
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14811
- (exit $ac_status); }; then
14812
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14813
+ test $ac_status = 0; }; then
14816
- { { $as_echo "$as_me:$LINENO: error: gobject-introspection-1.0 is not installed" >&5
14817
-$as_echo "$as_me: error: gobject-introspection-1.0 is not installed" >&2;}
14818
- { (exit 1); exit 1; }; }
14819
+ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
14821
if test -n "$PKG_CONFIG" && \
14822
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
14823
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
14824
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
14826
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14827
- (exit $ac_status); }; then
14828
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14829
+ test $ac_status = 0; }; then
14830
found_introspection=yes
14832
- { { $as_echo "$as_me:$LINENO: error: You need to have gobject-introspection >= $1 installed to build brasero" >&5
14833
-$as_echo "$as_me: error: You need to have gobject-introspection >= $1 installed to build brasero" >&2;}
14834
- { (exit 1); exit 1; }; }
14835
+ as_fn_error "You need to have gobject-introspection >= $1 installed to build brasero" "$LINENO" 5
14838
- auto) if test -n "$PKG_CONFIG" && \
14839
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
14842
+ if test -n "$PKG_CONFIG" && \
14843
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
14844
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
14846
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14847
- (exit $ac_status); }; then
14848
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14849
+ test $ac_status = 0; }; then
14850
found_introspection=yes
14852
found_introspection=no
14855
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&5
14856
-$as_echo "$as_me: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&2;}
14857
- { (exit 1); exit 1; }; }
14860
+ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
14864
-{ $as_echo "$as_me:$LINENO: result: $found_introspection" >&5
14865
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
14866
$as_echo "$found_introspection" >&6; }
14868
INTROSPECTION_SCANNER=
14869
@@ -18455,14 +15845,14 @@ if test "x$found_introspection" = "xyes"
14870
ac_with_girdir=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
14872
INTROSPECTION_GIRDIR=${ac_with_girdir}
14873
- { $as_echo "$as_me:$LINENO: installing .gir files in ${INTROSPECTION_GIRDIR}" >&5
14874
+ { $as_echo "$as_me:${as_lineno-$LINENO}: installing .gir files in ${INTROSPECTION_GIRDIR}" >&5
14875
$as_echo "$as_me: installing .gir files in ${INTROSPECTION_GIRDIR}" >&6;}
14877
if test "${ac_with_typelibdir}" = ""; then
14878
ac_with_typelibdir="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
14880
INTROSPECTION_TYPELIBDIR=${ac_with_typelibdir}
14881
- { $as_echo "$as_me:$LINENO: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&5
14882
+ { $as_echo "$as_me:${as_lineno-$LINENO}: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&5
14883
$as_echo "$as_me: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&6;}
14886
@@ -18481,7 +15871,7 @@ fi
14889
# Check whether --enable-caches was given.
14890
-if test "${enable_caches+set}" = set; then
14891
+if test "${enable_caches+set}" = set; then :
14892
enableval=$enable_caches; enable_caches=$enableval
14894
enable_caches="yes"
14895
@@ -18506,146 +15896,12 @@ _ACEOF
14900
-for ac_header in locale.h
14902
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14903
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14904
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
14905
-$as_echo_n "checking for $ac_header... " >&6; }
14906
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14907
- $as_echo_n "(cached) " >&6
14909
-ac_res=`eval 'as_val=${'$as_ac_Header'}
14910
- $as_echo "$as_val"'`
14911
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
14912
-$as_echo "$ac_res" >&6; }
14914
- # Is the header compilable?
14915
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
14916
-$as_echo_n "checking $ac_header usability... " >&6; }
14917
-cat >conftest.$ac_ext <<_ACEOF
14920
-cat confdefs.h >>conftest.$ac_ext
14921
-cat >>conftest.$ac_ext <<_ACEOF
14922
-/* end confdefs.h. */
14923
-$ac_includes_default
14924
-#include <$ac_header>
14926
-rm -f conftest.$ac_objext
14927
-if { (ac_try="$ac_compile"
14928
-case "(($ac_try" in
14929
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14930
- *) ac_try_echo=$ac_try;;
14932
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14933
-$as_echo "$ac_try_echo") >&5
14934
- (eval "$ac_compile") 2>conftest.er1
14936
- grep -v '^ *+' conftest.er1 >conftest.err
14937
- rm -f conftest.er1
14938
- cat conftest.err >&5
14939
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14940
- (exit $ac_status); } && {
14941
- test -z "$ac_c_werror_flag" ||
14942
- test ! -s conftest.err
14943
- } && test -s conftest.$ac_objext; then
14944
- ac_header_compiler=yes
14946
- $as_echo "$as_me: failed program was:" >&5
14947
-sed 's/^/| /' conftest.$ac_ext >&5
14949
- ac_header_compiler=no
14952
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14953
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14954
-$as_echo "$ac_header_compiler" >&6; }
14956
-# Is the header present?
14957
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
14958
-$as_echo_n "checking $ac_header presence... " >&6; }
14959
-cat >conftest.$ac_ext <<_ACEOF
14962
-cat confdefs.h >>conftest.$ac_ext
14963
-cat >>conftest.$ac_ext <<_ACEOF
14964
-/* end confdefs.h. */
14965
-#include <$ac_header>
14967
-if { (ac_try="$ac_cpp conftest.$ac_ext"
14968
-case "(($ac_try" in
14969
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14970
- *) ac_try_echo=$ac_try;;
14972
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14973
-$as_echo "$ac_try_echo") >&5
14974
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
14976
- grep -v '^ *+' conftest.er1 >conftest.err
14977
- rm -f conftest.er1
14978
- cat conftest.err >&5
14979
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14980
- (exit $ac_status); } >/dev/null && {
14981
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14982
- test ! -s conftest.err
14984
- ac_header_preproc=yes
14986
- $as_echo "$as_me: failed program was:" >&5
14987
-sed 's/^/| /' conftest.$ac_ext >&5
14989
- ac_header_preproc=no
14992
-rm -f conftest.err conftest.$ac_ext
14993
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14994
-$as_echo "$ac_header_preproc" >&6; }
14996
-# So? What about this header?
14997
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14999
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
15000
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
15001
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
15002
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
15003
- ac_header_preproc=yes
15006
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
15007
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
15008
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
15009
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
15010
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
15011
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
15012
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
15013
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
15014
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
15015
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
15016
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
15017
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
15021
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
15022
-$as_echo_n "checking for $ac_header... " >&6; }
15023
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
15024
- $as_echo_n "(cached) " >&6
15026
- eval "$as_ac_Header=\$ac_header_preproc"
15028
-ac_res=`eval 'as_val=${'$as_ac_Header'}
15029
- $as_echo "$as_val"'`
15030
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
15031
-$as_echo "$ac_res" >&6; }
15034
-as_val=`eval 'as_val=${'$as_ac_Header'}
15035
- $as_echo "$as_val"'`
15036
- if test "x$as_val" = x""yes; then
15037
+ for ac_header in locale.h
15039
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
15040
+if test "x$ac_cv_header_locale_h" = x""yes; then :
15041
cat >>confdefs.h <<_ACEOF
15042
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
15043
+#define HAVE_LOCALE_H 1
15047
@@ -18653,16 +15909,12 @@ fi
15050
if test $ac_cv_header_locale_h = yes; then
15051
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
15052
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
15053
$as_echo_n "checking for LC_MESSAGES... " >&6; }
15054
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
15055
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
15056
$as_echo_n "(cached) " >&6
15058
- cat >conftest.$ac_ext <<_ACEOF
15061
-cat confdefs.h >>conftest.$ac_ext
15062
-cat >>conftest.$ac_ext <<_ACEOF
15063
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15064
/* end confdefs.h. */
15065
#include <locale.h>
15067
@@ -18673,202 +15925,45 @@ return LC_MESSAGES
15071
-rm -f conftest.$ac_objext conftest$ac_exeext
15072
-if { (ac_try="$ac_link"
15073
-case "(($ac_try" in
15074
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15075
- *) ac_try_echo=$ac_try;;
15077
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15078
-$as_echo "$ac_try_echo") >&5
15079
- (eval "$ac_link") 2>conftest.er1
15081
- grep -v '^ *+' conftest.er1 >conftest.err
15082
- rm -f conftest.er1
15083
- cat conftest.err >&5
15084
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15085
- (exit $ac_status); } && {
15086
- test -z "$ac_c_werror_flag" ||
15087
- test ! -s conftest.err
15088
- } && test -s conftest$ac_exeext && {
15089
- test "$cross_compiling" = yes ||
15090
- $as_test_x conftest$ac_exeext
15092
+if ac_fn_c_try_link "$LINENO"; then :
15093
am_cv_val_LC_MESSAGES=yes
15095
- $as_echo "$as_me: failed program was:" >&5
15096
-sed 's/^/| /' conftest.$ac_ext >&5
15098
- am_cv_val_LC_MESSAGES=no
15099
+ am_cv_val_LC_MESSAGES=no
15102
-rm -rf conftest.dSYM
15103
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15104
- conftest$ac_exeext conftest.$ac_ext
15105
+rm -f core conftest.err conftest.$ac_objext \
15106
+ conftest$ac_exeext conftest.$ac_ext
15108
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
15109
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
15110
$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
15111
if test $am_cv_val_LC_MESSAGES = yes; then
15113
-cat >>confdefs.h <<\_ACEOF
15114
-#define HAVE_LC_MESSAGES 1
15116
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
15123
- gt_cv_have_gettext=no
15129
- if test "${ac_cv_header_libintl_h+set}" = set; then
15130
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
15131
-$as_echo_n "checking for libintl.h... " >&6; }
15132
-if test "${ac_cv_header_libintl_h+set}" = set; then
15133
- $as_echo_n "(cached) " >&6
15135
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
15136
-$as_echo "$ac_cv_header_libintl_h" >&6; }
15138
- # Is the header compilable?
15139
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
15140
-$as_echo_n "checking libintl.h usability... " >&6; }
15141
-cat >conftest.$ac_ext <<_ACEOF
15144
-cat confdefs.h >>conftest.$ac_ext
15145
-cat >>conftest.$ac_ext <<_ACEOF
15146
-/* end confdefs.h. */
15147
-$ac_includes_default
15148
-#include <libintl.h>
15150
-rm -f conftest.$ac_objext
15151
-if { (ac_try="$ac_compile"
15152
-case "(($ac_try" in
15153
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15154
- *) ac_try_echo=$ac_try;;
15156
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15157
-$as_echo "$ac_try_echo") >&5
15158
- (eval "$ac_compile") 2>conftest.er1
15160
- grep -v '^ *+' conftest.er1 >conftest.err
15161
- rm -f conftest.er1
15162
- cat conftest.err >&5
15163
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15164
- (exit $ac_status); } && {
15165
- test -z "$ac_c_werror_flag" ||
15166
- test ! -s conftest.err
15167
- } && test -s conftest.$ac_objext; then
15168
- ac_header_compiler=yes
15170
- $as_echo "$as_me: failed program was:" >&5
15171
-sed 's/^/| /' conftest.$ac_ext >&5
15173
- ac_header_compiler=no
15176
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15177
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15178
-$as_echo "$ac_header_compiler" >&6; }
15180
-# Is the header present?
15181
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
15182
-$as_echo_n "checking libintl.h presence... " >&6; }
15183
-cat >conftest.$ac_ext <<_ACEOF
15186
-cat confdefs.h >>conftest.$ac_ext
15187
-cat >>conftest.$ac_ext <<_ACEOF
15188
-/* end confdefs.h. */
15189
-#include <libintl.h>
15191
-if { (ac_try="$ac_cpp conftest.$ac_ext"
15192
-case "(($ac_try" in
15193
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15194
- *) ac_try_echo=$ac_try;;
15196
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15197
-$as_echo "$ac_try_echo") >&5
15198
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
15200
- grep -v '^ *+' conftest.er1 >conftest.err
15201
- rm -f conftest.er1
15202
- cat conftest.err >&5
15203
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15204
- (exit $ac_status); } >/dev/null && {
15205
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15206
- test ! -s conftest.err
15208
- ac_header_preproc=yes
15210
- $as_echo "$as_me: failed program was:" >&5
15211
-sed 's/^/| /' conftest.$ac_ext >&5
15213
- ac_header_preproc=no
15218
-rm -f conftest.err conftest.$ac_ext
15219
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15220
-$as_echo "$ac_header_preproc" >&6; }
15222
-# So? What about this header?
15223
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
15225
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
15226
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
15227
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
15228
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
15229
- ac_header_preproc=yes
15232
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
15233
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
15234
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
15235
-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
15236
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
15237
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
15238
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
15239
-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
15240
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
15241
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
15242
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
15243
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
15244
+ gt_cv_have_gettext=no
15248
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
15249
-$as_echo_n "checking for libintl.h... " >&6; }
15250
-if test "${ac_cv_header_libintl_h+set}" = set; then
15251
- $as_echo_n "(cached) " >&6
15253
- ac_cv_header_libintl_h=$ac_header_preproc
15255
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
15256
-$as_echo "$ac_cv_header_libintl_h" >&6; }
15262
-if test "x$ac_cv_header_libintl_h" = x""yes; then
15263
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
15264
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
15265
gt_cv_func_dgettext_libintl="no"
15266
libintl_extra_libs=""
15269
# First check in libc
15271
- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
15272
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
15273
$as_echo_n "checking for ngettext in libc... " >&6; }
15274
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
15275
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
15276
$as_echo_n "(cached) " >&6
15278
- cat >conftest.$ac_ext <<_ACEOF
15281
-cat confdefs.h >>conftest.$ac_ext
15282
-cat >>conftest.$ac_ext <<_ACEOF
15283
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15284
/* end confdefs.h. */
15286
#include <libintl.h>
15287
@@ -18881,54 +15976,25 @@ return !ngettext ("","", 1)
15291
-rm -f conftest.$ac_objext conftest$ac_exeext
15292
-if { (ac_try="$ac_link"
15293
-case "(($ac_try" in
15294
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15295
- *) ac_try_echo=$ac_try;;
15297
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15298
-$as_echo "$ac_try_echo") >&5
15299
- (eval "$ac_link") 2>conftest.er1
15301
- grep -v '^ *+' conftest.er1 >conftest.err
15302
- rm -f conftest.er1
15303
- cat conftest.err >&5
15304
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15305
- (exit $ac_status); } && {
15306
- test -z "$ac_c_werror_flag" ||
15307
- test ! -s conftest.err
15308
- } && test -s conftest$ac_exeext && {
15309
- test "$cross_compiling" = yes ||
15310
- $as_test_x conftest$ac_exeext
15312
+if ac_fn_c_try_link "$LINENO"; then :
15313
gt_cv_func_ngettext_libc=yes
15315
- $as_echo "$as_me: failed program was:" >&5
15316
-sed 's/^/| /' conftest.$ac_ext >&5
15318
- gt_cv_func_ngettext_libc=no
15319
+ gt_cv_func_ngettext_libc=no
15322
-rm -rf conftest.dSYM
15323
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15324
- conftest$ac_exeext conftest.$ac_ext
15325
+rm -f core conftest.err conftest.$ac_objext \
15326
+ conftest$ac_exeext conftest.$ac_ext
15329
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
15330
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
15331
$as_echo "$gt_cv_func_ngettext_libc" >&6; }
15333
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
15334
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
15335
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
15336
$as_echo_n "checking for dgettext in libc... " >&6; }
15337
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
15338
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
15339
$as_echo_n "(cached) " >&6
15341
- cat >conftest.$ac_ext <<_ACEOF
15344
-cat confdefs.h >>conftest.$ac_ext
15345
-cat >>conftest.$ac_ext <<_ACEOF
15346
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15347
/* end confdefs.h. */
15349
#include <libintl.h>
15350
@@ -18941,141 +16007,26 @@ return !dgettext ("","")
15354
-rm -f conftest.$ac_objext conftest$ac_exeext
15355
-if { (ac_try="$ac_link"
15356
-case "(($ac_try" in
15357
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15358
- *) ac_try_echo=$ac_try;;
15360
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15361
-$as_echo "$ac_try_echo") >&5
15362
- (eval "$ac_link") 2>conftest.er1
15364
- grep -v '^ *+' conftest.er1 >conftest.err
15365
- rm -f conftest.er1
15366
- cat conftest.err >&5
15367
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15368
- (exit $ac_status); } && {
15369
- test -z "$ac_c_werror_flag" ||
15370
- test ! -s conftest.err
15371
- } && test -s conftest$ac_exeext && {
15372
- test "$cross_compiling" = yes ||
15373
- $as_test_x conftest$ac_exeext
15375
+if ac_fn_c_try_link "$LINENO"; then :
15376
gt_cv_func_dgettext_libc=yes
15378
- $as_echo "$as_me: failed program was:" >&5
15379
-sed 's/^/| /' conftest.$ac_ext >&5
15381
- gt_cv_func_dgettext_libc=no
15382
+ gt_cv_func_dgettext_libc=no
15385
-rm -rf conftest.dSYM
15386
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15387
- conftest$ac_exeext conftest.$ac_ext
15388
+rm -f core conftest.err conftest.$ac_objext \
15389
+ conftest$ac_exeext conftest.$ac_ext
15392
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
15393
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
15394
$as_echo "$gt_cv_func_dgettext_libc" >&6; }
15397
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
15399
-for ac_func in bind_textdomain_codeset
15401
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15402
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
15403
-$as_echo_n "checking for $ac_func... " >&6; }
15404
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15405
- $as_echo_n "(cached) " >&6
15407
- cat >conftest.$ac_ext <<_ACEOF
15410
-cat confdefs.h >>conftest.$ac_ext
15411
-cat >>conftest.$ac_ext <<_ACEOF
15412
-/* end confdefs.h. */
15413
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
15414
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
15415
-#define $ac_func innocuous_$ac_func
15417
-/* System header to define __stub macros and hopefully few prototypes,
15418
- which can conflict with char $ac_func (); below.
15419
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
15420
- <limits.h> exists even on freestanding compilers. */
15423
-# include <limits.h>
15425
-# include <assert.h>
15430
-/* Override any GCC internal prototype to avoid an error.
15431
- Use char because int might match the return type of a GCC
15432
- builtin and then its argument prototype would still apply. */
15433
-#ifdef __cplusplus
15437
-/* The GNU C library defines this for functions which it implements
15438
- to always fail with ENOSYS. Some functions are actually named
15439
- something starting with __ and the normal name is an alias. */
15440
-#if defined __stub_$ac_func || defined __stub___$ac_func
15447
-return $ac_func ();
15452
-rm -f conftest.$ac_objext conftest$ac_exeext
15453
-if { (ac_try="$ac_link"
15454
-case "(($ac_try" in
15455
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15456
- *) ac_try_echo=$ac_try;;
15458
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15459
-$as_echo "$ac_try_echo") >&5
15460
- (eval "$ac_link") 2>conftest.er1
15462
- grep -v '^ *+' conftest.er1 >conftest.err
15463
- rm -f conftest.er1
15464
- cat conftest.err >&5
15465
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15466
- (exit $ac_status); } && {
15467
- test -z "$ac_c_werror_flag" ||
15468
- test ! -s conftest.err
15469
- } && test -s conftest$ac_exeext && {
15470
- test "$cross_compiling" = yes ||
15471
- $as_test_x conftest$ac_exeext
15473
- eval "$as_ac_var=yes"
15475
- $as_echo "$as_me: failed program was:" >&5
15476
-sed 's/^/| /' conftest.$ac_ext >&5
15478
- eval "$as_ac_var=no"
15481
-rm -rf conftest.dSYM
15482
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15483
- conftest$ac_exeext conftest.$ac_ext
15485
-ac_res=`eval 'as_val=${'$as_ac_var'}
15486
- $as_echo "$as_val"'`
15487
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
15488
-$as_echo "$ac_res" >&6; }
15489
-as_val=`eval 'as_val=${'$as_ac_var'}
15490
- $as_echo "$as_val"'`
15491
- if test "x$as_val" = x""yes; then
15492
+ for ac_func in bind_textdomain_codeset
15494
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
15495
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
15496
cat >>confdefs.h <<_ACEOF
15497
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
15498
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
15502
@@ -19090,18 +16041,14 @@ done
15503
|| test "$gt_cv_func_ngettext_libc" != "yes" \
15504
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
15506
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
15507
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
15508
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
15509
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
15510
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
15511
$as_echo_n "(cached) " >&6
15513
ac_check_lib_save_LIBS=$LIBS
15514
LIBS="-lintl $LIBS"
15515
-cat >conftest.$ac_ext <<_ACEOF
15518
-cat confdefs.h >>conftest.$ac_ext
15519
-cat >>conftest.$ac_ext <<_ACEOF
15520
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15521
/* end confdefs.h. */
15523
/* Override any GCC internal prototype to avoid an error.
15524
@@ -19119,55 +16066,26 @@ return bindtextdomain ();
15528
-rm -f conftest.$ac_objext conftest$ac_exeext
15529
-if { (ac_try="$ac_link"
15530
-case "(($ac_try" in
15531
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15532
- *) ac_try_echo=$ac_try;;
15534
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15535
-$as_echo "$ac_try_echo") >&5
15536
- (eval "$ac_link") 2>conftest.er1
15538
- grep -v '^ *+' conftest.er1 >conftest.err
15539
- rm -f conftest.er1
15540
- cat conftest.err >&5
15541
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15542
- (exit $ac_status); } && {
15543
- test -z "$ac_c_werror_flag" ||
15544
- test ! -s conftest.err
15545
- } && test -s conftest$ac_exeext && {
15546
- test "$cross_compiling" = yes ||
15547
- $as_test_x conftest$ac_exeext
15549
+if ac_fn_c_try_link "$LINENO"; then :
15550
ac_cv_lib_intl_bindtextdomain=yes
15552
- $as_echo "$as_me: failed program was:" >&5
15553
-sed 's/^/| /' conftest.$ac_ext >&5
15555
- ac_cv_lib_intl_bindtextdomain=no
15556
+ ac_cv_lib_intl_bindtextdomain=no
15559
-rm -rf conftest.dSYM
15560
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15561
- conftest$ac_exeext conftest.$ac_ext
15562
+rm -f core conftest.err conftest.$ac_objext \
15563
+ conftest$ac_exeext conftest.$ac_ext
15564
LIBS=$ac_check_lib_save_LIBS
15566
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
15567
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
15568
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
15569
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
15570
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
15571
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
15572
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
15573
$as_echo_n "checking for ngettext in -lintl... " >&6; }
15574
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
15575
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
15576
$as_echo_n "(cached) " >&6
15578
ac_check_lib_save_LIBS=$LIBS
15579
LIBS="-lintl $LIBS"
15580
-cat >conftest.$ac_ext <<_ACEOF
15583
-cat confdefs.h >>conftest.$ac_ext
15584
-cat >>conftest.$ac_ext <<_ACEOF
15585
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15586
/* end confdefs.h. */
15588
/* Override any GCC internal prototype to avoid an error.
15589
@@ -19185,55 +16103,26 @@ return ngettext ();
15593
-rm -f conftest.$ac_objext conftest$ac_exeext
15594
-if { (ac_try="$ac_link"
15595
-case "(($ac_try" in
15596
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15597
- *) ac_try_echo=$ac_try;;
15599
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15600
-$as_echo "$ac_try_echo") >&5
15601
- (eval "$ac_link") 2>conftest.er1
15603
- grep -v '^ *+' conftest.er1 >conftest.err
15604
- rm -f conftest.er1
15605
- cat conftest.err >&5
15606
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15607
- (exit $ac_status); } && {
15608
- test -z "$ac_c_werror_flag" ||
15609
- test ! -s conftest.err
15610
- } && test -s conftest$ac_exeext && {
15611
- test "$cross_compiling" = yes ||
15612
- $as_test_x conftest$ac_exeext
15614
+if ac_fn_c_try_link "$LINENO"; then :
15615
ac_cv_lib_intl_ngettext=yes
15617
- $as_echo "$as_me: failed program was:" >&5
15618
-sed 's/^/| /' conftest.$ac_ext >&5
15620
- ac_cv_lib_intl_ngettext=no
15621
+ ac_cv_lib_intl_ngettext=no
15624
-rm -rf conftest.dSYM
15625
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15626
- conftest$ac_exeext conftest.$ac_ext
15627
+rm -f core conftest.err conftest.$ac_objext \
15628
+ conftest$ac_exeext conftest.$ac_ext
15629
LIBS=$ac_check_lib_save_LIBS
15631
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
15632
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
15633
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
15634
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
15635
- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
15636
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
15637
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
15638
$as_echo_n "checking for dgettext in -lintl... " >&6; }
15639
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
15640
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
15641
$as_echo_n "(cached) " >&6
15643
ac_check_lib_save_LIBS=$LIBS
15644
LIBS="-lintl $LIBS"
15645
-cat >conftest.$ac_ext <<_ACEOF
15648
-cat confdefs.h >>conftest.$ac_ext
15649
-cat >>conftest.$ac_ext <<_ACEOF
15650
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15651
/* end confdefs.h. */
15653
/* Override any GCC internal prototype to avoid an error.
15654
@@ -19251,43 +16140,18 @@ return dgettext ();
15658
-rm -f conftest.$ac_objext conftest$ac_exeext
15659
-if { (ac_try="$ac_link"
15660
-case "(($ac_try" in
15661
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15662
- *) ac_try_echo=$ac_try;;
15664
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15665
-$as_echo "$ac_try_echo") >&5
15666
- (eval "$ac_link") 2>conftest.er1
15668
- grep -v '^ *+' conftest.er1 >conftest.err
15669
- rm -f conftest.er1
15670
- cat conftest.err >&5
15671
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15672
- (exit $ac_status); } && {
15673
- test -z "$ac_c_werror_flag" ||
15674
- test ! -s conftest.err
15675
- } && test -s conftest$ac_exeext && {
15676
- test "$cross_compiling" = yes ||
15677
- $as_test_x conftest$ac_exeext
15679
+if ac_fn_c_try_link "$LINENO"; then :
15680
ac_cv_lib_intl_dgettext=yes
15682
- $as_echo "$as_me: failed program was:" >&5
15683
-sed 's/^/| /' conftest.$ac_ext >&5
15685
- ac_cv_lib_intl_dgettext=no
15686
+ ac_cv_lib_intl_dgettext=no
15689
-rm -rf conftest.dSYM
15690
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15691
- conftest$ac_exeext conftest.$ac_ext
15692
+rm -f core conftest.err conftest.$ac_objext \
15693
+ conftest$ac_exeext conftest.$ac_ext
15694
LIBS=$ac_check_lib_save_LIBS
15696
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
15697
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
15698
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
15699
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
15700
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
15701
gt_cv_func_dgettext_libintl=yes
15704
@@ -19297,22 +16161,18 @@ fi
15707
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
15708
- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
15709
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
15710
$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
15711
- { $as_echo "$as_me:$LINENO: result: " >&5
15712
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
15714
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
15715
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
15716
$as_echo_n "checking for ngettext in -lintl... " >&6; }
15717
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
15718
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
15719
$as_echo_n "(cached) " >&6
15721
ac_check_lib_save_LIBS=$LIBS
15722
LIBS="-lintl -liconv $LIBS"
15723
-cat >conftest.$ac_ext <<_ACEOF
15726
-cat confdefs.h >>conftest.$ac_ext
15727
-cat >>conftest.$ac_ext <<_ACEOF
15728
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15729
/* end confdefs.h. */
15731
/* Override any GCC internal prototype to avoid an error.
15732
@@ -19330,226 +16190,82 @@ return ngettext ();
15736
-rm -f conftest.$ac_objext conftest$ac_exeext
15737
-if { (ac_try="$ac_link"
15738
-case "(($ac_try" in
15739
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15740
- *) ac_try_echo=$ac_try;;
15742
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15743
-$as_echo "$ac_try_echo") >&5
15744
- (eval "$ac_link") 2>conftest.er1
15746
- grep -v '^ *+' conftest.er1 >conftest.err
15747
- rm -f conftest.er1
15748
- cat conftest.err >&5
15749
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15750
- (exit $ac_status); } && {
15751
- test -z "$ac_c_werror_flag" ||
15752
- test ! -s conftest.err
15753
- } && test -s conftest$ac_exeext && {
15754
- test "$cross_compiling" = yes ||
15755
- $as_test_x conftest$ac_exeext
15757
+if ac_fn_c_try_link "$LINENO"; then :
15758
ac_cv_lib_intl_ngettext=yes
15760
- $as_echo "$as_me: failed program was:" >&5
15761
-sed 's/^/| /' conftest.$ac_ext >&5
15763
- ac_cv_lib_intl_ngettext=no
15764
+ ac_cv_lib_intl_ngettext=no
15767
-rm -rf conftest.dSYM
15768
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15769
- conftest$ac_exeext conftest.$ac_ext
15770
+rm -f core conftest.err conftest.$ac_objext \
15771
+ conftest$ac_exeext conftest.$ac_ext
15772
LIBS=$ac_check_lib_save_LIBS
15774
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
15775
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
15776
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
15777
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
15778
- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
15779
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
15780
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
15781
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
15782
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
15783
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
15784
$as_echo_n "(cached) " >&6
15786
ac_check_lib_save_LIBS=$LIBS
15787
LIBS="-lintl -liconv $LIBS"
15788
-cat >conftest.$ac_ext <<_ACEOF
15791
-cat confdefs.h >>conftest.$ac_ext
15792
-cat >>conftest.$ac_ext <<_ACEOF
15793
-/* end confdefs.h. */
15795
-/* Override any GCC internal prototype to avoid an error.
15796
- Use char because int might match the return type of a GCC
15797
- builtin and then its argument prototype would still apply. */
15798
-#ifdef __cplusplus
15801
-char dcgettext ();
15805
-return dcgettext ();
15810
-rm -f conftest.$ac_objext conftest$ac_exeext
15811
-if { (ac_try="$ac_link"
15812
-case "(($ac_try" in
15813
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15814
- *) ac_try_echo=$ac_try;;
15816
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15817
-$as_echo "$ac_try_echo") >&5
15818
- (eval "$ac_link") 2>conftest.er1
15820
- grep -v '^ *+' conftest.er1 >conftest.err
15821
- rm -f conftest.er1
15822
- cat conftest.err >&5
15823
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15824
- (exit $ac_status); } && {
15825
- test -z "$ac_c_werror_flag" ||
15826
- test ! -s conftest.err
15827
- } && test -s conftest$ac_exeext && {
15828
- test "$cross_compiling" = yes ||
15829
- $as_test_x conftest$ac_exeext
15831
- ac_cv_lib_intl_dcgettext=yes
15833
- $as_echo "$as_me: failed program was:" >&5
15834
-sed 's/^/| /' conftest.$ac_ext >&5
15836
- ac_cv_lib_intl_dcgettext=no
15839
-rm -rf conftest.dSYM
15840
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15841
- conftest$ac_exeext conftest.$ac_ext
15842
-LIBS=$ac_check_lib_save_LIBS
15844
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
15845
-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
15846
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
15847
- gt_cv_func_dgettext_libintl=yes
15848
- libintl_extra_libs=-liconv
15860
- # If we found libintl, then check in it for bind_textdomain_codeset();
15861
- # we'll prefer libc if neither have bind_textdomain_codeset(),
15862
- # and both have dgettext and ngettext
15864
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
15865
- glib_save_LIBS="$LIBS"
15866
- LIBS="$LIBS -lintl $libintl_extra_libs"
15867
- unset ac_cv_func_bind_textdomain_codeset
15869
-for ac_func in bind_textdomain_codeset
15871
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15872
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
15873
-$as_echo_n "checking for $ac_func... " >&6; }
15874
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15875
- $as_echo_n "(cached) " >&6
15877
- cat >conftest.$ac_ext <<_ACEOF
15880
-cat confdefs.h >>conftest.$ac_ext
15881
-cat >>conftest.$ac_ext <<_ACEOF
15882
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15883
/* end confdefs.h. */
15884
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
15885
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
15886
-#define $ac_func innocuous_$ac_func
15888
-/* System header to define __stub macros and hopefully few prototypes,
15889
- which can conflict with char $ac_func (); below.
15890
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
15891
- <limits.h> exists even on freestanding compilers. */
15894
-# include <limits.h>
15896
-# include <assert.h>
15901
/* Override any GCC internal prototype to avoid an error.
15902
Use char because int might match the return type of a GCC
15903
- builtin and then its argument prototype would still apply. */
15904
-#ifdef __cplusplus
15908
-/* The GNU C library defines this for functions which it implements
15909
- to always fail with ENOSYS. Some functions are actually named
15910
- something starting with __ and the normal name is an alias. */
15911
-#if defined __stub_$ac_func || defined __stub___$ac_func
15913
+ builtin and then its argument prototype would still apply. */
15914
+#ifdef __cplusplus
15918
+char dcgettext ();
15922
-return $ac_func ();
15923
+return dcgettext ();
15928
-rm -f conftest.$ac_objext conftest$ac_exeext
15929
-if { (ac_try="$ac_link"
15930
-case "(($ac_try" in
15931
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15932
- *) ac_try_echo=$ac_try;;
15934
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15935
-$as_echo "$ac_try_echo") >&5
15936
- (eval "$ac_link") 2>conftest.er1
15938
- grep -v '^ *+' conftest.er1 >conftest.err
15939
- rm -f conftest.er1
15940
- cat conftest.err >&5
15941
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15942
- (exit $ac_status); } && {
15943
- test -z "$ac_c_werror_flag" ||
15944
- test ! -s conftest.err
15945
- } && test -s conftest$ac_exeext && {
15946
- test "$cross_compiling" = yes ||
15947
- $as_test_x conftest$ac_exeext
15949
- eval "$as_ac_var=yes"
15950
+if ac_fn_c_try_link "$LINENO"; then :
15951
+ ac_cv_lib_intl_dcgettext=yes
15953
- $as_echo "$as_me: failed program was:" >&5
15954
-sed 's/^/| /' conftest.$ac_ext >&5
15956
- eval "$as_ac_var=no"
15957
+ ac_cv_lib_intl_dcgettext=no
15959
+rm -f core conftest.err conftest.$ac_objext \
15960
+ conftest$ac_exeext conftest.$ac_ext
15961
+LIBS=$ac_check_lib_save_LIBS
15963
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
15964
+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
15965
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
15966
+ gt_cv_func_dgettext_libintl=yes
15967
+ libintl_extra_libs=-liconv
15972
-rm -rf conftest.dSYM
15973
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15974
- conftest$ac_exeext conftest.$ac_ext
15978
-ac_res=`eval 'as_val=${'$as_ac_var'}
15979
- $as_echo "$as_val"'`
15980
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
15981
-$as_echo "$ac_res" >&6; }
15982
-as_val=`eval 'as_val=${'$as_ac_var'}
15983
- $as_echo "$as_val"'`
15984
- if test "x$as_val" = x""yes; then
15989
+ # If we found libintl, then check in it for bind_textdomain_codeset();
15990
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
15991
+ # and both have dgettext and ngettext
15993
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
15994
+ glib_save_LIBS="$LIBS"
15995
+ LIBS="$LIBS -lintl $libintl_extra_libs"
15996
+ unset ac_cv_func_bind_textdomain_codeset
15997
+ for ac_func in bind_textdomain_codeset
15999
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
16000
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
16001
cat >>confdefs.h <<_ACEOF
16002
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
16003
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
16007
@@ -19579,15 +16295,13 @@ done
16009
if test "$gt_cv_have_gettext" = "yes"; then
16011
-cat >>confdefs.h <<\_ACEOF
16012
-#define HAVE_GETTEXT 1
16014
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
16016
# Extract the first word of "msgfmt", so it can be a program name with args.
16017
set dummy msgfmt; ac_word=$2
16018
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16019
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16020
$as_echo_n "checking for $ac_word... " >&6; }
16021
-if test "${ac_cv_path_MSGFMT+set}" = set; then
16022
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
16023
$as_echo_n "(cached) " >&6
16026
@@ -19612,118 +16326,28 @@ esac
16028
MSGFMT="$ac_cv_path_MSGFMT"
16029
if test "$MSGFMT" != "no"; then
16030
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
16031
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
16032
$as_echo "$MSGFMT" >&6; }
16034
- { $as_echo "$as_me:$LINENO: result: no" >&5
16035
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16036
$as_echo "no" >&6; }
16038
if test "$MSGFMT" != "no"; then
16039
glib_save_LIBS="$LIBS"
16040
LIBS="$LIBS $INTLLIBS"
16042
-for ac_func in dcgettext
16044
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
16045
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
16046
-$as_echo_n "checking for $ac_func... " >&6; }
16047
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
16048
- $as_echo_n "(cached) " >&6
16050
- cat >conftest.$ac_ext <<_ACEOF
16053
-cat confdefs.h >>conftest.$ac_ext
16054
-cat >>conftest.$ac_ext <<_ACEOF
16055
-/* end confdefs.h. */
16056
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
16057
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
16058
-#define $ac_func innocuous_$ac_func
16060
-/* System header to define __stub macros and hopefully few prototypes,
16061
- which can conflict with char $ac_func (); below.
16062
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
16063
- <limits.h> exists even on freestanding compilers. */
16066
-# include <limits.h>
16068
-# include <assert.h>
16073
-/* Override any GCC internal prototype to avoid an error.
16074
- Use char because int might match the return type of a GCC
16075
- builtin and then its argument prototype would still apply. */
16076
-#ifdef __cplusplus
16080
-/* The GNU C library defines this for functions which it implements
16081
- to always fail with ENOSYS. Some functions are actually named
16082
- something starting with __ and the normal name is an alias. */
16083
-#if defined __stub_$ac_func || defined __stub___$ac_func
16090
-return $ac_func ();
16095
-rm -f conftest.$ac_objext conftest$ac_exeext
16096
-if { (ac_try="$ac_link"
16097
-case "(($ac_try" in
16098
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16099
- *) ac_try_echo=$ac_try;;
16101
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16102
-$as_echo "$ac_try_echo") >&5
16103
- (eval "$ac_link") 2>conftest.er1
16105
- grep -v '^ *+' conftest.er1 >conftest.err
16106
- rm -f conftest.er1
16107
- cat conftest.err >&5
16108
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16109
- (exit $ac_status); } && {
16110
- test -z "$ac_c_werror_flag" ||
16111
- test ! -s conftest.err
16112
- } && test -s conftest$ac_exeext && {
16113
- test "$cross_compiling" = yes ||
16114
- $as_test_x conftest$ac_exeext
16116
- eval "$as_ac_var=yes"
16118
- $as_echo "$as_me: failed program was:" >&5
16119
-sed 's/^/| /' conftest.$ac_ext >&5
16121
- eval "$as_ac_var=no"
16124
-rm -rf conftest.dSYM
16125
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16126
- conftest$ac_exeext conftest.$ac_ext
16128
-ac_res=`eval 'as_val=${'$as_ac_var'}
16129
- $as_echo "$as_val"'`
16130
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
16131
-$as_echo "$ac_res" >&6; }
16132
-as_val=`eval 'as_val=${'$as_ac_var'}
16133
- $as_echo "$as_val"'`
16134
- if test "x$as_val" = x""yes; then
16135
+ for ac_func in dcgettext
16137
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
16138
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
16139
cat >>confdefs.h <<_ACEOF
16140
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
16141
+#define HAVE_DCGETTEXT 1
16148
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
16149
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
16150
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
16151
cat >conftest.foo <<_ACEOF
16153
@@ -19738,14 +16362,14 @@ msgstr ""
16154
"Content-Transfer-Encoding: 8bit\n"
16157
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
16158
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
16159
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
16161
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16162
- (exit $ac_status); }; then
16163
- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
16164
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16165
+ test $ac_status = 0; }; then
16166
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16167
$as_echo "yes" >&6; }
16168
-else { $as_echo "$as_me:$LINENO: result: no" >&5
16169
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16170
$as_echo "no" >&6; }
16171
echo "$as_me: failed input was:" >&5
16172
sed 's/^/| /' conftest.foo >&5
16173
@@ -19753,9 +16377,9 @@ fi
16175
# Extract the first word of "gmsgfmt", so it can be a program name with args.
16176
set dummy gmsgfmt; ac_word=$2
16177
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16178
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16179
$as_echo_n "checking for $ac_word... " >&6; }
16180
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
16181
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
16182
$as_echo_n "(cached) " >&6
16185
@@ -19768,14 +16392,14 @@ for as_dir in $PATH
16188
test -z "$as_dir" && as_dir=.
16189
- for ac_exec_ext in '' $ac_executable_extensions; do
16190
+ for ac_exec_ext in '' $ac_executable_extensions; do
16191
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16192
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
16193
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16194
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16202
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
16203
@@ -19784,19 +16408,19 @@ esac
16205
GMSGFMT=$ac_cv_path_GMSGFMT
16206
if test -n "$GMSGFMT"; then
16207
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
16208
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
16209
$as_echo "$GMSGFMT" >&6; }
16211
- { $as_echo "$as_me:$LINENO: result: no" >&5
16212
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16213
$as_echo "no" >&6; }
16217
# Extract the first word of "xgettext", so it can be a program name with args.
16218
set dummy xgettext; ac_word=$2
16219
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16220
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16221
$as_echo_n "checking for $ac_word... " >&6; }
16222
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
16223
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
16224
$as_echo_n "(cached) " >&6
16226
case "$XGETTEXT" in
16227
@@ -19821,18 +16445,14 @@ esac
16229
XGETTEXT="$ac_cv_path_XGETTEXT"
16230
if test "$XGETTEXT" != ":"; then
16231
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
16232
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
16233
$as_echo "$XGETTEXT" >&6; }
16235
- { $as_echo "$as_me:$LINENO: result: no" >&5
16236
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16237
$as_echo "no" >&6; }
16240
- cat >conftest.$ac_ext <<_ACEOF
16243
-cat confdefs.h >>conftest.$ac_ext
16244
-cat >>conftest.$ac_ext <<_ACEOF
16245
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16246
/* end confdefs.h. */
16249
@@ -19844,121 +16464,14 @@ extern int _nl_msg_cat_cntr;
16253
-rm -f conftest.$ac_objext conftest$ac_exeext
16254
-if { (ac_try="$ac_link"
16255
-case "(($ac_try" in
16256
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16257
- *) ac_try_echo=$ac_try;;
16259
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16260
-$as_echo "$ac_try_echo") >&5
16261
- (eval "$ac_link") 2>conftest.er1
16263
- grep -v '^ *+' conftest.er1 >conftest.err
16264
- rm -f conftest.er1
16265
- cat conftest.err >&5
16266
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16267
- (exit $ac_status); } && {
16268
- test -z "$ac_c_werror_flag" ||
16269
- test ! -s conftest.err
16270
- } && test -s conftest$ac_exeext && {
16271
- test "$cross_compiling" = yes ||
16272
- $as_test_x conftest$ac_exeext
16274
+if ac_fn_c_try_link "$LINENO"; then :
16278
- $as_echo "$as_me: failed program was:" >&5
16279
-sed 's/^/| /' conftest.$ac_ext >&5
16284
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
16285
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
16286
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
16287
- $as_echo_n "(cached) " >&6
16289
- cat >conftest.$ac_ext <<_ACEOF
16292
-cat confdefs.h >>conftest.$ac_ext
16293
-cat >>conftest.$ac_ext <<_ACEOF
16294
-/* end confdefs.h. */
16295
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
16296
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
16297
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
16299
-/* System header to define __stub macros and hopefully few prototypes,
16300
- which can conflict with char bind_textdomain_codeset (); below.
16301
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
16302
- <limits.h> exists even on freestanding compilers. */
16305
-# include <limits.h>
16307
-# include <assert.h>
16310
-#undef bind_textdomain_codeset
16312
-/* Override any GCC internal prototype to avoid an error.
16313
- Use char because int might match the return type of a GCC
16314
- builtin and then its argument prototype would still apply. */
16315
-#ifdef __cplusplus
16318
-char bind_textdomain_codeset ();
16319
-/* The GNU C library defines this for functions which it implements
16320
- to always fail with ENOSYS. Some functions are actually named
16321
- something starting with __ and the normal name is an alias. */
16322
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
16329
-return bind_textdomain_codeset ();
16334
-rm -f conftest.$ac_objext conftest$ac_exeext
16335
-if { (ac_try="$ac_link"
16336
-case "(($ac_try" in
16337
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16338
- *) ac_try_echo=$ac_try;;
16340
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16341
-$as_echo "$ac_try_echo") >&5
16342
- (eval "$ac_link") 2>conftest.er1
16344
- grep -v '^ *+' conftest.er1 >conftest.err
16345
- rm -f conftest.er1
16346
- cat conftest.err >&5
16347
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16348
- (exit $ac_status); } && {
16349
- test -z "$ac_c_werror_flag" ||
16350
- test ! -s conftest.err
16351
- } && test -s conftest$ac_exeext && {
16352
- test "$cross_compiling" = yes ||
16353
- $as_test_x conftest$ac_exeext
16355
- ac_cv_func_bind_textdomain_codeset=yes
16357
- $as_echo "$as_me: failed program was:" >&5
16358
-sed 's/^/| /' conftest.$ac_ext >&5
16360
- ac_cv_func_bind_textdomain_codeset=no
16363
-rm -rf conftest.dSYM
16364
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16365
- conftest$ac_exeext conftest.$ac_ext
16367
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
16368
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
16369
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
16370
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
16371
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
16375
@@ -19973,10 +16486,8 @@ fi
16380
-rm -rf conftest.dSYM
16381
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16382
- conftest$ac_exeext conftest.$ac_ext
16383
+rm -f core conftest.err conftest.$ac_objext \
16384
+ conftest$ac_exeext conftest.$ac_ext
16385
LIBS="$glib_save_LIBS"
16388
@@ -19990,9 +16501,7 @@ fi
16390
if test "$gt_cv_have_gettext" = "yes" ; then
16392
-cat >>confdefs.h <<\_ACEOF
16393
-#define ENABLE_NLS 1
16395
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
16399
@@ -20000,7 +16509,7 @@ _ACEOF
16400
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
16403
- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
16404
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
16405
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
16408
@@ -20033,7 +16542,7 @@ $as_echo "found xgettext program is not
16409
if test "x$ALL_LINGUAS" = "x"; then
16412
- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
16413
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
16414
$as_echo_n "checking for catalogs to be installed... " >&6; }
16416
for presentlang in $ALL_LINGUAS; do
16417
@@ -20058,7 +16567,7 @@ $as_echo_n "checking for catalogs to be
16420
LINGUAS=$NEW_LINGUAS
16421
- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
16422
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
16423
$as_echo "$LINGUAS" >&6; }
16426
@@ -20092,16 +16601,16 @@ $as_echo "$LINGUAS" >&6; }
16430
- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
16431
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
16432
$as_echo_n "checking whether NLS is requested... " >&6; }
16433
# Check whether --enable-nls was given.
16434
-if test "${enable_nls+set}" = set; then
16435
+if test "${enable_nls+set}" = set; then :
16436
enableval=$enable_nls; USE_NLS=$enableval
16441
- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
16442
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
16443
$as_echo "$USE_NLS" >&6; }
16446
@@ -20109,35 +16618,31 @@ $as_echo "$USE_NLS" >&6; }
16448
case "$am__api_version" in
16450
- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
16451
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
16452
- { (exit 1); exit 1; }; }
16453
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
16459
if test -n "0.35.0"; then
16460
- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
16461
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
16462
$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
16464
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
16465
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
16466
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
16468
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
16469
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
16470
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
16471
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
16472
- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
16473
-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
16474
- { (exit 1); exit 1; }; }
16475
+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
16478
# Extract the first word of "intltool-update", so it can be a program name with args.
16479
set dummy intltool-update; ac_word=$2
16480
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16481
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16482
$as_echo_n "checking for $ac_word... " >&6; }
16483
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
16484
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
16485
$as_echo_n "(cached) " >&6
16487
case $INTLTOOL_UPDATE in
16488
@@ -20150,14 +16655,14 @@ for as_dir in $PATH
16491
test -z "$as_dir" && as_dir=.
16492
- for ac_exec_ext in '' $ac_executable_extensions; do
16493
+ for ac_exec_ext in '' $ac_executable_extensions; do
16494
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16495
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
16496
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16497
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16506
@@ -20165,19 +16670,19 @@ esac
16508
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
16509
if test -n "$INTLTOOL_UPDATE"; then
16510
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
16511
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
16512
$as_echo "$INTLTOOL_UPDATE" >&6; }
16514
- { $as_echo "$as_me:$LINENO: result: no" >&5
16515
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16516
$as_echo "no" >&6; }
16520
# Extract the first word of "intltool-merge", so it can be a program name with args.
16521
set dummy intltool-merge; ac_word=$2
16522
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16523
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16524
$as_echo_n "checking for $ac_word... " >&6; }
16525
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
16526
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
16527
$as_echo_n "(cached) " >&6
16529
case $INTLTOOL_MERGE in
16530
@@ -20190,14 +16695,14 @@ for as_dir in $PATH
16533
test -z "$as_dir" && as_dir=.
16534
- for ac_exec_ext in '' $ac_executable_extensions; do
16535
+ for ac_exec_ext in '' $ac_executable_extensions; do
16536
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16537
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
16538
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16539
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16548
@@ -20205,19 +16710,19 @@ esac
16550
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
16551
if test -n "$INTLTOOL_MERGE"; then
16552
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
16553
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
16554
$as_echo "$INTLTOOL_MERGE" >&6; }
16556
- { $as_echo "$as_me:$LINENO: result: no" >&5
16557
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16558
$as_echo "no" >&6; }
16562
# Extract the first word of "intltool-extract", so it can be a program name with args.
16563
set dummy intltool-extract; ac_word=$2
16564
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16565
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16566
$as_echo_n "checking for $ac_word... " >&6; }
16567
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
16568
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
16569
$as_echo_n "(cached) " >&6
16571
case $INTLTOOL_EXTRACT in
16572
@@ -20230,14 +16735,14 @@ for as_dir in $PATH
16575
test -z "$as_dir" && as_dir=.
16576
- for ac_exec_ext in '' $ac_executable_extensions; do
16577
+ for ac_exec_ext in '' $ac_executable_extensions; do
16578
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16579
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
16580
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16581
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16590
@@ -20245,18 +16750,16 @@ esac
16592
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
16593
if test -n "$INTLTOOL_EXTRACT"; then
16594
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
16595
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
16596
$as_echo "$INTLTOOL_EXTRACT" >&6; }
16598
- { $as_echo "$as_me:$LINENO: result: no" >&5
16599
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16600
$as_echo "no" >&6; }
16604
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
16605
- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
16606
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
16607
- { (exit 1); exit 1; }; }
16608
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
16611
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
16612
@@ -20378,9 +16881,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
16613
# Check the gettext tools to make sure they are GNU
16614
# Extract the first word of "xgettext", so it can be a program name with args.
16615
set dummy xgettext; ac_word=$2
16616
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16617
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16618
$as_echo_n "checking for $ac_word... " >&6; }
16619
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
16620
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
16621
$as_echo_n "(cached) " >&6
16624
@@ -20393,14 +16896,14 @@ for as_dir in $PATH
16627
test -z "$as_dir" && as_dir=.
16628
- for ac_exec_ext in '' $ac_executable_extensions; do
16629
+ for ac_exec_ext in '' $ac_executable_extensions; do
16630
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16631
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
16632
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16633
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16642
@@ -20408,19 +16911,19 @@ esac
16644
XGETTEXT=$ac_cv_path_XGETTEXT
16645
if test -n "$XGETTEXT"; then
16646
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
16647
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
16648
$as_echo "$XGETTEXT" >&6; }
16650
- { $as_echo "$as_me:$LINENO: result: no" >&5
16651
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16652
$as_echo "no" >&6; }
16656
# Extract the first word of "msgmerge", so it can be a program name with args.
16657
set dummy msgmerge; ac_word=$2
16658
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16659
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16660
$as_echo_n "checking for $ac_word... " >&6; }
16661
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
16662
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
16663
$as_echo_n "(cached) " >&6
16666
@@ -20433,14 +16936,14 @@ for as_dir in $PATH
16669
test -z "$as_dir" && as_dir=.
16670
- for ac_exec_ext in '' $ac_executable_extensions; do
16671
+ for ac_exec_ext in '' $ac_executable_extensions; do
16672
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16673
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
16674
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16675
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16684
@@ -20448,19 +16951,19 @@ esac
16686
MSGMERGE=$ac_cv_path_MSGMERGE
16687
if test -n "$MSGMERGE"; then
16688
- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
16689
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
16690
$as_echo "$MSGMERGE" >&6; }
16692
- { $as_echo "$as_me:$LINENO: result: no" >&5
16693
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16694
$as_echo "no" >&6; }
16698
# Extract the first word of "msgfmt", so it can be a program name with args.
16699
set dummy msgfmt; ac_word=$2
16700
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16701
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16702
$as_echo_n "checking for $ac_word... " >&6; }
16703
-if test "${ac_cv_path_MSGFMT+set}" = set; then
16704
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
16705
$as_echo_n "(cached) " >&6
16708
@@ -20473,14 +16976,14 @@ for as_dir in $PATH
16711
test -z "$as_dir" && as_dir=.
16712
- for ac_exec_ext in '' $ac_executable_extensions; do
16713
+ for ac_exec_ext in '' $ac_executable_extensions; do
16714
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16715
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
16716
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16717
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16726
@@ -20488,19 +16991,19 @@ esac
16728
MSGFMT=$ac_cv_path_MSGFMT
16729
if test -n "$MSGFMT"; then
16730
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
16731
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
16732
$as_echo "$MSGFMT" >&6; }
16734
- { $as_echo "$as_me:$LINENO: result: no" >&5
16735
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16736
$as_echo "no" >&6; }
16740
# Extract the first word of "gmsgfmt", so it can be a program name with args.
16741
set dummy gmsgfmt; ac_word=$2
16742
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16743
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16744
$as_echo_n "checking for $ac_word... " >&6; }
16745
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
16746
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
16747
$as_echo_n "(cached) " >&6
16750
@@ -20513,14 +17016,14 @@ for as_dir in $PATH
16753
test -z "$as_dir" && as_dir=.
16754
- for ac_exec_ext in '' $ac_executable_extensions; do
16755
+ for ac_exec_ext in '' $ac_executable_extensions; do
16756
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16757
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
16758
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16759
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16767
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
16768
@@ -20529,33 +17032,29 @@ esac
16770
GMSGFMT=$ac_cv_path_GMSGFMT
16771
if test -n "$GMSGFMT"; then
16772
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
16773
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
16774
$as_echo "$GMSGFMT" >&6; }
16776
- { $as_echo "$as_me:$LINENO: result: no" >&5
16777
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16778
$as_echo "no" >&6; }
16782
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
16783
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
16784
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
16785
- { (exit 1); exit 1; }; }
16786
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
16788
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
16789
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
16790
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
16791
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
16792
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
16793
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
16794
- { (exit 1); exit 1; }; }
16795
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
16798
# Extract the first word of "perl", so it can be a program name with args.
16799
set dummy perl; ac_word=$2
16800
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
16801
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16802
$as_echo_n "checking for $ac_word... " >&6; }
16803
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
16804
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
16805
$as_echo_n "(cached) " >&6
16807
case $INTLTOOL_PERL in
16808
@@ -20568,14 +17067,14 @@ for as_dir in $PATH
16811
test -z "$as_dir" && as_dir=.
16812
- for ac_exec_ext in '' $ac_executable_extensions; do
16813
+ for ac_exec_ext in '' $ac_executable_extensions; do
16814
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16815
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
16816
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16817
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16826
@@ -20583,180 +17082,63 @@ esac
16828
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
16829
if test -n "$INTLTOOL_PERL"; then
16830
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
16831
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
16832
$as_echo "$INTLTOOL_PERL" >&6; }
16834
- { $as_echo "$as_me:$LINENO: result: no" >&5
16835
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16836
$as_echo "no" >&6; }
16840
if test -z "$INTLTOOL_PERL"; then
16841
- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
16842
-$as_echo "$as_me: error: perl not found" >&2;}
16843
- { (exit 1); exit 1; }; }
16844
+ as_fn_error "perl not found" "$LINENO" 5
16846
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
16847
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
16848
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
16849
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
16850
if test $? -ne 0; then
16851
- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
16852
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
16853
- { (exit 1); exit 1; }; }
16854
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
16856
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
16857
- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
16858
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
16859
$as_echo "$IT_PERL_VERSION" >&6; }
16861
if test "x" != "xno-xml"; then
16862
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
16863
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
16864
$as_echo_n "checking for XML::Parser... " >&6; }
16865
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
16866
- { $as_echo "$as_me:$LINENO: result: ok" >&5
16867
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
16868
$as_echo "ok" >&6; }
16870
- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
16871
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
16872
- { (exit 1); exit 1; }; }
16876
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
16879
-# Set DATADIRNAME correctly if it is not set yet
16880
-# (copied from glib-gettext.m4)
16881
-if test -z "$DATADIRNAME"; then
16882
- cat >conftest.$ac_ext <<_ACEOF
16885
-cat confdefs.h >>conftest.$ac_ext
16886
-cat >>conftest.$ac_ext <<_ACEOF
16887
-/* end confdefs.h. */
16892
-extern int _nl_msg_cat_cntr;
16893
- return _nl_msg_cat_cntr
16898
-rm -f conftest.$ac_objext conftest$ac_exeext
16899
-if { (ac_try="$ac_link"
16900
-case "(($ac_try" in
16901
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16902
- *) ac_try_echo=$ac_try;;
16904
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16905
-$as_echo "$ac_try_echo") >&5
16906
- (eval "$ac_link") 2>conftest.er1
16908
- grep -v '^ *+' conftest.er1 >conftest.err
16909
- rm -f conftest.er1
16910
- cat conftest.err >&5
16911
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16912
- (exit $ac_status); } && {
16913
- test -z "$ac_c_werror_flag" ||
16914
- test ! -s conftest.err
16915
- } && test -s conftest$ac_exeext && {
16916
- test "$cross_compiling" = yes ||
16917
- $as_test_x conftest$ac_exeext
16919
- DATADIRNAME=share
16921
- $as_echo "$as_me: failed program was:" >&5
16922
-sed 's/^/| /' conftest.$ac_ext >&5
16926
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
16927
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
16928
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
16929
- $as_echo_n "(cached) " >&6
16931
- cat >conftest.$ac_ext <<_ACEOF
16934
-cat confdefs.h >>conftest.$ac_ext
16935
-cat >>conftest.$ac_ext <<_ACEOF
16936
-/* end confdefs.h. */
16937
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
16938
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
16939
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
16941
-/* System header to define __stub macros and hopefully few prototypes,
16942
- which can conflict with char bind_textdomain_codeset (); below.
16943
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
16944
- <limits.h> exists even on freestanding compilers. */
16947
-# include <limits.h>
16949
-# include <assert.h>
16951
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
16955
-#undef bind_textdomain_codeset
16956
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
16958
-/* Override any GCC internal prototype to avoid an error.
16959
- Use char because int might match the return type of a GCC
16960
- builtin and then its argument prototype would still apply. */
16961
-#ifdef __cplusplus
16964
-char bind_textdomain_codeset ();
16965
-/* The GNU C library defines this for functions which it implements
16966
- to always fail with ENOSYS. Some functions are actually named
16967
- something starting with __ and the normal name is an alias. */
16968
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
16972
+# Set DATADIRNAME correctly if it is not set yet
16973
+# (copied from glib-gettext.m4)
16974
+if test -z "$DATADIRNAME"; then
16975
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16976
+/* end confdefs.h. */
16981
-return bind_textdomain_codeset ();
16982
+extern int _nl_msg_cat_cntr;
16983
+ return _nl_msg_cat_cntr
16988
-rm -f conftest.$ac_objext conftest$ac_exeext
16989
-if { (ac_try="$ac_link"
16990
-case "(($ac_try" in
16991
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16992
- *) ac_try_echo=$ac_try;;
16994
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
16995
-$as_echo "$ac_try_echo") >&5
16996
- (eval "$ac_link") 2>conftest.er1
16998
- grep -v '^ *+' conftest.er1 >conftest.err
16999
- rm -f conftest.er1
17000
- cat conftest.err >&5
17001
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17002
- (exit $ac_status); } && {
17003
- test -z "$ac_c_werror_flag" ||
17004
- test ! -s conftest.err
17005
- } && test -s conftest$ac_exeext && {
17006
- test "$cross_compiling" = yes ||
17007
- $as_test_x conftest$ac_exeext
17009
- ac_cv_func_bind_textdomain_codeset=yes
17010
+if ac_fn_c_try_link "$LINENO"; then :
17011
+ DATADIRNAME=share
17013
- $as_echo "$as_me: failed program was:" >&5
17014
-sed 's/^/| /' conftest.$ac_ext >&5
17016
- ac_cv_func_bind_textdomain_codeset=no
17019
-rm -rf conftest.dSYM
17020
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17021
- conftest$ac_exeext conftest.$ac_ext
17023
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
17024
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
17025
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
17028
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
17029
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
17033
@@ -20768,10 +17150,8 @@ fi
17038
-rm -rf conftest.dSYM
17039
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17040
- conftest$ac_exeext conftest.$ac_ext
17041
+rm -f core conftest.err conftest.$ac_objext \
17042
+ conftest$ac_exeext conftest.$ac_ext
17046
@@ -20795,7 +17175,7 @@ fi
17049
# Check whether --enable-schemas-install was given.
17050
-if test "${enable_schemas_install+set}" = set; then
17051
+if test "${enable_schemas_install+set}" = set; then :
17052
enableval=$enable_schemas_install;
17055
@@ -20811,9 +17191,9 @@ fi
17057
# Extract the first word of "gconftool-2", so it can be a program name with args.
17058
set dummy gconftool-2; ac_word=$2
17059
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
17060
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17061
$as_echo_n "checking for $ac_word... " >&6; }
17062
-if test "${ac_cv_path_GCONFTOOL+set}" = set; then
17063
+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
17064
$as_echo_n "(cached) " >&6
17067
@@ -20826,14 +17206,14 @@ for as_dir in $PATH
17070
test -z "$as_dir" && as_dir=.
17071
- for ac_exec_ext in '' $ac_executable_extensions; do
17072
+ for ac_exec_ext in '' $ac_executable_extensions; do
17073
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17074
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
17075
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17076
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17084
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
17085
@@ -20842,18 +17222,16 @@ esac
17087
GCONFTOOL=$ac_cv_path_GCONFTOOL
17088
if test -n "$GCONFTOOL"; then
17089
- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
17090
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
17091
$as_echo "$GCONFTOOL" >&6; }
17093
- { $as_echo "$as_me:$LINENO: result: no" >&5
17094
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17095
$as_echo "no" >&6; }
17099
if test x"$GCONFTOOL" = "xno"; then
17100
- { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
17101
-$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
17102
- { (exit 1); exit 1; }; }
17103
+ as_fn_error "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5
17106
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
17107
@@ -20864,13 +17242,13 @@ fi
17110
# Check whether --with-gconf-source was given.
17111
-if test "${with_gconf_source+set}" = set; then
17112
+if test "${with_gconf_source+set}" = set; then :
17113
withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
17118
- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
17119
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
17120
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
17122
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
17123
@@ -20879,22 +17257,20 @@ $as_echo "Using config source $GCONF_SCH
17126
# Check whether --with-gconf-schema-file-dir was given.
17127
-if test "${with_gconf_schema_file_dir+set}" = set; then
17128
+if test "${with_gconf_schema_file_dir+set}" = set; then :
17129
withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
17134
- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
17135
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
17136
$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
17138
# Check whether --enable-schemas-install was given.
17139
-if test "${enable_schemas_install+set}" = set; then
17140
+if test "${enable_schemas_install+set}" = set; then :
17141
enableval=$enable_schemas_install; case ${enableval} in
17143
- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
17144
-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
17145
- { (exit 1); exit 1; }; } ;;
17146
+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
17150
@@ -20938,13 +17314,13 @@ _ACEOF
17154
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
17155
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
17156
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
17159
_ | IFS | as_nl) ;; #(
17160
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
17161
- *) $as_unset $ac_var ;;
17162
+ *) { eval $ac_var=; unset $ac_var;} ;;
17166
@@ -20952,8 +17328,8 @@ $as_echo "$as_me: WARNING: cache variabl
17168
case $as_nl`(ac_space=' '; set) 2>&1` in #(
17169
*${as_nl}ac_space=\ *)
17170
- # `set' does not quote correctly, so add quotes (double-quote
17171
- # substitution turns \\\\ into \\, and sed turns \\ into \).
17172
+ # `set' does not quote correctly, so add quotes: double-quote
17173
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
17176
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
17177
@@ -20976,11 +17352,11 @@ $as_echo "$as_me: WARNING: cache variabl
17178
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
17179
if test -w "$cache_file"; then
17180
test "x$cache_file" != "x/dev/null" &&
17181
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
17182
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
17183
$as_echo "$as_me: updating cache $cache_file" >&6;}
17184
cat confcache >$cache_file
17186
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
17187
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
17188
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
17191
@@ -21000,8 +17376,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
17192
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
17193
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
17194
# will be set to the directory where LIBOBJS objects are built.
17195
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
17196
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
17197
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
17198
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
17200
LIBOBJS=$ac_libobjs
17202
@@ -21017,234 +17393,142 @@ else
17205
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
17206
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
17207
-Usually this means the macro was only invoked conditionally." >&5
17208
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
17209
-Usually this means the macro was only invoked conditionally." >&2;}
17210
- { (exit 1); exit 1; }; }
17211
+ as_fn_error "conditional \"AMDEP\" was never defined.
17212
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17214
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
17215
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
17216
-Usually this means the macro was only invoked conditionally." >&5
17217
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
17218
-Usually this means the macro was only invoked conditionally." >&2;}
17219
- { (exit 1); exit 1; }; }
17220
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
17221
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17223
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
17224
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
17225
-Usually this means the macro was only invoked conditionally." >&5
17226
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
17227
-Usually this means the macro was only invoked conditionally." >&2;}
17228
- { (exit 1); exit 1; }; }
17229
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
17230
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17232
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
17233
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
17234
-Usually this means the macro was only invoked conditionally." >&5
17235
-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
17236
-Usually this means the macro was only invoked conditionally." >&2;}
17237
- { (exit 1); exit 1; }; }
17238
+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
17239
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17241
if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
17242
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
17243
-Usually this means the macro was only invoked conditionally." >&5
17244
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
17245
-Usually this means the macro was only invoked conditionally." >&2;}
17246
- { (exit 1); exit 1; }; }
17247
+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
17248
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17250
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
17251
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
17252
-Usually this means the macro was only invoked conditionally." >&5
17253
-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
17254
-Usually this means the macro was only invoked conditionally." >&2;}
17255
- { (exit 1); exit 1; }; }
17256
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
17257
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17259
if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
17260
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
17261
-Usually this means the macro was only invoked conditionally." >&5
17262
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
17263
-Usually this means the macro was only invoked conditionally." >&2;}
17264
- { (exit 1); exit 1; }; }
17265
+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
17266
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17268
if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
17269
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
17270
-Usually this means the macro was only invoked conditionally." >&5
17271
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
17272
-Usually this means the macro was only invoked conditionally." >&2;}
17273
- { (exit 1); exit 1; }; }
17274
+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
17275
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17277
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
17278
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
17279
-Usually this means the macro was only invoked conditionally." >&5
17280
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
17281
-Usually this means the macro was only invoked conditionally." >&2;}
17282
- { (exit 1); exit 1; }; }
17283
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
17284
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17286
if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
17287
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
17288
-Usually this means the macro was only invoked conditionally." >&5
17289
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
17290
-Usually this means the macro was only invoked conditionally." >&2;}
17291
- { (exit 1); exit 1; }; }
17292
+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
17293
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17295
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
17296
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
17297
-Usually this means the macro was only invoked conditionally." >&5
17298
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
17299
-Usually this means the macro was only invoked conditionally." >&2;}
17300
- { (exit 1); exit 1; }; }
17301
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
17302
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17304
if test -z "${HAVE_CAM_LIB_H_TRUE}" && test -z "${HAVE_CAM_LIB_H_FALSE}"; then
17305
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAM_LIB_H\" was never defined.
17306
-Usually this means the macro was only invoked conditionally." >&5
17307
-$as_echo "$as_me: error: conditional \"HAVE_CAM_LIB_H\" was never defined.
17308
-Usually this means the macro was only invoked conditionally." >&2;}
17309
- { (exit 1); exit 1; }; }
17310
+ as_fn_error "conditional \"HAVE_CAM_LIB_H\" was never defined.
17311
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17313
if test -z "${HAVE_SG_IO_HDR_T_TRUE}" && test -z "${HAVE_SG_IO_HDR_T_FALSE}"; then
17314
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SG_IO_HDR_T\" was never defined.
17315
-Usually this means the macro was only invoked conditionally." >&5
17316
-$as_echo "$as_me: error: conditional \"HAVE_SG_IO_HDR_T\" was never defined.
17317
-Usually this means the macro was only invoked conditionally." >&2;}
17318
- { (exit 1); exit 1; }; }
17319
+ as_fn_error "conditional \"HAVE_SG_IO_HDR_T\" was never defined.
17320
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17322
if test -z "${HAVE_USCSI_H_TRUE}" && test -z "${HAVE_USCSI_H_FALSE}"; then
17323
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_USCSI_H\" was never defined.
17324
-Usually this means the macro was only invoked conditionally." >&5
17325
-$as_echo "$as_me: error: conditional \"HAVE_USCSI_H\" was never defined.
17326
-Usually this means the macro was only invoked conditionally." >&2;}
17327
- { (exit 1); exit 1; }; }
17328
+ as_fn_error "conditional \"HAVE_USCSI_H\" was never defined.
17329
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17331
if test -z "${HAVE_SCSIIO_H_TRUE}" && test -z "${HAVE_SCSIIO_H_FALSE}"; then
17332
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SCSIIO_H\" was never defined.
17333
-Usually this means the macro was only invoked conditionally." >&5
17334
-$as_echo "$as_me: error: conditional \"HAVE_SCSIIO_H\" was never defined.
17335
-Usually this means the macro was only invoked conditionally." >&2;}
17336
- { (exit 1); exit 1; }; }
17337
+ as_fn_error "conditional \"HAVE_SCSIIO_H\" was never defined.
17338
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17340
if test -z "${BUILD_NAUTILUS_TRUE}" && test -z "${BUILD_NAUTILUS_FALSE}"; then
17341
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_NAUTILUS\" was never defined.
17342
-Usually this means the macro was only invoked conditionally." >&5
17343
-$as_echo "$as_me: error: conditional \"BUILD_NAUTILUS\" was never defined.
17344
-Usually this means the macro was only invoked conditionally." >&2;}
17345
- { (exit 1); exit 1; }; }
17346
+ as_fn_error "conditional \"BUILD_NAUTILUS\" was never defined.
17347
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17349
if test -z "${BUILD_LIBBURNIA_TRUE}" && test -z "${BUILD_LIBBURNIA_FALSE}"; then
17350
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LIBBURNIA\" was never defined.
17351
-Usually this means the macro was only invoked conditionally." >&5
17352
-$as_echo "$as_me: error: conditional \"BUILD_LIBBURNIA\" was never defined.
17353
-Usually this means the macro was only invoked conditionally." >&2;}
17354
- { (exit 1); exit 1; }; }
17355
+ as_fn_error "conditional \"BUILD_LIBBURNIA\" was never defined.
17356
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17358
if test -z "${BUILD_CDRTOOLS_TRUE}" && test -z "${BUILD_CDRTOOLS_FALSE}"; then
17359
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRTOOLS\" was never defined.
17360
-Usually this means the macro was only invoked conditionally." >&5
17361
-$as_echo "$as_me: error: conditional \"BUILD_CDRTOOLS\" was never defined.
17362
-Usually this means the macro was only invoked conditionally." >&2;}
17363
- { (exit 1); exit 1; }; }
17364
+ as_fn_error "conditional \"BUILD_CDRTOOLS\" was never defined.
17365
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17367
if test -z "${BUILD_CDRDAO_TRUE}" && test -z "${BUILD_CDRDAO_FALSE}"; then
17368
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRDAO\" was never defined.
17369
-Usually this means the macro was only invoked conditionally." >&5
17370
-$as_echo "$as_me: error: conditional \"BUILD_CDRDAO\" was never defined.
17371
-Usually this means the macro was only invoked conditionally." >&2;}
17372
- { (exit 1); exit 1; }; }
17373
+ as_fn_error "conditional \"BUILD_CDRDAO\" was never defined.
17374
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17376
if test -z "${BUILD_CDRKIT_TRUE}" && test -z "${BUILD_CDRKIT_FALSE}"; then
17377
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRKIT\" was never defined.
17378
-Usually this means the macro was only invoked conditionally." >&5
17379
-$as_echo "$as_me: error: conditional \"BUILD_CDRKIT\" was never defined.
17380
-Usually this means the macro was only invoked conditionally." >&2;}
17381
- { (exit 1); exit 1; }; }
17382
+ as_fn_error "conditional \"BUILD_CDRKIT\" was never defined.
17383
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17385
if test -z "${BUILD_GROWISOFS_TRUE}" && test -z "${BUILD_GROWISOFS_FALSE}"; then
17386
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GROWISOFS\" was never defined.
17387
-Usually this means the macro was only invoked conditionally." >&5
17388
-$as_echo "$as_me: error: conditional \"BUILD_GROWISOFS\" was never defined.
17389
-Usually this means the macro was only invoked conditionally." >&2;}
17390
- { (exit 1); exit 1; }; }
17391
+ as_fn_error "conditional \"BUILD_GROWISOFS\" was never defined.
17392
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17394
if test -z "${BUILD_SEARCH_TRUE}" && test -z "${BUILD_SEARCH_FALSE}"; then
17395
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SEARCH\" was never defined.
17396
-Usually this means the macro was only invoked conditionally." >&5
17397
-$as_echo "$as_me: error: conditional \"BUILD_SEARCH\" was never defined.
17398
-Usually this means the macro was only invoked conditionally." >&2;}
17399
- { (exit 1); exit 1; }; }
17400
+ as_fn_error "conditional \"BUILD_SEARCH\" was never defined.
17401
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17403
if test -z "${BUILD_BEAGLE_TRUE}" && test -z "${BUILD_BEAGLE_FALSE}"; then
17404
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_BEAGLE\" was never defined.
17405
-Usually this means the macro was only invoked conditionally." >&5
17406
-$as_echo "$as_me: error: conditional \"BUILD_BEAGLE\" was never defined.
17407
-Usually this means the macro was only invoked conditionally." >&2;}
17408
- { (exit 1); exit 1; }; }
17409
+ as_fn_error "conditional \"BUILD_BEAGLE\" was never defined.
17410
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17412
if test -z "${BUILD_TRACKER_TRUE}" && test -z "${BUILD_TRACKER_FALSE}"; then
17413
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TRACKER\" was never defined.
17414
-Usually this means the macro was only invoked conditionally." >&5
17415
-$as_echo "$as_me: error: conditional \"BUILD_TRACKER\" was never defined.
17416
-Usually this means the macro was only invoked conditionally." >&2;}
17417
- { (exit 1); exit 1; }; }
17418
+ as_fn_error "conditional \"BUILD_TRACKER\" was never defined.
17419
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17421
if test -z "${BUILD_PLAYLIST_TRUE}" && test -z "${BUILD_PLAYLIST_FALSE}"; then
17422
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PLAYLIST\" was never defined.
17423
-Usually this means the macro was only invoked conditionally." >&5
17424
-$as_echo "$as_me: error: conditional \"BUILD_PLAYLIST\" was never defined.
17425
-Usually this means the macro was only invoked conditionally." >&2;}
17426
- { (exit 1); exit 1; }; }
17427
+ as_fn_error "conditional \"BUILD_PLAYLIST\" was never defined.
17428
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17430
if test -z "${BUILD_PREVIEW_TRUE}" && test -z "${BUILD_PREVIEW_FALSE}"; then
17431
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PREVIEW\" was never defined.
17432
-Usually this means the macro was only invoked conditionally." >&5
17433
-$as_echo "$as_me: error: conditional \"BUILD_PREVIEW\" was never defined.
17434
-Usually this means the macro was only invoked conditionally." >&2;}
17435
- { (exit 1); exit 1; }; }
17436
+ as_fn_error "conditional \"BUILD_PREVIEW\" was never defined.
17437
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17439
if test -z "${BUILD_INOTIFY_TRUE}" && test -z "${BUILD_INOTIFY_FALSE}"; then
17440
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_INOTIFY\" was never defined.
17441
-Usually this means the macro was only invoked conditionally." >&5
17442
-$as_echo "$as_me: error: conditional \"BUILD_INOTIFY\" was never defined.
17443
-Usually this means the macro was only invoked conditionally." >&2;}
17444
- { (exit 1); exit 1; }; }
17445
+ as_fn_error "conditional \"BUILD_INOTIFY\" was never defined.
17446
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17448
if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
17449
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INTROSPECTION\" was never defined.
17450
-Usually this means the macro was only invoked conditionally." >&5
17451
-$as_echo "$as_me: error: conditional \"HAVE_INTROSPECTION\" was never defined.
17452
-Usually this means the macro was only invoked conditionally." >&2;}
17453
- { (exit 1); exit 1; }; }
17454
+ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
17455
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17457
if test -z "${UPDATE_CACHES_TRUE}" && test -z "${UPDATE_CACHES_FALSE}"; then
17458
- { { $as_echo "$as_me:$LINENO: error: conditional \"UPDATE_CACHES\" was never defined.
17459
-Usually this means the macro was only invoked conditionally." >&5
17460
-$as_echo "$as_me: error: conditional \"UPDATE_CACHES\" was never defined.
17461
-Usually this means the macro was only invoked conditionally." >&2;}
17462
- { (exit 1); exit 1; }; }
17463
+ as_fn_error "conditional \"UPDATE_CACHES\" was never defined.
17464
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17467
ac_config_commands="$ac_config_commands po/stamp-it"
17470
if test -z "${SCHEMAS_INSTALL_TRUE}" && test -z "${SCHEMAS_INSTALL_FALSE}"; then
17471
- { { $as_echo "$as_me:$LINENO: error: conditional \"SCHEMAS_INSTALL\" was never defined.
17472
-Usually this means the macro was only invoked conditionally." >&5
17473
-$as_echo "$as_me: error: conditional \"SCHEMAS_INSTALL\" was never defined.
17474
-Usually this means the macro was only invoked conditionally." >&2;}
17475
- { (exit 1); exit 1; }; }
17476
+ as_fn_error "conditional \"SCHEMAS_INSTALL\" was never defined.
17477
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17479
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
17480
- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
17481
-Usually this means the macro was only invoked conditionally." >&5
17482
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
17483
-Usually this means the macro was only invoked conditionally." >&2;}
17484
- { (exit 1); exit 1; }; }
17485
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
17486
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
17489
: ${CONFIG_STATUS=./config.status}
17491
ac_clean_files_save=$ac_clean_files
17492
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
17493
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
17494
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
17495
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
17496
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17498
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
17500
# Generated by $as_me.
17501
# Run this file to recreate the current configuration.
17502
@@ -21254,17 +17538,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
17504
ac_cs_recheck=false
17506
-SHELL=\${CONFIG_SHELL-$SHELL}
17509
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17510
-## --------------------- ##
17511
-## M4sh Initialization. ##
17512
-## --------------------- ##
17513
+SHELL=\${CONFIG_SHELL-$SHELL}
17516
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
17517
+## -------------------- ##
17518
+## M4sh Initialization. ##
17519
+## -------------------- ##
17521
# Be more Bourne compatible
17522
DUALCASE=1; export DUALCASE # for MKS sh
17523
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
17524
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
17527
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
17528
@@ -21272,23 +17557,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
17529
alias -g '${1+"$@"}'='"$@"'
17530
setopt NO_GLOB_SUBST
17532
- case `(set -o) 2>/dev/null` in
17533
- *posix*) set -o posix ;;
17534
+ case `(set -o) 2>/dev/null` in #(
17536
+ set -o posix ;; #(
17547
-# Avoid depending upon Character Ranges.
17548
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
17549
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
17550
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
17551
-as_cr_digits='0123456789'
17552
-as_cr_alnum=$as_cr_Letters$as_cr_digits
17557
@@ -21296,7 +17573,13 @@ export as_nl
17558
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
17559
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
17560
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
17561
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
17562
+# Prefer a ksh shell builtin over an external printf program on Solaris,
17563
+# but without wasting forks for bash or zsh.
17564
+if test -z "$BASH_VERSION$ZSH_VERSION" \
17565
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
17566
+ as_echo='print -r --'
17567
+ as_echo_n='print -rn --'
17568
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
17569
as_echo='printf %s\n'
17570
as_echo_n='printf %s'
17572
@@ -21307,7 +17590,7 @@ else
17573
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
17574
as_echo_n_body='eval
17579
expr "X$arg" : "X\\(.*\\)$as_nl";
17580
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
17581
@@ -21330,13 +17613,6 @@ if test "${PATH_SEPARATOR+set}" != set;
17585
-# Support unset when possible.
17586
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
17594
# We need space, tab and new line, in precisely that order. Quoting is
17595
@@ -21346,15 +17622,15 @@ fi
17598
# Find who we are. Look in the path if we contain no directory separator.
17601
*[\\/]* ) as_myself=$0 ;;
17602
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17603
for as_dir in $PATH
17606
test -z "$as_dir" && as_dir=.
17607
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
17609
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
17614
@@ -21366,12 +17642,16 @@ if test "x$as_myself" = x; then
17616
if test ! -f "$as_myself"; then
17617
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
17618
- { (exit 1); exit 1; }
17622
-# Work around bugs in pre-3.0 UWIN ksh.
17623
-for as_var in ENV MAIL MAILPATH
17624
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
17625
+# Unset variables that we do not need and which cause bugs (e.g. in
17626
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
17627
+# suppresses any "Segmentation fault" message there. '((' could
17628
+# trigger a bug in pdksh 5.2.14.
17629
+for as_var in BASH_ENV ENV MAIL MAILPATH
17630
+do eval test x\${$as_var+set} = xset \
17631
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
17635
@@ -21383,7 +17663,89 @@ export LC_ALL
17639
-# Required to use basename.
17641
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
17644
+# as_fn_error ERROR [LINENO LOG_FD]
17645
+# ---------------------------------
17646
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
17647
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
17648
+# script with status $?, using 1 if that was 0.
17651
+ as_status=$?; test $as_status -eq 0 && as_status=1
17652
+ if test "$3"; then
17653
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
17654
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
17656
+ $as_echo "$as_me: error: $1" >&2
17657
+ as_fn_exit $as_status
17661
+# as_fn_set_status STATUS
17662
+# -----------------------
17663
+# Set $? to STATUS, without forking.
17664
+as_fn_set_status ()
17667
+} # as_fn_set_status
17669
+# as_fn_exit STATUS
17670
+# -----------------
17671
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
17675
+ as_fn_set_status $1
17681
+# Portably unset VAR.
17684
+ { eval $1=; unset $1;}
17686
+as_unset=as_fn_unset
17687
+# as_fn_append VAR VALUE
17688
+# ----------------------
17689
+# Append the text in VALUE to the end of the definition contained in VAR. Take
17690
+# advantage of any shell optimizations that allow amortized linear growth over
17691
+# repeated appends, instead of the typical quadratic growth present in naive
17692
+# implementations.
17693
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
17694
+ eval 'as_fn_append ()
17705
+# as_fn_arith ARG...
17706
+# ------------------
17707
+# Perform arithmetic evaluation on the ARGs, and store the result in the
17708
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
17709
+# must be portable across $(()) and expr.
17710
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
17711
+ eval 'as_fn_arith ()
17718
+ as_val=`expr "$@" || test $? -eq 1`
17723
if expr a : '\(a\)' >/dev/null 2>&1 &&
17724
test "X`expr 00001 : '.*\(...\)'`" = X001; then
17726
@@ -21397,8 +17759,12 @@ else
17730
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
17731
+ as_dirname=dirname
17736
-# Name of the executable.
17737
as_me=`$as_basename -- "$0" ||
17738
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
17739
X"$0" : 'X\(//\)$' \| \
17740
@@ -21418,76 +17784,25 @@ $as_echo X/"$0" |
17749
- as_lineno_1=$LINENO
17750
- as_lineno_2=$LINENO
17751
- test "x$as_lineno_1" != "x$as_lineno_2" &&
17752
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
17754
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
17755
- # uniformly replaced by the line number. The first 'sed' inserts a
17756
- # line-number line after each line using $LINENO; the second 'sed'
17757
- # does the real work. The second script uses 'N' to pair each
17758
- # line-number line with the line containing $LINENO, and appends
17759
- # trailing '-' during substitution so that $LINENO is not a special
17760
- # case at line end.
17761
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
17762
- # scripts with optimization help from Paolo Bonzini. Blame Lee
17763
- # E. McMahon (1931-1989) for sed's syntax. :-)
17769
- s/[$]LINENO.*/&-/
17775
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
17778
- ' >$as_me.lineno &&
17779
- chmod +x "$as_me.lineno" ||
17780
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
17781
- { (exit 1); exit 1; }; }
17783
- # Don't try to exec as it changes $[0], causing all sort of problems
17784
- # (the dirname of $[0] is not the place where we might find the
17785
- # original and so on. Autoconf is especially sensitive to this).
17786
- . "./$as_me.lineno"
17787
- # Exit status is that of the last command.
17792
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
17793
- as_dirname=dirname
17797
+# Avoid depending upon Character Ranges.
17798
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
17799
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
17800
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
17801
+as_cr_digits='0123456789'
17802
+as_cr_alnum=$as_cr_Letters$as_cr_digits
17804
ECHO_C= ECHO_N= ECHO_T=
17805
-case `echo -n x` in
17806
+case `echo -n x` in #(((((
17808
- case `echo 'x\c'` in
17809
+ case `echo 'xy\c'` in
17810
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
17812
+ xy) ECHO_C='\c';;
17813
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
17819
-if expr a : '\(a\)' >/dev/null 2>&1 &&
17820
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
17826
rm -f conf$$ conf$$.exe conf$$.file
17827
if test -d conf$$.dir; then
17828
@@ -21516,8 +17831,56 @@ fi
17829
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
17830
rmdir conf$$.dir 2>/dev/null
17835
+# Create "$as_dir" as a directory, including parents if necessary.
17839
+ case $as_dir in #(
17840
+ -*) as_dir=./$as_dir;;
17842
+ test -d "$as_dir" || eval $as_mkdir_p || {
17845
+ case $as_dir in #(
17846
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
17847
+ *) as_qdir=$as_dir;;
17849
+ as_dirs="'$as_qdir' $as_dirs"
17850
+ as_dir=`$as_dirname -- "$as_dir" ||
17851
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
17852
+ X"$as_dir" : 'X\(//\)[^/]' \| \
17853
+ X"$as_dir" : 'X\(//\)$' \| \
17854
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
17855
+$as_echo X"$as_dir" |
17856
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17860
+ /^X\(\/\/\)[^/].*/{
17873
+ test -d "$as_dir" && break
17875
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
17876
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
17880
if mkdir -p . 2>/dev/null; then
17882
+ as_mkdir_p='mkdir -p "$as_dir"'
17884
test -d ./-p && rmdir ./-p
17886
@@ -21536,10 +17899,10 @@ else
17887
if test -d "$1"; then
17894
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
17895
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
17896
???[sx]*):;;*)false;;esac;fi
17899
@@ -21554,13 +17917,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
17903
+## ----------------------------------- ##
17904
+## Main body of $CONFIG_STATUS script. ##
17905
+## ----------------------------------- ##
17907
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
17909
-# Save the log message, to keep $[0] and so on meaningful, and to
17910
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17911
+# Save the log message, to keep $0 and so on meaningful, and to
17912
# report actual input values of CONFIG_FILES etc. instead of their
17913
# values after options handling.
17915
This file was extended by brasero $as_me 2.30.1, which was
17916
-generated by GNU Autoconf 2.63. Invocation command line was
17917
+generated by GNU Autoconf 2.65. Invocation command line was
17919
CONFIG_FILES = $CONFIG_FILES
17920
CONFIG_HEADERS = $CONFIG_HEADERS
17921
@@ -21592,13 +17961,15 @@ _ACEOF
17923
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17925
-\`$as_me' instantiates files from templates according to the
17926
-current configuration.
17927
+\`$as_me' instantiates files and other configuration actions
17928
+from templates according to the current configuration. Unless the files
17929
+and actions are specified as TAGs, all are instantiated by default.
17931
-Usage: $0 [OPTION]... [FILE]...
17932
+Usage: $0 [OPTION]... [TAG]...
17934
-h, --help print this help, then exit
17935
-V, --version print version number and configuration settings, then exit
17936
+ --config print configuration, then exit
17937
-q, --quiet, --silent
17938
do not print progress messages
17939
-d, --debug don't remove temporary files
17940
@@ -21617,16 +17988,17 @@ $config_headers
17941
Configuration commands:
17944
-Report bugs to <bug-autoconf@gnu.org>."
17945
+Report bugs to the package provider."
17948
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17949
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17951
brasero config.status 2.30.1
17952
-configured by $0, generated by GNU Autoconf 2.63,
17953
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
17954
+configured by $0, generated by GNU Autoconf 2.65,
17955
+ with options \\"\$ac_cs_config\\"
17957
-Copyright (C) 2008 Free Software Foundation, Inc.
17958
+Copyright (C) 2009 Free Software Foundation, Inc.
17959
This config.status script is free software; the Free Software Foundation
17960
gives unlimited permission to copy, distribute and modify it."
17962
@@ -21662,6 +18034,8 @@ do
17964
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
17965
$as_echo "$ac_cs_version"; exit ;;
17966
+ --config | --confi | --conf | --con | --co | --c )
17967
+ $as_echo "$ac_cs_config"; exit ;;
17968
--debug | --debu | --deb | --de | --d | -d )
17970
--file | --fil | --fi | --f )
17971
@@ -21669,20 +18043,19 @@ do
17973
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
17975
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
17976
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
17977
ac_need_defaults=false;;
17978
--header | --heade | --head | --hea )
17981
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
17983
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
17984
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
17985
ac_need_defaults=false;;
17987
# Conflict between --help and --header
17988
- { $as_echo "$as_me: error: ambiguous option: $1
17989
-Try \`$0 --help' for more information." >&2
17990
- { (exit 1); exit 1; }; };;
17991
+ as_fn_error "ambiguous option: \`$1'
17992
+Try \`$0 --help' for more information.";;
17993
--help | --hel | -h )
17994
$as_echo "$ac_cs_usage"; exit ;;
17995
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
17996
@@ -21690,11 +18063,10 @@ Try \`$0 --help' for more information."
17999
# This is an error.
18000
- -*) { $as_echo "$as_me: error: unrecognized option: $1
18001
-Try \`$0 --help' for more information." >&2
18002
- { (exit 1); exit 1; }; } ;;
18003
+ -*) as_fn_error "unrecognized option: \`$1'
18004
+Try \`$0 --help' for more information." ;;
18006
- *) ac_config_targets="$ac_config_targets $1"
18007
+ *) as_fn_append ac_config_targets " $1"
18008
ac_need_defaults=false ;;
18011
@@ -22045,9 +18417,7 @@ do
18012
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
18013
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
18015
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
18016
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
18017
- { (exit 1); exit 1; }; };;
18018
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
18022
@@ -22074,7 +18444,7 @@ $debug ||
18023
trap 'exit_status=$?
18024
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
18026
- trap '{ (exit 1); exit 1; }' 1 2 13 15
18027
+ trap 'as_fn_exit 1' 1 2 13 15
18029
# Create a (secure) tmp directory for tmp files.
18031
@@ -22085,11 +18455,7 @@ $debug ||
18033
tmp=./conf$$-$RANDOM
18034
(umask 077 && mkdir "$tmp")
18037
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
18038
- { (exit 1); exit 1; }
18040
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
18042
# Set up the scripts for CONFIG_FILES section.
18043
# No need to generate them if there are no CONFIG_FILES.
18044
@@ -22097,10 +18463,16 @@ $debug ||
18045
if test -n "$CONFIG_FILES"; then
18049
+ac_cr=`echo X | tr X '\015'`
18050
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
18051
+# But we know of no other shell where ac_cr would be empty at this
18052
+# point, so we can use a bashism as a fallback.
18053
+if test "x$ac_cr" = x; then
18054
+ eval ac_cr=\$\'\\r\'
18056
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
18057
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
18058
- ac_cs_awk_cr='\\r'
18059
+ ac_cs_awk_cr='\r'
18061
ac_cs_awk_cr=$ac_cr
18063
@@ -22114,24 +18486,18 @@ _ACEOF
18064
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
18066
} >conf$$subs.sh ||
18067
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18068
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18069
- { (exit 1); exit 1; }; }
18070
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
18071
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
18073
for ac_last_try in false false false false false :; do
18074
. ./conf$$subs.sh ||
18075
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18076
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18077
- { (exit 1); exit 1; }; }
18078
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
18080
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
18081
if test $ac_delim_n = $ac_delim_num; then
18083
elif $ac_last_try; then
18084
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18085
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18086
- { (exit 1); exit 1; }; }
18087
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
18089
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18091
@@ -22153,7 +18519,7 @@ s/'"$ac_delim"'$//
18095
-s/\(.\{148\}\).*/\1/
18096
+s/\(.\{148\}\)..*/\1/
18098
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
18100
@@ -22167,7 +18533,7 @@ s/.\{148\}//
18104
-s/\(.\{148\}\).*/\1/
18105
+s/\(.\{148\}\)..*/\1/
18107
s/["\\]/\\&/g; s/^/"/; s/$/"/
18109
@@ -22220,9 +18586,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
18112
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
18113
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
18114
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
18115
- { (exit 1); exit 1; }; }
18116
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
18119
# VPATH may cause trouble with some makes, so we remove $(srcdir),
18120
@@ -22263,9 +18627,7 @@ for ac_last_try in false false :; do
18121
if test -z "$ac_t"; then
18123
elif $ac_last_try; then
18124
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
18125
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
18126
- { (exit 1); exit 1; }; }
18127
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
18129
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18131
@@ -22350,9 +18712,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
18134
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
18135
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
18136
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
18137
- { (exit 1); exit 1; }; }
18138
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
18139
fi # test -n "$CONFIG_HEADERS"
18142
@@ -22365,9 +18725,7 @@ do
18144
case $ac_mode$ac_tag in
18146
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
18147
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
18148
- { (exit 1); exit 1; }; };;
18149
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
18150
:[FH]-) ac_tag=-:-;;
18151
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
18153
@@ -22395,12 +18753,10 @@ $as_echo "$as_me: error: invalid tag $ac
18155
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
18157
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
18158
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
18159
- { (exit 1); exit 1; }; };;
18160
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
18162
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
18163
- ac_file_inputs="$ac_file_inputs '$ac_f'"
18164
+ as_fn_append ac_file_inputs " '$ac_f'"
18167
# Let's still pretend it is `configure' which instantiates (i.e., don't
18168
@@ -22411,7 +18767,7 @@ $as_echo "$as_me: error: cannot find inp
18170
if test x"$ac_file" != x-; then
18171
configure_input="$ac_file. $configure_input"
18172
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
18173
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
18174
$as_echo "$as_me: creating $ac_file" >&6;}
18176
# Neutralize special characters interpreted by sed in replacement strings.
18177
@@ -22424,9 +18780,7 @@ $as_echo "$as_me: creating $ac_file" >&6
18180
*:-:* | *:-) cat >"$tmp/stdin" \
18181
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18182
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18183
- { (exit 1); exit 1; }; } ;;
18184
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
18188
@@ -22454,47 +18808,7 @@ $as_echo X"$ac_file" |
18192
- { as_dir="$ac_dir"
18193
- case $as_dir in #(
18194
- -*) as_dir=./$as_dir;;
18196
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
18199
- case $as_dir in #(
18200
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
18201
- *) as_qdir=$as_dir;;
18203
- as_dirs="'$as_qdir' $as_dirs"
18204
- as_dir=`$as_dirname -- "$as_dir" ||
18205
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
18206
- X"$as_dir" : 'X\(//\)[^/]' \| \
18207
- X"$as_dir" : 'X\(//\)$' \| \
18208
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
18209
-$as_echo X"$as_dir" |
18210
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
18214
- /^X\(\/\/\)[^/].*/{
18227
- test -d "$as_dir" && break
18229
- test -z "$as_dirs" || eval "mkdir $as_dirs"
18230
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
18231
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
18232
- { (exit 1); exit 1; }; }; }
18233
+ as_dir="$ac_dir"; as_fn_mkdir_p
18237
@@ -22551,7 +18865,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
18238
# If the template does not know about datarootdir, expand it.
18239
# FIXME: This hack should be removed a few years after 2.60.
18240
ac_datarootdir_hack=; ac_datarootdir_seen=
18245
@@ -22561,12 +18874,11 @@ ac_sed_dataroot='
18252
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
18253
*datarootdir*) ac_datarootdir_seen=yes;;
18254
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
18255
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
18256
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
18257
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
18259
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
18260
@@ -22576,7 +18888,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
18261
s&@infodir@&$infodir&g
18262
s&@localedir@&$localedir&g
18263
s&@mandir@&$mandir&g
18264
- s&\\\${datarootdir}&$datarootdir&g' ;;
18265
+ s&\\\${datarootdir}&$datarootdir&g' ;;
18269
@@ -22605,14 +18917,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
18270
$ac_datarootdir_hack
18272
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
18273
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18274
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18275
- { (exit 1); exit 1; }; }
18276
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
18278
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
18279
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
18280
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
18281
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18282
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18283
which seems to be undefined. Please make sure it is defined." >&5
18284
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18285
which seems to be undefined. Please make sure it is defined." >&2;}
18286
@@ -22622,9 +18932,7 @@ which seems to be undefined. Please mak
18287
-) cat "$tmp/out" && rm -f "$tmp/out";;
18288
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
18290
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18291
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18292
- { (exit 1); exit 1; }; }
18293
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
18297
@@ -22635,25 +18943,19 @@ $as_echo "$as_me: error: could not creat
18298
$as_echo "/* $configure_input */" \
18299
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
18300
} >"$tmp/config.h" \
18301
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18302
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18303
- { (exit 1); exit 1; }; }
18304
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
18305
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
18306
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
18307
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
18308
$as_echo "$as_me: $ac_file is unchanged" >&6;}
18311
mv "$tmp/config.h" "$ac_file" \
18312
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
18313
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
18314
- { (exit 1); exit 1; }; }
18315
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
18318
$as_echo "/* $configure_input */" \
18319
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
18320
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
18321
-$as_echo "$as_me: error: could not create -" >&2;}
18322
- { (exit 1); exit 1; }; }
18323
+ || as_fn_error "could not create -" "$LINENO" 5
18325
# Compute "$ac_file"'s index in $config_headers.
18327
@@ -22691,7 +18993,7 @@ $as_echo X"$_am_arg" |
18328
s/.*/./; q'`/stamp-h$_am_stamp_count
18331
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
18332
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
18333
$as_echo "$as_me: executing $ac_file commands" >&6;}
18336
@@ -22786,47 +19088,7 @@ $as_echo X"$file" |
18340
- { as_dir=$dirpart/$fdir
18341
- case $as_dir in #(
18342
- -*) as_dir=./$as_dir;;
18344
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
18347
- case $as_dir in #(
18348
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
18349
- *) as_qdir=$as_dir;;
18351
- as_dirs="'$as_qdir' $as_dirs"
18352
- as_dir=`$as_dirname -- "$as_dir" ||
18353
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
18354
- X"$as_dir" : 'X\(//\)[^/]' \| \
18355
- X"$as_dir" : 'X\(//\)$' \| \
18356
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
18357
-$as_echo X"$as_dir" |
18358
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
18362
- /^X\(\/\/\)[^/].*/{
18375
- test -d "$as_dir" && break
18377
- test -z "$as_dirs" || eval "mkdir $as_dirs"
18378
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
18379
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
18380
- { (exit 1); exit 1; }; }; }
18381
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
18382
# echo "creating $dirpart/$file"
18383
echo '# dummy' > "$dirpart/$file"
18385
@@ -23476,9 +19738,7 @@ _LT_EOF
18388
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
18389
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
18390
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
18391
- { (exit 1); exit 1; }; }
18392
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
18394
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
18396
@@ -23501,15 +19761,12 @@ $as_echo "$as_me: error: po/Makefile.in.
18400
-{ (exit 0); exit 0; }
18403
-chmod +x $CONFIG_STATUS
18404
ac_clean_files=$ac_clean_files_save
18406
test $ac_write_fail = 0 ||
18407
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
18408
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
18409
- { (exit 1); exit 1; }; }
18410
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
18413
# configure is writing to config.log, and then calls config.status.
18414
@@ -23530,10 +19787,10 @@ if test "$no_create" != yes; then
18416
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
18417
# would make configure fail if this is the last instruction.
18418
- $ac_cs_success || { (exit 1); exit 1; }
18419
+ $ac_cs_success || as_fn_exit $?
18421
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
18422
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
18423
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
18424
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
18427
Index: brasero-2.30.1/data/Makefile.in
18428
===================================================================
18429
--- brasero-2.30.1.orig/data/Makefile.in 2010-04-27 01:29:13.000000000 +0200
18430
+++ brasero-2.30.1/data/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18432
-# Makefile.in generated by automake 1.11 from Makefile.am.
18433
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18434
# @configure_input@
18436
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18437
@@ -255,6 +255,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18438
PACKAGE_NAME = @PACKAGE_NAME@
18439
PACKAGE_STRING = @PACKAGE_STRING@
18440
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18441
+PACKAGE_URL = @PACKAGE_URL@
18442
PACKAGE_VERSION = @PACKAGE_VERSION@
18443
PATH_SEPARATOR = @PATH_SEPARATOR@
18444
PKG_CONFIG = @PKG_CONFIG@
18445
@@ -494,7 +495,7 @@ uninstall-schemasDATA:
18446
# (which will cause the Makefiles to be regenerated when you run `make');
18447
# (2) otherwise, pass the desired values on the `make' command line.
18448
$(RECURSIVE_TARGETS):
18449
- @failcom='exit 1'; \
18450
+ @fail= failcom='exit 1'; \
18451
for f in x $$MAKEFLAGS; do \
18454
@@ -519,7 +520,7 @@ $(RECURSIVE_TARGETS):
18455
fi; test -z "$$fail"
18457
$(RECURSIVE_CLEAN_TARGETS):
18458
- @failcom='exit 1'; \
18459
+ @fail= failcom='exit 1'; \
18460
for f in x $$MAKEFLAGS; do \
18463
Index: brasero-2.30.1/data/icons/Makefile.in
18464
===================================================================
18465
--- brasero-2.30.1.orig/data/icons/Makefile.in 2010-04-27 01:29:13.000000000 +0200
18466
+++ brasero-2.30.1/data/icons/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18468
-# Makefile.in generated by automake 1.11 from Makefile.am.
18469
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18470
# @configure_input@
18472
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18473
@@ -188,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18474
PACKAGE_NAME = @PACKAGE_NAME@
18475
PACKAGE_STRING = @PACKAGE_STRING@
18476
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18477
+PACKAGE_URL = @PACKAGE_URL@
18478
PACKAGE_VERSION = @PACKAGE_VERSION@
18479
PATH_SEPARATOR = @PATH_SEPARATOR@
18480
PKG_CONFIG = @PKG_CONFIG@
18481
Index: brasero-2.30.1/docs/Makefile.in
18482
===================================================================
18483
--- brasero-2.30.1.orig/docs/Makefile.in 2010-04-27 01:29:13.000000000 +0200
18484
+++ brasero-2.30.1/docs/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18486
-# Makefile.in generated by automake 1.11 from Makefile.am.
18487
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18488
# @configure_input@
18490
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18491
@@ -251,6 +251,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18492
PACKAGE_NAME = @PACKAGE_NAME@
18493
PACKAGE_STRING = @PACKAGE_STRING@
18494
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18495
+PACKAGE_URL = @PACKAGE_URL@
18496
PACKAGE_VERSION = @PACKAGE_VERSION@
18497
PATH_SEPARATOR = @PATH_SEPARATOR@
18498
PKG_CONFIG = @PKG_CONFIG@
18499
@@ -408,7 +409,7 @@ uninstall-man1:
18500
# (which will cause the Makefiles to be regenerated when you run `make');
18501
# (2) otherwise, pass the desired values on the `make' command line.
18502
$(RECURSIVE_TARGETS):
18503
- @failcom='exit 1'; \
18504
+ @fail= failcom='exit 1'; \
18505
for f in x $$MAKEFLAGS; do \
18508
@@ -433,7 +434,7 @@ $(RECURSIVE_TARGETS):
18509
fi; test -z "$$fail"
18511
$(RECURSIVE_CLEAN_TARGETS):
18512
- @failcom='exit 1'; \
18513
+ @fail= failcom='exit 1'; \
18514
for f in x $$MAKEFLAGS; do \
18517
Index: brasero-2.30.1/docs/reference/Makefile.in
18518
===================================================================
18519
--- brasero-2.30.1.orig/docs/reference/Makefile.in 2010-04-27 01:29:13.000000000 +0200
18520
+++ brasero-2.30.1/docs/reference/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18522
-# Makefile.in generated by automake 1.11 from Makefile.am.
18523
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18524
# @configure_input@
18526
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18527
@@ -226,6 +226,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18528
PACKAGE_NAME = @PACKAGE_NAME@
18529
PACKAGE_STRING = @PACKAGE_STRING@
18530
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18531
+PACKAGE_URL = @PACKAGE_URL@
18532
PACKAGE_VERSION = @PACKAGE_VERSION@
18533
PATH_SEPARATOR = @PATH_SEPARATOR@
18534
PKG_CONFIG = @PKG_CONFIG@
18535
@@ -344,7 +345,7 @@ clean-libtool:
18536
# (which will cause the Makefiles to be regenerated when you run `make');
18537
# (2) otherwise, pass the desired values on the `make' command line.
18538
$(RECURSIVE_TARGETS):
18539
- @failcom='exit 1'; \
18540
+ @fail= failcom='exit 1'; \
18541
for f in x $$MAKEFLAGS; do \
18544
@@ -369,7 +370,7 @@ $(RECURSIVE_TARGETS):
18545
fi; test -z "$$fail"
18547
$(RECURSIVE_CLEAN_TARGETS):
18548
- @failcom='exit 1'; \
18549
+ @fail= failcom='exit 1'; \
18550
for f in x $$MAKEFLAGS; do \
18553
Index: brasero-2.30.1/docs/reference/libbrasero-burn/Makefile.in
18554
===================================================================
18555
--- brasero-2.30.1.orig/docs/reference/libbrasero-burn/Makefile.in 2010-04-27 01:29:13.000000000 +0200
18556
+++ brasero-2.30.1/docs/reference/libbrasero-burn/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18558
-# Makefile.in generated by automake 1.11 from Makefile.am.
18559
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18560
# @configure_input@
18562
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18563
@@ -193,6 +193,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18564
PACKAGE_NAME = @PACKAGE_NAME@
18565
PACKAGE_STRING = @PACKAGE_STRING@
18566
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18567
+PACKAGE_URL = @PACKAGE_URL@
18568
PACKAGE_VERSION = @PACKAGE_VERSION@
18569
PATH_SEPARATOR = @PATH_SEPARATOR@
18570
PKG_CONFIG = @PKG_CONFIG@
18571
Index: brasero-2.30.1/docs/reference/libbrasero-media/Makefile.in
18572
===================================================================
18573
--- brasero-2.30.1.orig/docs/reference/libbrasero-media/Makefile.in 2010-04-27 01:29:13.000000000 +0200
18574
+++ brasero-2.30.1/docs/reference/libbrasero-media/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18576
-# Makefile.in generated by automake 1.11 from Makefile.am.
18577
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18578
# @configure_input@
18580
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18581
@@ -193,6 +193,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18582
PACKAGE_NAME = @PACKAGE_NAME@
18583
PACKAGE_STRING = @PACKAGE_STRING@
18584
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18585
+PACKAGE_URL = @PACKAGE_URL@
18586
PACKAGE_VERSION = @PACKAGE_VERSION@
18587
PATH_SEPARATOR = @PATH_SEPARATOR@
18588
PKG_CONFIG = @PKG_CONFIG@
18589
Index: brasero-2.30.1/help/Makefile.in
18590
===================================================================
18591
--- brasero-2.30.1.orig/help/Makefile.in 2010-04-27 01:29:13.000000000 +0200
18592
+++ brasero-2.30.1/help/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18594
-# Makefile.in generated by automake 1.11 from Makefile.am.
18595
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18596
# @configure_input@
18598
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18599
@@ -211,6 +211,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18600
PACKAGE_NAME = @PACKAGE_NAME@
18601
PACKAGE_STRING = @PACKAGE_STRING@
18602
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18603
+PACKAGE_URL = @PACKAGE_URL@
18604
PACKAGE_VERSION = @PACKAGE_VERSION@
18605
PATH_SEPARATOR = @PATH_SEPARATOR@
18606
PKG_CONFIG = @PKG_CONFIG@
18607
Index: brasero-2.30.1/libbrasero-burn/Makefile.in
18608
===================================================================
18609
--- brasero-2.30.1.orig/libbrasero-burn/Makefile.in 2010-04-27 01:29:14.000000000 +0200
18610
+++ brasero-2.30.1/libbrasero-burn/Makefile.in 2010-05-03 15:56:49.464604045 +0200
18612
-# Makefile.in generated by automake 1.11 from Makefile.am.
18613
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
18614
# @configure_input@
18616
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18617
@@ -330,6 +330,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18618
PACKAGE_NAME = @PACKAGE_NAME@
18619
PACKAGE_STRING = @PACKAGE_STRING@
18620
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18621
+PACKAGE_URL = @PACKAGE_URL@
18622
PACKAGE_VERSION = @PACKAGE_VERSION@
18623
PATH_SEPARATOR = @PATH_SEPARATOR@
18624
PKG_CONFIG = @PKG_CONFIG@
18625
@@ -410,7 +411,7 @@ INCLUDES = \
4135
@@ -18230,143 +18101,131 @@
4136
sed_quote_subst='$sed_quote_subst'
4137
double_quote_subst='$double_quote_subst'
4138
delay_variable_subst='$delay_variable_subst'
4139
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
4140
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
4141
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
4142
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
4143
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
4144
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
4145
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
4146
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
4147
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
4148
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
4149
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
4150
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
4151
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
4152
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
4153
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
4154
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
4155
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
4156
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
4157
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
4158
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
4159
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
4160
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
4161
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
4162
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
4163
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
4164
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
4165
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
4166
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
4167
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
4168
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
4169
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
4170
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
4171
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
4172
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
4173
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
4174
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
4175
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
4176
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
4177
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
4178
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
4179
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
4180
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
4181
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
4182
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
4183
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
4184
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
4185
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
4186
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
4187
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
4188
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
4189
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
4190
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
4191
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
4192
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
4193
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
4194
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
4195
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
4196
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
4197
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
4198
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
4199
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
4200
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
4201
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
4202
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
4203
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
4204
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
4205
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
4206
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
4207
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
4208
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
4209
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
4210
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
4211
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
4212
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
4213
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
4214
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
4215
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
4216
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
4217
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
4218
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
4219
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
4220
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
4221
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
4222
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
4223
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
4224
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
4225
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
4226
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
4227
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
4228
-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
4229
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
4230
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
4231
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
4232
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
4233
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
4234
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
4235
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
4236
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
4237
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
4238
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
4239
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
4240
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
4241
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
4242
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
4243
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
4244
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
4245
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
4246
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
4247
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
4248
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
4249
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
4250
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
4251
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
4252
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
4253
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
4254
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
4255
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
4256
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
4257
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
4258
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
4259
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
4260
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
4261
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
4262
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
4263
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
4264
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
4265
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
4266
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
4267
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
4268
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
4269
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
4270
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
4271
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
4272
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
4273
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
4274
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
4275
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
4276
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
4277
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
4278
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
4279
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
4280
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
4281
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
4282
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
4283
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
4284
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
4285
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
4286
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4287
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
4288
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
4289
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
4290
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
4291
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
4292
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
4293
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
4294
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4295
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4296
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4297
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
4298
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
4299
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
4300
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
4301
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
4302
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
4303
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
4304
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
4305
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
4306
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
4307
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
4308
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
4309
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
4310
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
4311
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
4312
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
4313
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
4314
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
4315
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
4316
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
4317
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
4318
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
4319
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
4320
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
4321
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4322
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4323
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
4324
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
4325
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
4326
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
4327
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
4328
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4329
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4330
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4331
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4332
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4333
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4334
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
4335
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
4336
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
4337
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
4338
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
4339
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
4340
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
4341
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
4342
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
4343
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
4344
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
4345
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
4346
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
4347
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
4348
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
4349
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4350
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
4351
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
4352
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4353
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
4354
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
4355
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
4356
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
4357
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
4358
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
4359
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
4360
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
4361
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
4362
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
4363
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
4364
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4365
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4366
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
4367
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
4368
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
4369
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
4370
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
4371
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
4372
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
4373
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
4374
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
4375
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
4376
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
4379
LTCFLAGS='$LTCFLAGS'
4380
compiler='$compiler_DEFAULT'
4382
-# A function that is used when there is no print builtin or printf.
4383
-func_fallback_echo ()
4385
- eval 'cat <<_LTECHO_EOF
4390
# Quote evaled strings.
4398
@@ -18390,6 +18249,8 @@
4399
lt_cv_sys_global_symbol_to_cdecl \
4400
lt_cv_sys_global_symbol_to_c_name_address \
4401
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
4404
lt_prog_compiler_no_builtin_flag \
4405
lt_prog_compiler_wl \
4406
lt_prog_compiler_pic \
4407
@@ -18419,13 +18280,12 @@
4409
library_names_spec \
4411
-install_override_mode \
4415
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
4416
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
4417
*[\\\\\\\`\\"\\\$]*)
4418
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
4419
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
4422
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
4423
@@ -18452,9 +18312,9 @@
4425
sys_lib_search_path_spec \
4426
sys_lib_dlsearch_path_spec; do
4427
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
4428
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
4429
*[\\\\\\\`\\"\\\$]*)
4430
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
4431
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
4434
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
4435
@@ -18462,6 +18322,12 @@
4439
+# Fix-up fallback echo if it was mangled by the above quoting rules.
4441
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
4445
ac_aux_dir='$ac_aux_dir'
4446
xsi_shell='$xsi_shell'
4447
lt_shell_append='$lt_shell_append'
4448
@@ -19234,8 +19100,7 @@
4449
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
4451
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
4452
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
4454
+# 2006, 2007, 2008 Free Software Foundation, Inc.
4455
# Written by Gordon Matzigkeit, 1996
4457
# This file is part of GNU Libtool.
4458
@@ -19283,12 +19148,6 @@
4459
# Whether or not to optimize for fast installation.
4460
fast_install=$enable_fast_install
4462
-# Shell to use when invoking shell scripts.
4465
-# An echo program that protects backslashes.
4469
host_alias=$host_alias
4471
@@ -19338,6 +19197,10 @@
4472
# turn newlines into spaces.
4475
+# How to create reloadable object files.
4476
+reload_flag=$lt_reload_flag
4477
+reload_cmds=$lt_reload_cmds
4479
# An object symbol dumper.
4482
@@ -19359,9 +19222,6 @@
4483
old_postinstall_cmds=$lt_old_postinstall_cmds
4484
old_postuninstall_cmds=$lt_old_postuninstall_cmds
4486
-# Whether to use a lock for old archive extraction.
4487
-lock_old_archive_extraction=$lock_old_archive_extraction
4492
@@ -19383,6 +19243,12 @@
4493
# The name of the directory that contains temporary libtool files.
4496
+# Shell to use when invoking shell scripts.
4499
+# An echo program that does not interpret backslashes.
4502
# Used to examine libraries when file_magic_cmd begins with "file".
4503
MAGIC_CMD=$MAGIC_CMD
4505
@@ -19445,9 +19311,6 @@
4506
# The coded name of the library, if different from the real name.
4507
soname_spec=$lt_soname_spec
4509
-# Permission mode override for installation of shared libraries.
4510
-install_override_mode=$lt_install_override_mode
4512
# Command to use after installation of a shared archive.
4513
postinstall_cmds=$lt_postinstall_cmds
4515
@@ -19487,10 +19350,6 @@
4516
# The linker used to build libraries.
4519
-# How to create reloadable object files.
4520
-reload_flag=$lt_reload_flag
4521
-reload_cmds=$lt_reload_cmds
4523
# Commands used to build an old-style archive.
4524
old_archive_cmds=$lt_old_archive_cmds
4526
@@ -19750,7 +19609,7 @@
4529
# Extract subdirectory from the argument.
4530
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
4531
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
4532
if test "X$func_dirname_result" = "X${1}"; then
4533
func_dirname_result="${3}"
4535
@@ -19761,7 +19620,7 @@
4536
# func_basename file
4539
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
4540
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
4544
@@ -19774,8 +19633,10 @@
4548
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
4549
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
4550
+ .*) func_stripname_result=`$ECHO "X${3}" \
4551
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
4552
+ *) func_stripname_result=`$ECHO "X${3}" \
4553
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
4557
@@ -19786,20 +19647,20 @@
4561
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
4562
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
4563
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
4564
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
4570
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
4571
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
4574
# func_xform libobj-or-source
4577
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
4578
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
4581
# func_arith arithmetic-term...
4582
Index: brasero-2.30.2/data/Makefile.in
4583
===================================================================
4584
--- brasero-2.30.2.orig/data/Makefile.in 2010-07-04 14:04:50.893083293 +0200
4585
+++ brasero-2.30.2/data/Makefile.in 2010-07-04 14:04:20.713077719 +0200
4587
libexecdir = @libexecdir@
4588
localedir = @localedir@
4589
localstatedir = @localstatedir@
4590
+lt_ECHO = @lt_ECHO@
4593
oldincludedir = @oldincludedir@
4594
Index: brasero-2.30.2/data/icons/Makefile.in
4595
===================================================================
4596
--- brasero-2.30.2.orig/data/icons/Makefile.in 2010-07-04 14:04:50.953083957 +0200
4597
+++ brasero-2.30.2/data/icons/Makefile.in 2010-07-04 14:04:20.825079130 +0200
4599
libexecdir = @libexecdir@
4600
localedir = @localedir@
4601
localstatedir = @localstatedir@
4602
+lt_ECHO = @lt_ECHO@
4605
oldincludedir = @oldincludedir@
4606
Index: brasero-2.30.2/docs/Makefile.in
4607
===================================================================
4608
--- brasero-2.30.2.orig/docs/Makefile.in 2010-07-04 14:04:51.433084488 +0200
4609
+++ brasero-2.30.2/docs/Makefile.in 2010-07-04 14:04:20.937081379 +0200
4611
libexecdir = @libexecdir@
4612
localedir = @localedir@
4613
localstatedir = @localstatedir@
4614
+lt_ECHO = @lt_ECHO@
4617
oldincludedir = @oldincludedir@
4618
Index: brasero-2.30.2/docs/reference/Makefile.in
4619
===================================================================
4620
--- brasero-2.30.2.orig/docs/reference/Makefile.in 2010-07-04 14:04:51.485085251 +0200
4621
+++ brasero-2.30.2/docs/reference/Makefile.in 2010-07-04 14:04:21.041078154 +0200
4623
libexecdir = @libexecdir@
4624
localedir = @localedir@
4625
localstatedir = @localstatedir@
4626
+lt_ECHO = @lt_ECHO@
4629
oldincludedir = @oldincludedir@
4630
Index: brasero-2.30.2/docs/reference/libbrasero-burn/Makefile.in
4631
===================================================================
4632
--- brasero-2.30.2.orig/docs/reference/libbrasero-burn/Makefile.in 2010-07-04 14:04:51.533084107 +0200
4633
+++ brasero-2.30.2/docs/reference/libbrasero-burn/Makefile.in 2010-07-04 14:04:21.165077751 +0200
4635
libexecdir = @libexecdir@
4636
localedir = @localedir@
4637
localstatedir = @localstatedir@
4638
+lt_ECHO = @lt_ECHO@
4641
oldincludedir = @oldincludedir@
4642
Index: brasero-2.30.2/docs/reference/libbrasero-media/Makefile.in
4643
===================================================================
4644
--- brasero-2.30.2.orig/docs/reference/libbrasero-media/Makefile.in 2010-07-04 14:04:51.685084200 +0200
4645
+++ brasero-2.30.2/docs/reference/libbrasero-media/Makefile.in 2010-07-04 14:04:21.285079346 +0200
4647
libexecdir = @libexecdir@
4648
localedir = @localedir@
4649
localstatedir = @localstatedir@
4650
+lt_ECHO = @lt_ECHO@
4653
oldincludedir = @oldincludedir@
4654
Index: brasero-2.30.2/help/Makefile.in
4655
===================================================================
4656
--- brasero-2.30.2.orig/help/Makefile.in 2010-07-04 14:04:52.581082132 +0200
4657
+++ brasero-2.30.2/help/Makefile.in 2010-07-04 14:04:21.425078173 +0200
4659
libexecdir = @libexecdir@
4660
localedir = @localedir@
4661
localstatedir = @localstatedir@
4662
+lt_ECHO = @lt_ECHO@
4665
oldincludedir = @oldincludedir@
4666
Index: brasero-2.30.2/libbrasero-burn/Makefile.in
4667
===================================================================
4668
--- brasero-2.30.2.orig/libbrasero-burn/Makefile.in 2010-07-04 14:04:52.761091094 +0200
4669
+++ brasero-2.30.2/libbrasero-burn/Makefile.in 2010-07-04 14:04:21.665078310 +0200
4671
libexecdir = @libexecdir@
4672
localedir = @localedir@
4673
localstatedir = @localstatedir@
4674
+lt_ECHO = @lt_ECHO@
4677
oldincludedir = @oldincludedir@
18626
4679
-DBRASERO_PREFIX=\"$(prefix)\" \
18627
4680
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
18628
4681
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \