--- gnome-utils-2.18.1.orig/config.guess +++ gnome-utils-2.18.1/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -206,8 +207,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,7 +768,14 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -779,8 +790,11 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -794,7 +808,7 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -817,6 +831,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +868,11 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,9 +891,16 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; @@ -916,6 +944,9 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; @@ -961,7 +992,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -971,7 +1002,11 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1182,7 +1217,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1261,6 +1295,9 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 --- gnome-utils-2.18.1.orig/config.sub +++ gnome-utils-2.18.1/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -239,7 +249,8 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,28 +268,27 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -286,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -305,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -316,7 +329,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -336,31 +349,30 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -696,6 +708,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +818,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +880,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -885,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1101,7 +1130,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1174,21 +1203,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1340,6 +1371,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1349,9 +1386,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 --- gnome-utils-2.18.1.orig/debian/control.in +++ gnome-utils-2.18.1/debian/control.in @@ -0,0 +1,68 @@ +Source: gnome-utils +Section: gnome +Priority: optional +XSBC-Original-Maintainer: Marco Cabizza +Maintainer: Ubuntu Desktop Team +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, + debhelper (>= 5), + libgnomeui-dev (>= 2.13.2), + libglib2.0-dev (>= 2.10.0-1), + libgtk2.0-dev (>= 2.10.0), + libgnome2-dev (>= 2.13.7), + libgnomevfs2-dev (>= 2.8.4), + libbonoboui2-dev (>= 2.6.1-1), + libglade2-dev (>= 1:2.4.0), + libpanel-applet2-dev (>= 2.13.4), + e2fslibs-dev, + scrollkeeper, + intltool (>= 0.21), + libgnome-desktop-dev (>= 2.9.91), + gnome-pkg-tools (>= 0.10), + libxmu-dev, + libgnomeprint2.2-dev (>= 2.8.0), + libgnomeprintui2.2-dev (>= 2.8.0), + libhal-dev (>= 0.5.5.1-3), + gnome-doc-utils (>= 0.3.2), + libgtop2-dev (>= 2.12.0), + libgnomecanvas2-dev (>= 2.10.2), + autotools-dev, + gconf2, + liblaunchpad-integration-dev +Standards-Version: 3.7.2 + +Package: gnome-utils +Architecture: any +Depends: ${shlibs:Depends}, + scrollkeeper, + ${misc:Depends} +Recommends: gksu +Suggests: yelp, + gcalctool +Provides: gdict, + dict-client +Conflicts: gfloppy, + gdict, + gnome-panel (<< 2.10), + gnome-panel-data (<< 2.10), + baobab +Replaces: gdict, + gnome-admin (<= 1.0.3-2), + gnome-panel (<< 2.9), + gnome-panel-data (<< 2.9), + baobab +Description: GNOME desktop utilities + GNOME is the "GNU Network Object Model Environment". + It is a project to build a complete, user-friendly desktop based + entirely on free software. + . + This package contains the following utilities for the GNOME desktop: + . + - baobab, a disk usage analyser + - gfloppy, a tool for formatting floppy disks + - gnome-dictionary, a program which can look up the definition of words + over the internet (including a panel applet to do the same) + - gnome-search-tool, with which one can find files by name or content + - gnome-system-log, a log viewing application + - gnome-screenshot, a tool to take desktop screenshots and save them into + a file --- gnome-utils-2.18.1.orig/debian/changelog +++ gnome-utils-2.18.1/debian/changelog @@ -0,0 +1,855 @@ +gnome-utils (2.18.1-1ubuntu1) gutsy; urgency=low + + * Merge with Debian: + + debian/patches: + - Drop Debians 01_logview_gksu.patch, + we can view logfiles as users. + + 01_lpi.patch: LaunchpadIntegration. + + 02_autoconf.patch updated. + + 04_menu_changes.patch: MenusRevisited. + + 07_fix_screenshot_tmp_directory.patch: + Fix the screenshot directory to be unique for the user + + debian/control.in: + - Remove type-handling for libhal-dev. + + Add liblaunchpad-integration-dev to Build-Deps. + + debian/rules: + + Add translations domains to desktop and server files + + Build .pot + + Add dh_iconcache. + + -- Christian Bjälevik Fri, 27 Apr 2007 16:46:31 +0200 + +gnome-utils (2.18.1-1) unstable; urgency=low + + * Drop useless INSTALL_PROGRAM definition. + * Fix default CFLAGS. + * Pass --enable-gfloppy to configure; thanks Alan Baghumian; + closes: #419256. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE + differ. + * Cleanups. + * New upstream release; no API change. + + -- Loic Minier Mon, 16 Apr 2007 11:10:04 +0200 + +gnome-utils (2.18.0-1) experimental; urgency=low + + * gnome-screenshot man page updates by Theppitak Karoonboonyanan; + closes: #415949. + * Add build-dep on gconf2 for gconftool-2. + * New upstream major stable release. + - Bump up libgtk2.0-dev build-dep to >= 2.10.0 for + gtk_text_buffer_get_has_selection(); upstream isn't correctly checking + for the minimum Gtk version it requires. + - Another round of man page updates for 2.18 by Theppitak Karoonboonyanan. + * New patch, 06_fix_logview_crasher, fixes a crash due to an uninitialized + variable; found in the Ubuntu package. + + -- Loic Minier Fri, 23 Mar 2007 16:37:15 +0100 + +gnome-utils (2.16.2-2) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Merge 2.14.0.dfsg-1 up to 2.14.0.dfsg-5; SVN r7690:9186. + - Drop patch 20_screenshot-overlapped-windows; merged upstream. + - Drop patch 10_po-too-fuzzy-cvs; only relevant for 2.14. + + -- Loic Minier Fri, 23 Mar 2007 12:03:09 +0100 + +gnome-utils (2.16.2-1) experimental; urgency=low + + * New upstream release. + + Non-free RFC was removed (closes: #393372). + * 01_logview_gksu.patch: use gksu to invoke the log viewer as root. + The default Debian setup allows to see only the Xorg logs. + + -- Josselin Mouette Tue, 21 Nov 2006 21:23:49 +0100 + +gnome-utils (2.16.0-1) experimental; urgency=low + + [ Marco Cabizza ] + * New upstream release + + [ Guilherme de S. Pastore ] + * debian/copyright, debian/watch: fix download URL. + * debian/README.Debian: removed; too old, no longer useful. + + [ Loic Minier ] + * The new upstream releases above bear no API change. + * Upload. + + -- Loic Minier Mon, 25 Sep 2006 16:40:23 +0200 + +gnome-utils (2.15.92-1) experimental; urgency=low + + * New upstream development releases, with API changes. + - Target at experimental. + - Add Baobab to the description. + - Conclict with and Replace baobab. + - Bump up build-deps to: libgtk2.0-dev >= 2.8.0, libgnome2-dev >= 2.13.7, + libgnomeui-dev >= 2.13.2 + - Add build-deps on: libgtop2-dev (>= 2.12.0), libgnomecanvas2-dev (>= + 2.10.2) + - Install baobab's README as README.baobab. + - Update shlibs for new SONAME: libgdict-1.0 5 gnome-utils (>= 2.15.90). + - Pass shlibs directly to dh_makeshlibs and drop gnome-utils.shlibs. + - libgdict changes SONAME; no action required since it had no shlibs. + - Drop patch 02_gdict_crasher, merged upstream. + - Drop libpopt-dev build-dep. + - Add a menu entry and XPM icon for Baobab. + * Drop -s flag to install as the debian/rules already uses dh_strip. + * Re-add autotools-dev config.guess/sub autoupdate with a build-dep. + * Misc cleanups. + * Add CDBS' utils. + + -- Loic Minier Sun, 13 Aug 2006 17:51:24 +0200 + +gnome-utils (2.14.0.dfsg-5) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * Resurrect the gnome-panel-screenshot man page from gnome-panel and rename + to gnome-screenshot; this even covers flags which are not in the --help + output; closes: #384602. + * New patch, 20_screenshot-overlapped-windows, to fix screenshots of + overlapping windows; backported from GNOME #121492. + + -- Loic Minier Thu, 8 Mar 2007 14:33:12 +0100 + +gnome-utils (2.14.0.dfsg-4) unstable; urgency=low + + * Exclude libhal-dev build-dep for kfreebsd and hurd; thanks + Petr Salinger; closes: #402129. + + -- Loic Minier Fri, 8 Dec 2006 17:56:43 +0100 + +gnome-utils (2.14.0.dfsg-3) unstable; urgency=high + + * Update all *.po files; rename 10_fr-po-too-fuzzy-cvs to + 10_po-too-fuzzy-cvs; thanks Simon Paillard; update LINGUAS in configure.in + and configure. + + -- Loic Minier Wed, 22 Nov 2006 09:28:54 +0100 + +gnome-utils (2.14.0.dfsg-2) unstable; urgency=high + + * New patch, 10_fr-po-too-fuzzy-cvs, to snapshot fr.po from the CVS + gnome-2-14 branch as many strings are fuzzy in the tarball; thanks + Simon Paillard for the report. + + -- Loic Minier Tue, 21 Nov 2006 21:24:49 +0100 + +gnome-utils (2.14.0.dfsg-1) unstable; urgency=high + + * Repack upstream tarball to strip RFC; closes: #393372. + + -- Loic Minier Mon, 16 Oct 2006 14:49:13 +0200 + +gnome-utils (2.14.0-2) unstable; urgency=low + + [ Marco Cabizza ] + * Steal patch from HEAD to prevent gnome-dictionary from crashing with + some words [debian/patches/02_gdict_crasher.patch] + + [ Loic Minier ] + * Update watch file to track stable versions and use HTTP. + * Fix 02_gdict_crasher patch to apply correctly. + * Drop debian/dirs and refactor installation a little. + + -- Loic Minier Sun, 13 Aug 2006 16:30:15 +0200 + +gnome-utils (2.14.0-1) unstable; urgency=low + + [ Marco Cabizza ] + * New maintainer + * New upstream release + - gnome-screenshot: Alt+Print works again (Closes: #283592) + - gdict-applet: Fixed the CPU usage issue (Closes: #214074, #220318) + * Added a Debian menu entry for gnome-panel-screenshot (Closes: #354102) + * Added patch/unpatch rules to debian/rules + * patches/01_configure.patch: work around upstream bug #336546, combined with + seb128's 10_configure.patch. + * debian/rules: + - not using dpatch anymore + - added dh_makeshlibs (and debian/gnome-utils.shlibs) due to libgdict-1.0 + * debian/control: fixing dependencies. + * debian/pixmaps: resized the Debian menu icons to 32x32 + * Standards-version is 3.7.2. + + [ Guilherme de S. Pastore ] + * debian/control.in: + - added build-dependency on cdbs. + - added build-dependency on gnome-doc-utils. + * debian/compat: created, bumping debhelper compatibility version to 5. + + -- Guilherme de S. Pastore Tue, 16 May 2006 20:40:00 -0300 + +gnome-utils (2.12.2-3) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 16:54:30 +0100 + +gnome-utils (2.12.2-2) experimental; urgency=low + + * Build against dbus >= 0.60 + + -- Sjoerd Simons Sun, 18 Dec 2005 22:29:44 +0100 + +gnome-utils (2.12.2-1) experimental; urgency=low + + * New upstream release. + * Drop debian/patches/04_gfloppyjaomf.dpatch, this was fixed differently + upstream (they commented the block out), don't list this + patch in debian/patches/00list. + * Actually ship license and distinguish from copyright. + * Set debhelper compatibility level to 4. + + -- Loic Minier Mon, 12 Dec 2005 23:00:59 +0100 + +gnome-utils (2.12.1-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - Build-Depends on the libhal package. + * debian/patches/04_gfloppyjaomf.dpatch: + - fix an issue with an omf file (Closes: #270880). + * debian/patches/10_configure.dpatch: + - updated. + * debian/watch: + - updated. + + -- Sebastien Bacher Mon, 24 Oct 2005 15:26:22 +0200 + +gnome-utils (2.10.1-4) unstable; urgency=high + + * Standards-version is 3.6.2. + * Depend on ${misc:Depends} (high urgency fix). + + -- Josselin Mouette Thu, 13 Oct 2005 21:40:35 +0200 + +gnome-utils (2.10.1-3) unstable; urgency=low + + * Upload to unstable. + * debian/control.in: add gnome-screenshot to the description. + + -- Jordi Mallach Fri, 10 Jun 2005 14:44:03 +0200 + +gnome-utils (2.10.1-2) experimental; urgency=low + + * Rebuild on a GNOME 2.10-only chroot. + + -- Jordi Mallach Fri, 29 Apr 2005 04:36:25 +0200 + +gnome-utils (2.10.1-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + - should now read gzipped files (closes: #135548). + * debian/control.in: + - Conflicts/Replaces gnome-panel/gnome-panel-data (<< 2.10). + - update build-depends. + - Suggest gcalctool instead of calctool. + - promote gksu from Suggests to Recommends. + - fix typo in description (closes: #290573). + * debian/rules: disable config.{guess,sub} updating. + * debian/watch: updated. + + -- Jordi Mallach Sat, 9 Apr 2005 00:52:12 +0200 + +gnome-utils (2.8.1-1) unstable; urgency=low + + * GNOME Team Upload. + * New upstream release: + GNOME Dictionary: + - add hyperlinks (Closes: #76739). + GNOME Log Viewer + - get correct date on log zoom (Closes: #222605). + * debian/control.in: + - suggests gksu instead of xsu (Closes: #259883). + - updated the Build-Depends. + * debian/patches/20_syslog_crash.dpatch + - patch by Vincent Untz to fix a gnome-system-log + crash on amd64 + * debian/rules: + - use dh_desktop. + + -- Sebastien Bacher Sun, 28 Nov 2004 00:21:21 +0100 + +gnome-utils (2.6.2-1) unstable; urgency=low + + * GNOME Team Upload. + * New upstream release + + gfloppy now really formats floppies (Closes: #251443) + * debian/menu: Quote everything to silence lintian. + + -- Marc 'HE' Brockschmidt Tue, 8 Jun 2004 17:29:35 +0200 + +gnome-utils (2.6.0-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + * debian/patches/10_configure.dpatch: + + removed useless X11 libs check (Closes: #247418). + * J.H.M. Dassen (Ray) + * Update Build-Depends for required versions of packages as per configure.in + + debian/control.in: Bumped build dependencies on libgtk2.0-dev, + libgnomevfs2-dev, libglib2.0-dev, libbonoboui2-dev, libglade2-dev, + libpanel-applet2-dev, libgnome-desktop-dev; added build dependency on + libgnome2-dev. (Closes: #248945) + + -- Sebastien Bacher Sun, 30 May 2004 19:30:44 +0200 + +gnome-utils (2.6.0-1) experimental; urgency=low + + * New upstream release. + + gdict now allows accented characters. (Closes: Bug#213800) + + gnome-search tool always uses locate (Closes: Bug#220722) + + gdict-applet no longer crashes when a word is misspelled + (Closes: Bug#219217) + * debian/rules + + Add gnome team rules + + Use dh_gconf and dh_scrollkeeper, and remove the relevant bits from + postinst + * debian/control: + + Add Uploaders for gnome team + + Add Build-Depends on gnome-pkg-tools; update debconf build-depends to + >= 4.1.84 because of use of dh-gconf and dh_scrollkeeper + + Suggest: + - mtools (Closes: Bug#240612) + - gnomesu instead of xsu (Closes: Bug#197318) + * debian/README.Debian + + Mention gtkfontsel (Closes: Bug#168217) + + -- Joe Drew Sun, 4 Apr 2004 17:07:07 -0400 + +gnome-utils (2.4.1-1) unstable; urgency=low + + * The "No more complaining" release, part 2 + (Subtitled: two calculator menu entries? disaster! + also subtitled: SHUT UP) + * New upstream release for GNOME 2.4 (Closes: Bug#218865) + * debian/control: + + Update description, Build-Depends for new version + + Update Standards-Version to 3.6.1 + + Change Section to gnome + * debian/rules: + + Support new version of DEB_BUILD_OPTIONS properly + + Remove gdialog enabling in configure (replaced by zenity) + * debian/menu: + + Remove entries for all binaries which are no longer present in + gnome-utils + + -- Joe Drew Sat, 15 Nov 2003 17:55:15 -0500 + +gnome-utils (2.2.1-1) unstable; urgency=low + + * New upstream release, for GNOME 2.2.1 + + -- Joe Drew Sat, 15 Mar 2003 18:48:21 -0500 + +gnome-utils (2.2.0.3-1) unstable; urgency=low + + * New upstream release for GNOME 2.2 + + -- Joe Drew Sun, 12 Jan 2003 21:59:52 -0500 + +gnome-utils (2.0.6-1) unstable; urgency=low + + * The 'This version isn't THAT old' release. + * New upstream release. + * Thanks to Colin Walters for NMUing gnome-utils into sid when I was adrift, + without a computer to develop on. + + -- Joe Drew Sun, 1 Dec 2002 15:40:44 -0500 + +gnome-utils (2.0.5-3.1) unstable; urgency=low + + * Add Build-Depends on scrollkeeper. + + -- Colin Walters Tue, 29 Oct 2002 17:45:05 -0500 + +gnome-utils (2.0.5-3) unstable; urgency=low + + * First upload to sid. Yay! + + -- Colin Walters Sun, 27 Oct 2002 11:10:05 -0500 + +gnome-utils (2.0.5-2) experimental; urgency=low + + * Add Build-Depends on libncurses5-dev. Why this is required for a GTK + program (gdialog) is beyond me. + + -- Joe Drew Sun, 13 Oct 2002 23:05:21 -0400 + +gnome-utils (2.0.5-1) experimental; urgency=low + + * New upstream release. + * Acknowledge NMU - Thanks, Davide! Closes: Bug#156683 + + -- Joe Drew Wed, 9 Oct 2002 23:15:16 -0400 + +gnome-utils (2.0.1-2) experimental; urgency=low + + * Re-enable gdialog due to popular demand. + + -- Joe Drew Wed, 31 Jul 2002 19:10:12 -0400 + +gnome-utils (2.0.1-1.1) experimental; urgency=low + + * NMU. + * Recompiled against libgtk2.0-0png3 because of png2->png3 transition. + + -- Davide Puricelli (evo) Wed, 14 Aug 2002 18:23:34 +0200 + +gnome-utils (2.0.1-1) experimental; urgency=low + + * New maintainer (Closes: Bug#154505) + * New upstream release + + -- Joe Drew Sat, 27 Jul 2002 22:25:54 -0400 + +gnome-utils (1.106.0-1) experimental; urgency=low + + * New upstream version (Closes: #147636) + Uploaded to experimental, because it is a GNOME 2 prerelase version + which cannot coexist with the GNOME 1.4 version. + + -- Jochen Voss Sun, 26 May 2002 16:52:33 +0200 + +gnome-utils (1.4.1.2-4) unstable; urgency=low + + * Depend on scrollkeeper as requested by Matt Zimmerman . + gnome-utils would happily run without scrollkeeper, but the + dependency seems to fix some potential upgrade problems. + Keep scrollkeeper more silent as well. (closes: #140818) + + -- Jochen Voss Fri, 12 Apr 2002 16:56:45 +0200 + +gnome-utils (1.4.1.2-3) unstable; urgency=low + + * Recompiled as requested by the e2fsprogs maintainer + * Apply patches from the GNOME BTS to fix gdict (Closes: #76735) + + -- Jochen Voss Sun, 24 Mar 2002 16:06:47 +0100 + +gnome-utils (1.4.1.2-2) unstable; urgency=low + + * Apply patch from Sebastian Rittau (Closes: #135550) + + -- Jochen Voss Mon, 4 Mar 2002 18:36:42 +0100 + +gnome-utils (1.4.1.2-1) unstable; urgency=low + + * New upstream release (translation updates, gtt fixes, ...) + * Suggest xsu and mention it in the gshutdown manual page + (Closes: #117833, #113377) + * Provide the new virtual package "dict-client" + + -- Jochen Voss Mon, 18 Feb 2002 20:24:04 +0100 + +gnome-utils (1.4.1.1-5) unstable; urgency=low + + * stripchart documentation was truncated. + + -- Jochen Voss Thu, 17 Jan 2002 20:26:05 +0100 + +gnome-utils (1.4.1.1-4) unstable; urgency=low + + * Fix code in logview, which broke for archs + where char is unsigned (Closes: #127021). + * Fix the return codes of the "splac" utility. + * Fix the gless manual page (Closes: #127255, #127256). + + -- Jochen Voss Fri, 4 Jan 2002 15:59:54 +0100 + +gnome-utils (1.4.1.1-3) unstable; urgency=low + + * Rebuild with libgtkhtml20 instead of libgtkhtml19. + Somebody managed to remove libgtkhtml19 even while + gnome-utils depends on it (Closes: #123212). + * Add an override file for lintian: the license files + in the online manual are ok. + + -- Jochen Voss Tue, 11 Dec 2001 16:43:17 +0100 + +gnome-utils (1.4.1.1-2) unstable; urgency=low + + * Add libgtkhtml-dev to the build dependencies. + Otherwise gtt would not be built. + + -- Jochen Voss Tue, 4 Dec 2001 11:46:18 +0100 + +gnome-utils (1.4.1.1-1) unstable; urgency=low + + * New upstream release (mostly fixes, but contains an improved + version of gtt) + * Do not install "stripchart.conf" in /etc. Upstream tells me, that + this is no configuration file at all (despite of the name). Same + for "stripchar.params" + * Update the build dependencies. + + -- Jochen Voss Fri, 23 Nov 2001 10:47:18 +0100 + +gnome-utils (1.4.0.2-4) unstable; urgency=low + + * Fixed the menu pixmaps. (Closes: #107572) + Thanks to Michael Piefel for the new ones. + + -- Jochen Voss Thu, 30 Aug 2001 09:37:12 +0200 + +gnome-utils (1.4.0.2-3) unstable; urgency=low + + * Fix gdialog again. This time the text mode was broken. (Closes: #105990) + * Remove the emacs stuff from the bottom of this file. + + -- Jochen Voss Tue, 28 Aug 2001 16:18:28 +0200 + +gnome-utils (1.4.0.2-2) unstable; urgency=low + + * Fix the use of scrollkeeper (Closes: #105974) + + -- Jochen Voss Sat, 21 Jul 2001 13:37:40 +0200 + +gnome-utils (1.4.0.2-1) unstable; urgency=low + + * New upstream release + + -- Jochen Voss Sun, 8 Jul 2001 13:13:27 +0200 + +gnome-utils (1.4.0.1-3) unstable; urgency=low + + * Use the --with-messages configure option (Closes: #103509) + + -- Jochen Voss Wed, 4 Jul 2001 19:13:51 +0200 + +gnome-utils (1.4.0.1-2) unstable; urgency=low + + * Try to fix the Build-Depends again (Closes: #103122) + + -- Jochen Voss Mon, 2 Jul 2001 19:19:53 +0200 + +gnome-utils (1.4.0.1-1) unstable; urgency=low + + * New upstream release + + -- Jochen Voss Mon, 25 Jun 2001 19:22:51 +0200 + +gnome-utils (1.4.0-10) unstable; urgency=low + + * Upgraded to standards version 3.5.4.0 + (support DEB_BUILD_OPTIONS) + * minor bug fix for gfloppy + * Fix some manual pages. + * Don't try to build the broken Azerbaijanian manual for gfloppy. + + -- Jochen Voss Mon, 14 May 2001 22:24:34 +0200 + +gnome-utils (1.4.0-9) unstable; urgency=low + + * Fix the output of "gdialog --version" + + -- Jochen Voss Wed, 2 May 2001 17:19:03 +0200 + +gnome-utils (1.4.0-8) unstable; urgency=low + + * Remove the bogus "Conflicts: gnome-admin", Replaces is + enough (Closes: #94683) + + -- Jochen Voss Tue, 24 Apr 2001 08:48:20 +0200 + +gnome-utils (1.4.0-7) unstable; urgency=low + + * Add the remaining manual pages (Closes: #56078) + + -- Jochen Voss Sat, 21 Apr 2001 18:08:11 +0200 + +gnome-utils (1.4.0-6) unstable; urgency=low + + * Make "gdialog --menu" work + * Call scrollkeeper-update properly + * Add another five manual pages + + -- Jochen Voss Mon, 16 Apr 2001 18:26:27 +0200 + +gnome-utils (1.4.0-5) unstable; urgency=low + + * Add more manual pages + + -- Jochen Voss Sat, 7 Apr 2001 17:09:15 +0200 + +gnome-utils (1.4.0-4) unstable; urgency=low + + * Fix the Build-Depends again (Closes: #93072) + + -- Jochen Voss Fri, 6 Apr 2001 13:55:18 +0200 + +gnome-utils (1.4.0-3) unstable; urgency=low + + * Update the menu file (Closes: #80027, #46418) + * Add menu icons + + -- Jochen Voss Fri, 6 Apr 2001 13:55:04 +0200 + +gnome-utils (1.4.0-2) unstable; urgency=low + + * Fix gdict's font and color selection dialog (Closes: #87179) + + -- Jochen Voss Sun, 25 Mar 2001 17:44:45 +0200 + +gnome-utils (1.4.0-1) unstable; urgency=low + + * New upstream release + + -- Jochen Voss Tue, 20 Mar 2001 18:31:01 +0100 + +gnome-utils (1.3.2-1) unstable; urgency=low + + * Update to standards version 3.1.0 + * New upstream release + + -- Jochen Voss Thu, 8 Mar 2001 19:21:30 +0100 + +gnome-utils (1.2.1-11) unstable; urgency=low + + * Install all README files into the doc directory. + * Add a manual page for gdict (Closes: #35453) + * Use dh_installman instead of deprecated dh_installmanpages. + + -- Jochen Voss Fri, 23 Feb 2001 18:19:17 +0100 + +gnome-utils (1.2.1-10) unstable; urgency=low + + * New maintainer (Closes: #86114) + * Add links to the undocumented.7 manpage. + * Small fix to the Build-Depends. + + -- Jochen Voss Fri, 16 Feb 2001 20:26:01 +0100 + +gnome-utils (1.2.1-9) unstable; urgency=low + + * Fix conflicts/replaces with gnome-admin. (Closes: #76995) + * Recompile with fixed dpkg-dev (Closes: #76885, #77097, #77863) + + -- James LewisMoss Sun, 26 Nov 2000 03:14:11 -0500 + +gnome-utils (1.2.1-8) unstable; urgency=low + + * Conflict with gnome-admin (<< 1.0.3-2) (Closes: #76542) + * Fixup menus. Add missing (gdiskfree, gcharmap, gdict, idetool, + gfloppy). Add hints (hints="Gnome") + + -- James LewisMoss Sat, 11 Nov 2000 00:47:38 -0500 + +gnome-utils (1.2.1-7) unstable; urgency=low + + * Capitalize depends in Build-Depends (Closes: #74926) + * Remove ghex from short descrip (no longer in package) (Closes: #74454) + * Fix french translation of "Font Selector". Reported upstream. (Closes: + #75092) + * Grab patch from cvs to fix gcolorsel crashing problem (Closes: #74930) + * Blech. Modified a makefile.am. Do the automake autoconf clean + Makefile.in configure crap. + + -- James LewisMoss Sun, 22 Oct 2000 12:12:33 -0400 + +gnome-utils (1.2.1-6) unstable; urgency=low + + * Hopefully get all the build depends (Closes: #74343) + + -- James LewisMoss Sun, 8 Oct 2000 19:44:06 -0400 + +gnome-utils (1.2.1-5) unstable; urgency=low + + * Add Replaces, Provides gdict. + * Add some build-depends. + + -- James LewisMoss Thu, 5 Oct 2000 22:22:03 -0400 + +gnome-utils (1.2.1-4) unstable; urgency=low + + * Maintainer upload. + * Remove undocumented manpage links. (Should reopen #56078) + * Fix up list of installed applications. + + -- James LewisMoss Thu, 5 Oct 2000 20:27:47 -0400 + +gnome-utils (1.2.1-0.1) unstable; urgency=low + + * New upstream release Close: #69687). + * NMU. + * Move /usr/share/gstripchart/gstripchart.conf to /etc (Closes: #50212) + * Install doc in the right place (Closes: #69142). + * Build with libgnome 1.2.4 (Closes: #65419). + * Install undocumented manpages (Closes: #56078). + * Install a manpage for gdialog (Closes: #46947). + * Gcalc don't segfault when pressing = (Closes: #63456). + + -- Christian Marillat Fri, 25 Aug 2000 16:38:06 +0200 + +gnome-utils (1.2.0-0.0) frozen unstable; urgency=low + + * New upstream release. + + -- James LewisMoss Wed, 31 May 2000 10:03:13 +0200 + +gnome-utils (1.0.50-5) frozen unstable; urgency=low + + * setenv LC_NUMERIC to C at begininng of gcalc's main important bug. + (Closes: #62471) + * Apply patch from bug report (Closes: #51338) + * Change the menu location from Apps/System to Apps/Tools for gcolorsel, + gfontsel, and gsearchtool (Closes: #55596) + * Remove patching code in rules. + + -- James LewisMoss Wed, 26 Apr 2000 23:25:08 -0400 + +gnome-utils (1.0.50-4) frozen unstable; urgency=low + + * Recompile to get libesd0|libesd0-alsa dependancy correct. important + bug. (Closes: #55662) + * Fix license file location in copyright file. + + -- James LewisMoss Sun, 30 Jan 2000 02:40:05 -0500 + +gnome-utils (1.0.50-3) unstable; urgency=low + + * Oops remove the FIXME comment. + + -- James LewisMoss Thu, 28 Oct 1999 23:44:08 -0400 + +gnome-utils (1.0.50-2) unstable; urgency=low + + * Add devpts as exclude fs type in gdiskfree/df.c. Closes: #46420. + * s/length/string-length/ in cromagnon/cromagnon.scm. + * Add --gauge (correct spelling option to gdialog) (not replacement for + guage, just a correct spelling option just the same) Closes: #44757. + * Fix gfontsel so that already chosen items are redisplayed in text + box. Closes: #35065. + * Move gless from Apps/Editors to Apps/Viewers. Closes: #47416. + * gpenguin seems to have been removed from upstream source. Closes: + #45942. + + -- James LewisMoss Thu, 28 Oct 1999 22:22:34 -0400 + +gnome-utils (1.0.50-1) unstable; urgency=low + + * New upstream. + * Accept --defaultno at begining and end of option list for yesno. + + -- James LewisMoss Sat, 23 Oct 1999 00:00:53 -0400 + +gnome-utils (1.0.13-3) unstable; urgency=low + + * If width is set to 0 for yesno dialog do auto sizing. + + -- James LewisMoss Sun, 26 Sep 1999 23:13:00 -0400 + +gnome-utils (1.0.13-2) unstable; urgency=low + + * Add --defaultno option to --yesno dialog. + + -- James LewisMoss Sun, 26 Sep 1999 20:58:53 -0400 + +gnome-utils (1.0.13-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Thu, 23 Sep 1999 21:56:00 -0400 + +gnome-utils (1.0.12-1) unstable; urgency=low + + * New upstream. + * Remove beta warning in control.in. + * Whoever said they would take this package and hasn't yet is more than + welcom to it. Only doing this to get Jim Pick's name off the + maintainer list for it. + * Remove gnomecal from description (Fixes bug: #40543) + * Removed menu entries for gnomecal and gnomecard (Fixes bug #41755) + * Previous NMU fixed #40153. + * Move man files from usr/man/man1 to usr/share/man/man1 (FHS compliance) + + -- James LewisMoss Tue, 7 Sep 1999 21:58:35 -0400 + +gnome-utils (1.0.1-0.3) unstable; urgency=low + + * Non-maintainer upload fixing important #40362. + * In clean target of debian/rules, chown files owned by root (created + during configuration); also call distclean only if Makefile is present; + new target force-clean to configure and then clean (old way). + * Remove gnomecal and gnomecards manpages also from debian/rules.in. + + -- Roman Hodek Tue, 6 Jul 1999 14:55:29 +0200 + +gnome-utils (1.0.1-0.2) unstable; urgency=low + + * Non-maintainer upload. + Fixes bugs: #39089, #33132, #36161, #39333, #39819, #40029, #40129, #38828. + + -- Vincent Renardias Fri, 25 Jun 1999 13:00:16 +0200 + +gnome-utils (1.0.1-0.1) unstable; urgency=low + + * Non-maintainer upload for GNOME-1.0 + + -- Jules Bean Mon, 8 Mar 1999 10:34:59 +0100 + +gnome-utils (0.99.3-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Sun, 24 Jan 1999 21:05:15 -0800 + +gnome-utils (0.30-2) frozen unstable; urgency=low + + * Recompiled to fix dependencies. + * shlibs.local updated + * G_HAVE_INLINE and HAVE_ATEXIT defined as glib workaround. + * GNOME IS ALPHA warnings added. + + -- Jim Pick Mon, 23 Nov 1998 23:46:45 -0800 + +gnome-utils (0.30-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Fri, 25 Sep 1998 13:22:54 -0700 + +gnome-utils (0.28-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 17 Aug 1998 13:00:56 -0700 + +gnome-utils (0.27-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Sat, 15 Aug 1998 20:28:27 -0700 + +gnome-utils (0.25-1) unstable; urgency=low + + * New upstream version. + + -- Jim Pick Sat, 8 Aug 1998 11:09:30 -0700 + +gnome-utils (0.20-3) unstable; urgency=low + + * Rebuilt to fix dependencies. + + -- Jim Pick Mon, 3 Aug 1998 15:02:56 -0700 + +gnome-utils (0.20-2) unstable; urgency=low + + * Fixed broken dependency. + + -- Jim Pick Mon, 22 Jun 1998 10:33:31 -0700 + +gnome-utils (0.20-1) unstable; urgency=low + + * Initial Release. + + -- Jim Pick Wed, 17 Jun 1998 19:13:52 -0700 --- gnome-utils-2.18.1.orig/debian/copyright +++ gnome-utils-2.18.1/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Jim Pick jim@jimpick.com on Sat, 14 Mar +1998 20:12:23 -0800. And taken over by James LewisMoss on Tue, 7 Sep +1999 21:58:35 -0400. And later on taken over by Jochen Voss. +This package was re-debianised by Joe Drew on +Sat, 27 Jul 2002 22:23:31 -0400. +This package was re-debianised by Marco Cabizza on +Wed, 29 Mar 2006 22:50:40 +0200. + +It was downloaded from +http://download.gnome.org/sources/gnome-utils/ + +See the /usr/share/doc/gnome-utils/changelog.gz file for a full list +of contributors and authors. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- gnome-utils-2.18.1.orig/debian/docs +++ gnome-utils-2.18.1/debian/docs @@ -0,0 +1,3 @@ +NEWS +THANKS +README --- gnome-utils-2.18.1.orig/debian/compat +++ gnome-utils-2.18.1/debian/compat @@ -0,0 +1 @@ +5 \ No newline at end of file --- gnome-utils-2.18.1.orig/debian/watch +++ gnome-utils-2.18.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/gnome-utils/([\d\.]+)[02468]/ \ + gnome-utils-(.*)\.tar\.gz \ + debian uupdate --- gnome-utils-2.18.1.orig/debian/gnome-screenshot.1 +++ gnome-utils-2.18.1/debian/gnome-screenshot.1 @@ -0,0 +1,56 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng . +.TH "GNOME-SCREENSHOT" "1" "23 mars 2007" "" "" + +.SH NAME +gnome-screenshot \- capture screen or window and save the image to a file. +.SH SYNOPSIS + +\fBgnome-screenshot\fR [ \fB-w\fR ] [ \fB-d \fISECONDS\fB \fR ] [ \fB-e \fIEFFECT\fB \fR ] [ \fB-i\fR ] + +.SH "DESCRIPTION" +.PP +\fBgnome-screenshot\fR is a GNOME utility for taking +screenshot of the entire screen or a window, with optional beutifying +border effects. +.PP +\fBgnome-panel-screenshot\fR is the same program. +It is provided for backward compatibility, and is considered +deprecated. +.SH "OPTIONS" +.TP +\fB-w, --window\fR +Grab the current active window instead of the entire +screen. +.TP +\fB-d \fISECONDS\fB, --delay=\fISECONDS\fB\fR +Take screenshot after specified delay [in seconds]. +.TP +\fB-e \fIEFFECT\fB, --border-effect=\fIEFFECT\fB\fR +Add effect to the outside of the screenshot border. +\fIEFFECT\fR can be ``shadow'' +(adding drop shadow), ``border'' (adding rectangular +space around the screenshot) or ``none'' (no effect). +Default is ``none''\&. +.TP +\fB-i, --interactive\fR +Interactively set options in a dialog. +.TP +\fB-?, --help\fR +Show summary of options. +.PP +In addition, the usual GTK+ and GNOME command line options apply. +See the output of --help for details. +.SH "SEE ALSO" +.PP +gnome-options(7), gtk-options(7) +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat for +the Debian GNU/Linux system (but may be used by others). +.PP +Updated by Theppitak Karoonboonyanan +\&. --- gnome-utils-2.18.1.orig/debian/patches/07_fix_screenshot_tmp_directory.patch +++ gnome-utils-2.18.1/debian/patches/07_fix_screenshot_tmp_directory.patch @@ -0,0 +1,19 @@ +diff -Nur gnome-utils-2.18.0/gnome-screenshot/screenshot-save.c gnome-utils-2.18.0.new/gnome-screenshot/screenshot-save.c +--- gnome-utils-2.18.0/gnome-screenshot/screenshot-save.c 2007-03-10 14:19:50.000000000 +0100 ++++ gnome-utils-2.18.0.new/gnome-screenshot/screenshot-save.c 2007-04-09 12:21:13.000000000 +0200 +@@ -142,13 +142,12 @@ + i = 0; + do + { +- gchar *tmp_dir = g_strdup_printf ("%u-%d", ++ gchar *tmp_dir = g_strdup_printf ("gnome-screenshot-%u-%d", + (unsigned int) getpid (), + i++); + + dir_name = g_build_filename (g_get_tmp_dir (), +- "gnome-screenshot", +- tmp_dir, ++ tmp_dir, + NULL); + g_free (tmp_dir); + --- gnome-utils-2.18.1.orig/debian/patches/06_fix_logview_crasher.patch +++ gnome-utils-2.18.1/debian/patches/06_fix_logview_crasher.patch @@ -0,0 +1,14 @@ +Fixes a crash due to an uninitialized variable; found in the Ubuntu package. + +diff -urNad gnome-utils-2.14.0~/logview/main.c gnome-utils-2.14.0/logview/main.c +--- gnome-utils-2.14.0~/logview/main.c 2006-01-23 00:42:37.000000000 +0100 ++++ gnome-utils-2.14.0/logview/main.c 2006-04-10 15:23:36.000000000 +0200 +@@ -87,7 +87,7 @@ + gint numlogs; + GSList *logs; + Log *log; +- gint i; ++ gint i = 0; + + g_assert (LOGVIEW_IS_WINDOW (logview)); + numlogs = logview_count_logs (logview); --- gnome-utils-2.18.1.orig/debian/patches/01_lpi.patch +++ gnome-utils-2.18.1/debian/patches/01_lpi.patch @@ -0,0 +1,166 @@ +diff -Nur gnome-utils-2.17.92/configure.in gnome-utils-2.17.92.new/configure.in +--- gnome-utils-2.17.92/configure.in 2007-02-12 23:01:10.000000000 +0100 ++++ gnome-utils-2.17.92.new/configure.in 2007-02-13 08:31:33.000000000 +0100 +@@ -94,7 +94,8 @@ + PKG_CHECK_MODULES(GNOME_UTILS, glib-2.0 >= $GLIB_REQUIRED dnl + gtk+-2.0 >= $GTK_REQUIRED dnl + libgnome-2.0 >= $LIBGNOME_REQUIRED dnl +- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) ++ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(GNOME_UTILS_CFLAGS) + AC_SUBST(GNOME_UTILS_LIBS) + +@@ -108,7 +109,8 @@ + dnl ***************************************** + dnl gnome-dictionary needs libgnomeprint and libgnomeprintui + dnl ***************************************** +-PKG_CHECK_MODULES(LIBGNOMEPRINT, libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED) ++PKG_CHECK_MODULES(LIBGNOMEPRINT, libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(LIBGNOMEPRINT_CFLAGS) + AC_SUBST(LIBGNOMEPRINT_LIBS) + +@@ -116,7 +118,8 @@ + dnl libgdict requires just gtk+ + dnl ***************************************** + PKG_CHECK_MODULES(LIBGDICT, glib-2.0 >= $GLIB_REQUIRED dnl +- gtk+-2.0 >= $GTK_REQUIRED) ++ gtk+-2.0 >= $GTK_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(LIBGDICT_CFLAGS) + AC_SUBST(LIBGDICT_LIBS) + +@@ -151,7 +154,8 @@ + + PKG_CHECK_MODULES(SCREENSHOT, gtk+-2.0 >= $GTK_REQUIRED dnl + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dnl +- libglade-2.0 >= $LIBGLADE_REQUIRED) ++ libglade-2.0 >= $LIBGLADE_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(SCREENSHOT_CFLAGS) + AC_SUBST(SCREENSHOT_LIBS) + +@@ -183,7 +187,8 @@ + dnl ********************************************* + + PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED dnl +- gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED) ++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(GNOMEVFS_CFLAGS) + AC_SUBST(GNOMEVFS_LIBS) + +@@ -191,7 +196,8 @@ + dnl gnome-desktop is need for gsearchtool + dnl ********************************************* + +-PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) ++PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(GNOMEDESKTOP_CFLAGS) + AC_SUBST(GNOMEDESKTOP_LIBS) + +@@ -211,7 +217,8 @@ + dnl Gdict applet checks + dnl ******************************* + +-PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED) ++PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(APPLET_LIBS) + AC_SUBST(APPLET_CFLAGS) + +@@ -219,11 +226,13 @@ + dnl Baobab checks + dnl ******************************* + +-PKG_CHECK_MODULES(LIBGTOP, libgtop-2.0 >= $LIBGTOP_REQUIRED) ++PKG_CHECK_MODULES(LIBGTOP, libgtop-2.0 >= $LIBGTOP_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(LIBGTOP_CFLAGS) + AC_SUBST(LIBGTOP_LIBS) + +-PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED) ++PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED dnl ++ launchpad-integration) + AC_SUBST(GNOMECANVAS_CFLAGS) + AC_SUBST(GNOMECANVAS_LIBS) + +diff -Nur gnome-utils-2.17.92/gnome-dictionary/data/gnome-dictionary-ui.xml gnome-utils-2.17.92.new/gnome-dictionary/data/gnome-dictionary-ui.xml +--- gnome-utils-2.17.92/gnome-dictionary/data/gnome-dictionary-ui.xml 2007-01-23 21:03:45.000000000 +0100 ++++ gnome-utils-2.17.92.new/gnome-dictionary/data/gnome-dictionary-ui.xml 2007-02-13 08:26:12.000000000 +0100 +@@ -36,6 +36,9 @@ + + + ++ ++ ++ + + + +diff -Nur gnome-utils-2.17.92/gnome-dictionary/src/gdict-window.c gnome-utils-2.17.92.new/gnome-dictionary/src/gdict-window.c +--- gnome-utils-2.17.92/gnome-dictionary/src/gdict-window.c 2007-02-12 22:59:22.000000000 +0100 ++++ gnome-utils-2.17.92.new/gnome-dictionary/src/gdict-window.c 2007-02-13 08:26:12.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -1578,7 +1579,6 @@ + + window->ui_manager = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (window->ui_manager, action_group, 0); +- + accel_group = gtk_ui_manager_get_accel_group (window->ui_manager); + gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); + +@@ -1598,6 +1598,7 @@ + gtk_widget_show (window->menubar); + } + ++ launchpad_integration_add_ui(window->ui_manager, "ui/MainMenu/HelpMenu/LaunchpadItems"); + vbox = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); + gtk_container_add (GTK_CONTAINER (window->main_box), vbox); +diff -Nur gnome-utils-2.17.92/logview/logview.c gnome-utils-2.17.92.new/logview/logview.c +--- gnome-utils-2.17.92/logview/logview.c 2007-01-23 21:03:48.000000000 +0100 ++++ gnome-utils-2.17.92.new/logview/logview.c 2007-02-13 08:26:12.000000000 +0100 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include "logview.h" + #include "loglist.h" +@@ -157,6 +158,9 @@ + " " + " " + " " ++ " " ++ " " ++ " " + " " + " " + " " +@@ -826,7 +830,6 @@ + gtk_action_group_set_translation_domain (action_group, NULL); + gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS (entries), logview); + gtk_action_group_add_toggle_actions(action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), logview); +- + logview->ui_manager = gtk_ui_manager_new (); + + gtk_ui_manager_insert_action_group (logview->ui_manager, action_group, 0); +@@ -839,6 +842,7 @@ + return; + } + ++ launchpad_integration_add_ui(logview->ui_manager, "ui/LogviewMenu/HelpMenu/LaunchpadItems"); + menubar = gtk_ui_manager_get_widget (logview->ui_manager, "/LogviewMenu"); + gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0); + --- gnome-utils-2.18.1.orig/debian/patches/04_menu_changes.patch +++ gnome-utils-2.18.1/debian/patches/04_menu_changes.patch @@ -0,0 +1,35 @@ +diff -Nur gnome-utils-2.17.92/baobab/data/baobab.desktop.in.in gnome-utils-2.17.92.new/baobab/data/baobab.desktop.in.in +--- gnome-utils-2.17.92/baobab/data/baobab.desktop.in.in 2007-01-23 21:03:43.000000000 +0100 ++++ gnome-utils-2.17.92.new/baobab/data/baobab.desktop.in.in 2007-02-13 08:32:36.000000000 +0100 +@@ -9,7 +9,7 @@ + Terminal=false + Type=Application + StartupNotify=true +-Categories=GTK;GNOME;Application;System; ++Categories=GTK;GNOME;Application;Utility; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-utils + X-GNOME-Bugzilla-Component=baobab +diff -Nur gnome-utils-2.17.92/gfloppy/gfloppy.desktop.in gnome-utils-2.17.92.new/gfloppy/gfloppy.desktop.in +--- gnome-utils-2.17.92/gfloppy/gfloppy.desktop.in 2007-01-23 21:03:55.000000000 +0100 ++++ gnome-utils-2.17.92.new/gfloppy/gfloppy.desktop.in 2007-02-13 08:32:36.000000000 +0100 +@@ -8,6 +8,7 @@ + Type=Application + StartupNotify=true + Categories=GTK;GNOME;Application;System; ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-utils + X-GNOME-Bugzilla-Component=gfloppy +diff -Nur gnome-utils-2.17.92/logview/gnome-system-log.desktop.in.in gnome-utils-2.17.92.new/logview/gnome-system-log.desktop.in.in +--- gnome-utils-2.17.92/logview/gnome-system-log.desktop.in.in 2007-01-23 21:03:48.000000000 +0100 ++++ gnome-utils-2.17.92.new/logview/gnome-system-log.desktop.in.in 2007-02-13 08:32:36.000000000 +0100 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + StartupNotify=true +-Categories=GTK;GNOME;Application;System;Monitor;X-Red-Hat-Base; ++Categories=GNOME;Application;System;Settings + X-GNOME-DocPath=gnome-system-log/gnome-system-log.xml + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-utils --- gnome-utils-2.18.1.orig/debian/patches/02_autoconf.patch +++ gnome-utils-2.18.1/debian/patches/02_autoconf.patch @@ -0,0 +1,6499 @@ +diff -Nur gnome-utils-2.18.1/configure gnome-utils-2.18.1.new/configure +--- gnome-utils-2.18.1/configure 2007-04-14 14:03:21.000000000 +0200 ++++ gnome-utils-2.18.1.new/configure 2007-04-27 16:28:13.000000000 +0200 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.60 for gnome-utils 2.18.1. ++# Generated by GNU Autoconf 2.61 for gnome-utils 2.18.1. + # + # Report bugs to . + # +@@ -12,7 +12,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -21,10 +22,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -217,7 +221,7 @@ + else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +@@ -235,7 +239,6 @@ + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -244,10 +247,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + _ASEOF +@@ -255,7 +260,6 @@ + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -264,10 +268,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + (as_func_return () { +@@ -514,19 +520,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -720,36 +735,36 @@ + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include + #endif +-#if HAVE_STDINT_H ++#ifdef HAVE_STDINT_H + # include + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_UNISTD_H + # include + #endif" + +@@ -984,6 +999,7 @@ + CC + CFLAGS + LDFLAGS ++LIBS + CPPFLAGS + CXX + CXXFLAGS +@@ -1125,10 +1141,10 @@ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) +@@ -1144,10 +1160,10 @@ + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ +@@ -1341,19 +1357,19 @@ + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; + + --x) +@@ -1652,6 +1668,7 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command +@@ -1779,7 +1796,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-utils configure 2.18.1 +-generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.61 + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +@@ -1793,7 +1810,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-utils $as_me 2.18.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +@@ -2215,7 +2232,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -2381,7 +2398,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2516,7 +2533,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2556,7 +2573,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2611,14 +2628,6 @@ + + + +-case m4 in +- [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;; +- *) ac_macro_dir=$srcdir/m4 ;; +-esac +-test -d "$ac_macro_dir" || +- { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5 +-echo "$as_me: error: cannot find macro directory \`m4'" >&2;} +- { (exit 1); exit 1; }; } + + + +@@ -2753,7 +2762,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2793,7 +2802,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2850,7 +2859,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2891,7 +2900,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -2949,7 +2958,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2993,7 +3002,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3134,7 +3143,7 @@ + # in a Makefile. We should not override ac_cv_exeext if it was cached, + # so that the user can short-circuit this test for compilers unknown to + # Autoconf. +-for ac_file in $ac_files ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +@@ -3162,6 +3171,12 @@ + test "$ac_cv_exeext" = no && ac_cv_exeext= + + else ++ ac_file='' ++fi ++ ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +@@ -3173,8 +3188,6 @@ + fi + + ac_exeext=$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +@@ -3352,27 +3365,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3427,27 +3423,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3482,27 +3461,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -3538,27 +3500,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3674,27 +3619,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -3932,7 +3860,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3995,7 +3923,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4036,7 +3964,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4077,7 +4005,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4118,7 +4046,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4177,27 +4105,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + DATADIRNAME=share + else + echo "$as_me: failed program was:" >&5 +@@ -4268,27 +4180,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4297,7 +4193,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -4315,7 +4211,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + +@@ -4371,27 +4267,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_cposix_strerror=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4400,7 +4280,7 @@ + ac_cv_lib_cposix_strerror=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -4440,7 +4320,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4484,7 +4364,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4597,27 +4477,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4672,27 +4535,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4727,27 +4573,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -4783,27 +4612,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4975,7 +4787,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5015,7 +4827,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5072,7 +4884,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5113,7 +4925,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -5171,7 +4983,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5215,7 +5027,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5335,27 +5147,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5410,27 +5205,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5465,27 +5243,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5521,27 +5282,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5657,27 +5401,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -5875,17 +5602,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5919,17 +5639,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5994,17 +5707,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -6038,17 +5744,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -6103,7 +5802,7 @@ + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -6185,7 +5884,7 @@ + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -6281,27 +5980,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6453,7 +6135,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_YACC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6514,7 +6196,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -7223,7 +6905,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7226 "configure"' > conftest.$ac_ext ++ echo '#line 6908 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7347,27 +7029,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + lt_cv_cc_needs_belf=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7376,7 +7042,7 @@ + lt_cv_cc_needs_belf=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -7430,7 +7096,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7470,7 +7136,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7526,7 +7192,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7566,7 +7232,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7622,7 +7288,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7662,7 +7328,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7750,27 +7416,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -7833,27 +7482,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7889,17 +7521,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -8016,17 +7641,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -8060,17 +7678,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -8135,17 +7746,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -8179,17 +7783,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -8230,7 +7827,7 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -8248,7 +7845,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8274,7 +7871,7 @@ + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -8292,7 +7889,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8399,27 +7996,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -8462,27 +8042,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -8937,7 +8500,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8977,7 +8540,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9033,7 +8596,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9073,7 +8636,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9129,7 +8692,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9169,7 +8732,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9486,11 +9049,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9489: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9052: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9493: \$? = $ac_status" >&5 ++ echo "$as_me:9056: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9754,11 +9317,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9757: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9320: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9761: \$? = $ac_status" >&5 ++ echo "$as_me:9324: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9858,11 +9421,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9861: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9424: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9865: \$? = $ac_status" >&5 ++ echo "$as_me:9428: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10338,27 +9901,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -10372,7 +9919,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -10413,27 +9960,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -10447,7 +9978,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -11355,7 +10886,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 11358 "configure"' > conftest.$ac_ext ++ echo '#line 10889 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -11716,27 +11247,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11745,7 +11260,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11827,27 +11342,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11856,7 +11355,7 @@ + ac_cv_func_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +@@ -11906,27 +11405,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11935,7 +11418,7 @@ + ac_cv_lib_dld_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12007,27 +11490,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -12036,7 +11503,7 @@ + ac_cv_func_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +@@ -12086,27 +11553,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -12115,7 +11566,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12166,27 +11617,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_svld_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -12195,7 +11630,7 @@ + ac_cv_lib_svld_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12246,27 +11681,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_dld_link=yes + else + echo "$as_me: failed program was:" >&5 +@@ -12275,7 +11694,7 @@ + ac_cv_lib_dld_dld_link=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12331,7 +11750,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -13552,7 +12955,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -13594,27 +12997,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -13628,7 +13015,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -14799,11 +14186,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14802: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14189: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14806: \$? = $ac_status" >&5 ++ echo "$as_me:14193: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14903,11 +14290,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14906: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14293: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14910: \$? = $ac_status" >&5 ++ echo "$as_me:14297: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15439,7 +14826,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 15442 "configure"' > conftest.$ac_ext ++ echo '#line 14829 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -16494,11 +15881,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16497: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15884: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16501: \$? = $ac_status" >&5 ++ echo "$as_me:15888: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16598,11 +15985,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16601: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15988: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16605: \$? = $ac_status" >&5 ++ echo "$as_me:15992: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17068,27 +16455,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -17102,7 +16473,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -17133,27 +16504,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -17167,7 +16522,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -18075,7 +17430,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 18078 "configure"' > conftest.$ac_ext ++ echo '#line 17433 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -18849,11 +18204,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18852: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18207: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18856: \$? = $ac_status" >&5 ++ echo "$as_me:18211: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -19117,11 +18472,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19120: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18475: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19124: \$? = $ac_status" >&5 ++ echo "$as_me:18479: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -19221,11 +18576,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19224: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18579: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:19228: \$? = $ac_status" >&5 ++ echo "$as_me:18583: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19701,27 +19056,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -19735,7 +19074,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -19776,27 +19115,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -19810,7 +19133,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -20718,7 +20041,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 20721 "configure"' > conftest.$ac_ext ++ echo '#line 20044 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -21954,7 +21277,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21994,7 +21317,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -22081,27 +21404,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + has_option=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22289,17 +21595,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # We can compile using X headers with no special include directory. + ac_x_includes= + else +@@ -22322,7 +21621,7 @@ + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" ++ LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22351,27 +21650,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= +@@ -22384,7 +21667,7 @@ + do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do +- if test -r "$ac_dir/libXt.$ac_extension"; then ++ if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi +@@ -22392,7 +21675,7 @@ + done + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no + +@@ -22447,12 +21730,12 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- case `(uname -sr) 2>/dev/null` in +- "SunOS 5"*) +- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } +- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ++ ac_xsave_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -22480,44 +21763,20 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_nospace=yes ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ X_LIBS="$X_LIBS -R$x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_nospace=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_nospace = yes; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- X_LIBS="$X_LIBS -R$x_libraries" +- else + LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -22545,48 +21804,30 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_space=yes ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_space=no ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_space = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- X_LIBS="$X_LIBS -R $x_libraries" +- else +- { echo "$as_me:$LINENO: result: neither works" >&5 +-echo "${ECHO_T}neither works" >&6; } +- fi +- fi +- LIBS=$ac_xsave_LIBS +- esac ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ ac_c_werror_flag=$ac_xsave_c_werror_flag ++ LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. +@@ -22635,27 +21876,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -22703,27 +21928,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22732,7 +21941,7 @@ + ac_cv_lib_dnet_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -22785,27 +21994,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22814,7 +22007,7 @@ + ac_cv_lib_dnet_stub_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -22827,7 +22020,7 @@ + fi + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + +@@ -22902,27 +22095,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22931,7 +22108,7 @@ + ac_cv_func_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +@@ -22980,27 +22157,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23009,7 +22170,7 @@ + ac_cv_lib_nsl_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -23062,27 +22223,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_bsd_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23091,7 +22236,7 @@ + ac_cv_lib_bsd_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -23174,27 +22319,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23203,7 +22332,7 @@ + ac_cv_func_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +@@ -23252,27 +22381,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23281,7 +22394,7 @@ + ac_cv_lib_socket_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -23357,27 +22470,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23386,7 +22483,7 @@ + ac_cv_func_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +@@ -23435,27 +22532,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23464,7 +22545,7 @@ + ac_cv_lib_posix_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -23540,27 +22621,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23569,7 +22634,7 @@ + ac_cv_func_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +@@ -23618,27 +22683,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23647,7 +22696,7 @@ + ac_cv_lib_ipc_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -23711,27 +22760,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23740,7 +22773,7 @@ + ac_cv_lib_ICE_IceConnectionNumber=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -23774,10 +22807,10 @@ + #ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; +- const charset x; ++ const charset cs; + /* SunOS 4.1.1 cc rejects this. */ +- char const *const *ccp; +- char **p; ++ char const *const *pcpcc; ++ char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; +@@ -23786,11 +22819,11 @@ + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; +- ccp = &g + (g ? g-g : 0); ++ pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ +- ++ccp; +- p = (char**) ccp; +- ccp = (char const *const *) p; ++ ++pcpcc; ++ ppc = (char**) pcpcc; ++ pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; +@@ -23817,47 +22850,30 @@ + const int foo = 10; + if (!foo) return 0; + } +- return !x[0] && !zero.x; ++ return !cs[0] && !zero.x; + #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_c_const=yes + else + echo "$as_me: failed program was:" >&5 +@@ -23911,27 +22927,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_c_inline=$ac_kw + else + echo "$as_me: failed program was:" >&5 +@@ -24001,27 +23000,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_type_off_t=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24081,27 +23063,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_type_pid_t=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24161,27 +23126,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_type_size_t=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24239,27 +23187,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_member_struct_stat_st_rdev=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24295,27 +23226,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_member_struct_stat_st_rdev=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24382,27 +23296,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_time=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24440,7 +23337,9 @@ + int + main () + { +-struct tm *tp; tp->tm_sec; ++struct tm tm; ++ int *p = &tm.tm_sec; ++ return !p; + ; + return 0; + } +@@ -24458,27 +23357,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_struct_tm=time.h + else + echo "$as_me: failed program was:" >&5 +@@ -24573,27 +23455,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_working_alloca_h=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24602,7 +23468,7 @@ + ac_cv_working_alloca_h=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +@@ -24633,7 +23499,7 @@ + # include + # define alloca _alloca + # else +-# if HAVE_ALLOCA_H ++# ifdef HAVE_ALLOCA_H + # include + # else + # ifdef _AIX +@@ -24669,27 +23535,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_alloca_works=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24698,7 +23548,7 @@ + ac_cv_func_alloca_works=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +@@ -24818,27 +23668,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -24847,7 +23681,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -24984,27 +23818,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25040,17 +23857,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25181,27 +23991,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -25210,7 +24004,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -25267,21 +24061,21 @@ + #include + #include + +-#if !STDC_HEADERS && !HAVE_STDLIB_H ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H + char *malloc (); + #endif + + /* This mess was copied from the GNU getpagesize.h. */ +-#if !HAVE_GETPAGESIZE ++#ifndef HAVE_GETPAGESIZE + /* Assume that all systems that can run configure have sys/param.h. */ +-# if !HAVE_SYS_PARAM_H ++# ifndef HAVE_SYS_PARAM_H + # define HAVE_SYS_PARAM_H 1 + # endif + + # ifdef _SC_PAGESIZE + # define getpagesize() sysconf(_SC_PAGESIZE) + # else /* no _SC_PAGESIZE */ +-# if HAVE_SYS_PARAM_H ++# ifdef HAVE_SYS_PARAM_H + # include + # ifdef EXEC_PAGESIZE + # define getpagesize() EXEC_PAGESIZE +@@ -25445,27 +24239,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_type_signal=int + else + echo "$as_me: failed program was:" >&5 +@@ -25551,27 +24328,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -25580,7 +24341,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -25635,27 +24396,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_strftime=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25664,7 +24409,7 @@ + ac_cv_lib_intl_strftime=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25756,27 +24501,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -25785,7 +24514,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -25860,7 +24589,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -25903,7 +24632,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -25968,12 +24697,12 @@ + pkg_cv_GNOME_UTILS_CFLAGS="$GNOME_UTILS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOME_UTILS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOME_UTILS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -25986,12 +24715,12 @@ + pkg_cv_GNOME_UTILS_LIBS="$GNOME_UTILS_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOME_UTILS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOME_UTILS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26010,14 +24739,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOME_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED"` ++ GNOME_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration"` + else +- GNOME_UTILS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED"` ++ GNOME_UTILS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOME_UTILS_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration) were not met: + + $GNOME_UTILS_PKG_ERRORS + +@@ -26028,7 +24757,7 @@ + and GNOME_UTILS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED launchpad-integration) were not met: + + $GNOME_UTILS_PKG_ERRORS + +@@ -26196,12 +24925,12 @@ + pkg_cv_LIBGNOMEPRINT_CFLAGS="$LIBGNOMEPRINT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= \$LIBGNOMEPRINTUI_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= \$LIBGNOMEPRINTUI_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGNOMEPRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED" 2>/dev/null` ++ pkg_cv_LIBGNOMEPRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26214,12 +24943,12 @@ + pkg_cv_LIBGNOMEPRINT_LIBS="$LIBGNOMEPRINT_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= \$LIBGNOMEPRINTUI_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= \$LIBGNOMEPRINTUI_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGNOMEPRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED" 2>/dev/null` ++ pkg_cv_LIBGNOMEPRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26238,14 +24967,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED"` ++ LIBGNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration"` + else +- LIBGNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED"` ++ LIBGNOMEPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGNOMEPRINT_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration) were not met: + + $LIBGNOMEPRINT_PKG_ERRORS + +@@ -26256,7 +24985,7 @@ + and LIBGNOMEPRINT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED launchpad-integration) were not met: + + $LIBGNOMEPRINT_PKG_ERRORS + +@@ -26310,12 +25039,12 @@ + pkg_cv_LIBGDICT_CFLAGS="$LIBGDICT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGDICT_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` ++ pkg_cv_LIBGDICT_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26328,12 +25057,12 @@ + pkg_cv_LIBGDICT_LIBS="$LIBGDICT_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGDICT_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` ++ pkg_cv_LIBGDICT_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26352,14 +25081,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGDICT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED"` ++ LIBGDICT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration"` + else +- LIBGDICT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED"` ++ LIBGDICT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGDICT_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration) were not met: + + $LIBGDICT_PKG_ERRORS + +@@ -26370,7 +25099,7 @@ + and LIBGDICT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration) were not met: + + $LIBGDICT_PKG_ERRORS + +@@ -26475,27 +25204,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26531,17 +25243,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26617,12 +25322,12 @@ + pkg_cv_SCREENSHOT_CFLAGS="$SCREENSHOT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_SCREENSHOT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` ++ pkg_cv_SCREENSHOT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26635,12 +25340,12 @@ + pkg_cv_SCREENSHOT_LIBS="$SCREENSHOT_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_SCREENSHOT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` ++ pkg_cv_SCREENSHOT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26659,14 +25364,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SCREENSHOT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` ++ SCREENSHOT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration"` + else +- SCREENSHOT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` ++ SCREENSHOT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SCREENSHOT_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration) were not met: + + $SCREENSHOT_PKG_ERRORS + +@@ -26677,7 +25382,7 @@ + and SCREENSHOT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED launchpad-integration) were not met: + + $SCREENSHOT_PKG_ERRORS + +@@ -26827,12 +25532,12 @@ + pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= \$GNOMEVFS_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= \$GNOMEVFS_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26845,12 +25550,12 @@ + pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= \$GNOMEVFS_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= \$GNOMEVFS_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26869,14 +25574,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED"` ++ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration"` + else +- GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED"` ++ GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOMEVFS_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration) were not met: + + $GNOMEVFS_PKG_ERRORS + +@@ -26887,7 +25592,7 @@ + and GNOMEVFS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED launchpad-integration) were not met: + + $GNOMEVFS_PKG_ERRORS + +@@ -26942,12 +25647,12 @@ + pkg_cv_GNOMEDESKTOP_CFLAGS="$GNOMEDESKTOP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMEDESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOMEDESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26960,12 +25665,12 @@ + pkg_cv_GNOMEDESKTOP_LIBS="$GNOMEDESKTOP_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMEDESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOMEDESKTOP_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26984,14 +25689,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"` ++ GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration"` + else +- GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"` ++ GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOMEDESKTOP_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration) were not met: + + $GNOMEDESKTOP_PKG_ERRORS + +@@ -27002,7 +25707,7 @@ + and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED launchpad-integration) were not met: + + $GNOMEDESKTOP_PKG_ERRORS + +@@ -27065,7 +25770,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -27161,12 +25866,12 @@ + pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_APPLET_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_APPLET_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED" 2>/dev/null` ++ pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27179,12 +25884,12 @@ + pkg_cv_APPLET_LIBS="$APPLET_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_APPLET_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_APPLET_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED" 2>/dev/null` ++ pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27203,14 +25908,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED"` ++ APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration"` + else +- APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED"` ++ APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$APPLET_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration) were not met: + + $APPLET_PKG_ERRORS + +@@ -27221,7 +25926,7 @@ + and APPLET_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED launchpad-integration) were not met: + + $APPLET_PKG_ERRORS + +@@ -27276,12 +25981,12 @@ + pkg_cv_LIBGTOP_CFLAGS="$LIBGTOP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGTOP_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null` ++ pkg_cv_LIBGTOP_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27294,12 +25999,12 @@ + pkg_cv_LIBGTOP_LIBS="$LIBGTOP_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGTOP_LIBS=`$PKG_CONFIG --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null` ++ pkg_cv_LIBGTOP_LIBS=`$PKG_CONFIG --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27318,14 +26023,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED"` ++ LIBGTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration"` + else +- LIBGTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED"` ++ LIBGTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGTOP_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libgtop-2.0 >= $LIBGTOP_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration) were not met: + + $LIBGTOP_PKG_ERRORS + +@@ -27336,7 +26041,7 @@ + and LIBGTOP_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libgtop-2.0 >= $LIBGTOP_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (libgtop-2.0 >= $LIBGTOP_REQUIRED launchpad-integration) were not met: + + $LIBGTOP_PKG_ERRORS + +@@ -27390,12 +26095,12 @@ + pkg_cv_GNOMECANVAS_CFLAGS="$GNOMECANVAS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomecanvas-2.0 >= \$GNOMECANVAS_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomecanvas-2.0 >= \$GNOMECANVAS_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMECANVAS_CFLAGS=`$PKG_CONFIG --cflags "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOMECANVAS_CFLAGS=`$PKG_CONFIG --cflags "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27408,12 +26113,12 @@ + pkg_cv_GNOMECANVAS_LIBS="$GNOMECANVAS_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomecanvas-2.0 >= \$GNOMECANVAS_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomecanvas-2.0 >= \$GNOMECANVAS_REQUIRED launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMECANVAS_LIBS=`$PKG_CONFIG --libs "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED" 2>/dev/null` ++ pkg_cv_GNOMECANVAS_LIBS=`$PKG_CONFIG --libs "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27432,14 +26137,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOMECANVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED"` ++ GNOMECANVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration"` + else +- GNOMECANVAS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED"` ++ GNOMECANVAS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOMECANVAS_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration) were not met: + + $GNOMECANVAS_PKG_ERRORS + +@@ -27450,7 +26155,7 @@ + and GNOMECANVAS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED launchpad-integration) were not met: + + $GNOMECANVAS_PKG_ERRORS + +@@ -27545,7 +26250,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CONSOLE_HELPER="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -27651,27 +26356,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + have_ipv6=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27749,27 +26437,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_getaddrinfo=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27778,7 +26450,7 @@ + ac_cv_func_getaddrinfo=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 +@@ -27832,27 +26504,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -27861,7 +26517,7 @@ + eval "$as_ac_Lib=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -27937,12 +26593,12 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- case `(uname -sr) 2>/dev/null` in +- "SunOS 5"*) +- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } +- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ++ ac_xsave_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -27970,44 +26626,20 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_nospace=yes ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ X_LIBS="$X_LIBS -R$x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_nospace=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_nospace = yes; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- X_LIBS="$X_LIBS -R$x_libraries" +- else + LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -28035,48 +26667,30 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_space=yes ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_space=no ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_space = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- X_LIBS="$X_LIBS -R $x_libraries" +- else +- { echo "$as_me:$LINENO: result: neither works" >&5 +-echo "${ECHO_T}neither works" >&6; } +- fi +- fi +- LIBS=$ac_xsave_LIBS +- esac ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ ac_c_werror_flag=$ac_xsave_c_werror_flag ++ LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. +@@ -28125,27 +26739,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -28193,27 +26791,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28222,7 +26804,7 @@ + ac_cv_lib_dnet_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28275,27 +26857,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28304,7 +26870,7 @@ + ac_cv_lib_dnet_stub_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28317,7 +26883,7 @@ + fi + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + +@@ -28378,41 +26944,25 @@ + ; + return 0; + } +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28421,7 +26971,7 @@ + ac_cv_func_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +@@ -28470,27 +27020,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28499,7 +27033,7 @@ + ac_cv_lib_nsl_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28552,27 +27086,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_bsd_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28581,7 +27099,7 @@ + ac_cv_lib_bsd_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28664,27 +27182,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28693,7 +27195,7 @@ + ac_cv_func_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +@@ -28742,27 +27244,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28771,7 +27257,7 @@ + ac_cv_lib_socket_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28847,27 +27333,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28876,7 +27346,7 @@ + ac_cv_func_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +@@ -28925,27 +27395,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28954,7 +27408,7 @@ + ac_cv_lib_posix_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -29030,27 +27484,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29059,7 +27497,7 @@ + ac_cv_func_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +@@ -29108,27 +27546,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29137,7 +27559,7 @@ + ac_cv_lib_ipc_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -29201,27 +27623,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29230,7 +27636,7 @@ + ac_cv_lib_ICE_IceConnectionNumber=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -29359,27 +27765,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29415,17 +27804,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29535,27 +27917,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ext2fs_ext2fs_mkdir=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29564,7 +27930,7 @@ + ac_cv_lib_ext2fs_ext2fs_mkdir=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -29618,27 +27984,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29674,17 +28023,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29780,27 +28122,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_ext2fs_ext2_io_h=yes + else + echo "$as_me: failed program was:" >&5 +@@ -29905,7 +28230,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -29982,27 +28307,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30038,17 +28346,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30146,27 +28447,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + am_cv_val_LC_MESSAGES=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30175,7 +28460,7 @@ + am_cv_val_LC_MESSAGES=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +@@ -30231,27 +28516,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30287,17 +28555,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30393,27 +28654,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_ngettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30422,7 +28667,7 @@ + gt_cv_func_ngettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -30465,27 +28710,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_dgettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30494,7 +28723,7 @@ + gt_cv_func_dgettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -30570,27 +28799,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -30599,7 +28812,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -30664,27 +28877,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_bindtextdomain=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30693,7 +28890,7 @@ + ac_cv_lib_intl_bindtextdomain=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -30742,27 +28939,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30771,7 +28952,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -30820,27 +29001,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30849,7 +29014,7 @@ + ac_cv_lib_intl_dgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -30911,27 +29076,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30940,7 +29089,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -30989,27 +29138,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dcgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -31018,7 +29151,7 @@ + ac_cv_lib_intl_dcgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -31113,27 +29246,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -31142,7 +29259,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -31289,27 +29406,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -31318,7 +29419,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -31379,7 +29480,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -31467,27 +29568,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -31559,27 +29644,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -31588,7 +29657,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -31609,7 +29678,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo +@@ -31771,7 +29840,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -32237,7 +30306,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -32246,10 +30316,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -32473,19 +30546,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -32501,7 +30583,7 @@ + # values after options handling. + ac_log=" + This file was extended by gnome-utils $as_me 2.18.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -32530,7 +30612,7 @@ + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -32554,7 +30636,7 @@ + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + gnome-utils config.status 2.18.1 +-configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + + Copyright (C) 2006 Free Software Foundation, Inc. --- gnome-utils-2.18.1.orig/debian/pixmaps/gsearchtool.xpm +++ gnome-utils-2.18.1/debian/pixmaps/gsearchtool.xpm @@ -0,0 +1,130 @@ +/* XPM */ +static char *gsearchtool.xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 92 1", +" c #001700170017", +". c #080708070809", +"X c #081407A20714", +"o c #0C030C000BFB", +"O c #005B0632119B", +"+ c #1462145F1459", +"@ c #1C261C051BCF", +"# c #2276208E1E97", +"$ c #245C244C2429", +"% c #28702820277F", +"& c #2C792C792C74", +"* c #315D2DB22C64", +"= c #343F33B733AC", +"- c #3A91373335BC", +"; c #3BA43B8C3B90", +": c #44EF3EF33D86", +"> c #445B40C73DA9", +", c #4AFD427C3EB5", +"< c #448C445F4404", +"1 c #4A8447AD46D6", +"2 c #497648D04828", +"3 c #4C194BF64BD0", +"4 c #538E49F3431D", +"5 c #5AA951B64A22", +"6 c #551A550754E5", +"7 c #5CE05CEB5C68", +"8 c #5FD360526111", +"9 c #62ED5A0255AA", +"0 c #651A62925D94", +"q c #6BDB6263597D", +"w c #64D664AF6440", +"e c #6D3E6D216CE0", +"r c #74CD6CC2631C", +"t c #72426ED76BA6", +"y c #79DB6E54638D", +"u c #77CA712C6796", +"i c #755F70CA6D89", +"p c #7AE1761B6D0B", +"a c #73A27357732E", +"s c #7B1D776B73BF", +"d c #7AD979BB7752", +"f c #7D8D7CBD7C64", +"g c #81AC7172632E", +"h c #854777B569F9", +"j c #808778AE6E3C", +"k c #83367FC27AC2", +"l c #852A816B7EFD", +"z c #8CDD88828010", +"x c #91A9831975B3", +"c c #A56893147E03", +"v c #861E85AA8552", +"b c #89BF881A8666", +"n c #8E6E8ABB84A3", +"m c #8E0F8D5C8C58", +"M c #97598E2680C1", +"N c #93168ECD8BAC", +"B c #987995088C0E", +"V c #9A1F9221886B", +"C c #9630962395FA", +"Z c #978A985998E2", +"A c #99BB96D09569", +"S c #9B749B3A9B17", +"D c #A55F952F8168", +"F c #A8A99BD88E6B", +"G c #AC28A1B38EF9", +"H c #AA69A140971B", +"J c #BC0DAB14933D", +"K c #A599A545A53C", +"L c #A530A7D8A92C", +"P c #A90AA6D7A48F", +"I c #AB3BAB3BAB3B", +"U c #B27CAC89A381", +"Y c #B1D7B16BB049", +"T c #B9F2B16BA80E", +"R c #BD45B67CAB24", +"E c #B4D4B495B443", +"W c #B9E3B895B894", +"Q c #BBE2BBDCBBCC", +"! c #C6D7B37898F0", +"~ c #CD1CBAD5A0BF", +"^ c #CB17C3FAB7FD", +"/ c #D229C78BB960", +"( c #C4E6C356C302", +") c #CCBACCA0CC68", +"_ c #DEF6D420C4EB", +"` c #E0B5DAEDCBB1", +"' c #DD44DCF5DC55", +"] c #E7C3E796E756", +"[ c #E9F0E9A7E9AC", +"{ c #F562F569F53A", +"} c #FEECFED9FECC", +"| c None", +/* pixels */ +"||||||||||||||||||||||||||||||||", +"|||||||||||||||||||| |", +"||||||||||||||||||| ", +"|||||||||||||||| ", +"||||||||||||||| ", +"|||QLLE||||||| ", +"|QISvaw;;||| ", +"WSbvke2--:| ", +"EdaCSCNy,,* X ", +"SemZZCKTh4-X o@=$o |", +"tfSZZSSEUy5# +3Ca>+ ||", +"pbSZSSSKEVq,o %b'{)d@ ||", +"svSSZSSKPPxg-7)}}}{a+ |||", +"tvSZZZSLKAFcH[}}}}Q& ||||", +"pBSCCZSPKfM!_}}}}]3X |||||", +"HNZvvbSLKwr~_}}}{vo |||||||", +"`BvdaavKPw0J^}}{Z@ ||||||||", +"^p8e678bPfucT}[C$ ||||||", +"Su26876wmSnlvEa$ |||||", +"Bf2<8078aSzlbw%. ||||", +"|l6-6ww8wvltd6%$@+ |||", +"|Ka2:6efefs063=--%+. ||", +"||C9:;6fva087332<<=#+ ||", +"||||2;3ilw6|||0w62<=%+o |", +"|||||||||||||||Z7633<=$+X |", +"|||||||||||||||||ew663-%@X ", +"||||||||||||||||||ve863<&#o ", +"|||||||||||||||||||8fe63>=%+. ", +"||||||||||||||||||||(lw6<23;@ ", +"||||||||||||||||||||||f86<62@ ", +"||||||||||||||||||||||||e2--@ |", +"||||||||||||||||||||||||||||||||" +}; --- gnome-utils-2.18.1.orig/debian/pixmaps/gfloppy.xpm +++ gnome-utils-2.18.1/debian/pixmaps/gfloppy.xpm @@ -0,0 +1,202 @@ +/* XPM */ +static char *gfloppy.xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 164 2", +" c #001400150015", +". c #047907B50869", +"X c #078109DF0A49", +"o c #0C130DC30E0D", +"O c #0D790FFB107D", +"+ c #0D02122512DF", +"@ c #12F315DE16AF", +"# c #1090175C18B0", +"$ c #14221AC81BA0", +"% c #1B681C531CA6", +"& c #16032111228C", +"* c #1D88244925B8", +"= c #1ADC27F928EF", +"- c #1D1A2BA42D9A", +"; c #1E482E333116", +": c #244F261C265F", +"> c #26322B712CB0", +", c #2A4D2CAB2D36", +"< c #20702FB43156", +"1 c #22353137332A", +"2 c #255435E738B6", +"3 c #2D553339344B", +"4 c #2A54382A3A99", +"5 c #2AF43B573DB1", +"6 c #3168360F378D", +"7 c #3C173B3C3B19", +"8 c #29FB3DF340F3", +"9 c #3FD83FD84071", +"0 c #381741794436", +"q c #33AF46F14A93", +"w c #31F94B6C4F97", +"e c #3C1247514A6D", +"r c #34144F7554D2", +"t c #36A1516155D8", +"y c #3A5256CF5BA5", +"u c #3DA159F55DBD", +"i c #44384624469F", +"p c #493D4985494F", +"a c #472A51BF5494", +"s c #452A581A5BF1", +"d c #488952AC561E", +"f c #4EA25BDB5D93", +"g c #53A2542251BB", +"h c #518F5F055F2E", +"j c #5C425CD05BE0", +"k c #40C55E746310", +"l c #43CC61C3669D", +"z c #41DF64356A86", +"x c #4B4A6E357350", +"c c #4A7370F677D2", +"v c #4D9474107B5A", +"b c #521D66DB6A6C", +"n c #50BF6A676E17", +"m c #5BCB635F662D", +"M c #5F726C846E6F", +"N c #51076F2874CE", +"B c #51F5782D7E6B", +"V c #50F478EB801C", +"C c #5EE374C77916", +"Z c #6363663E66CC", +"A c #644F72807504", +"S c #6BB773EC7667", +"D c #55C27D878404", +"F c #5A057F8B84F5", +"G c #67F77F438466", +"H c #6E877E0680B5", +"J c #5C5082048780", +"K c #5DB983FD89D9", +"L c #5D838D9D95A2", +"P c #646B80D685CC", +"I c #61D085DA8BFD", +"U c #65348A708E78", +"Y c #69028A7D8F82", +"T c #67928C14920A", +"R c #6BC48E57932C", +"E c #6F4E91E995C5", +"W c #747E81518387", +"Q c #7866879D8CEA", +"! c #7DD58CDF8B5A", +"~ c #76B58B169107", +"^ c #7258927896C6", +"/ c #754395639A11", +"( c #775798B89C97", +") c #7B3F95699B1D", +"_ c #7C879BAA9F3C", +"` c #7F949E4AA2FF", +"' c #852285868334", +"] c #810889BD8727", +"[ c #8955891A84FC", +"{ c #8C2C8C2A890C", +"} c #85C58E789141", +"| c #83B797019B78", +" . c #827F9F319E97", +".. c #8B9E921D93B1", +"X. c #8D35994E9C20", +"o. c #90B199C29718", +"O. c #96CB9D0F9C75", +"+. c #9CF49DF59930", +"@. c #98259FA3A0BE", +"#. c #84ABA1A5A5FE", +"$. c #8EFCA18DA6C8", +"%. c #8BD8A5B9AAC9", +"&. c #8FDDAC06AED5", +"*. c #96FAA1EDA42C", +"=. c #96FFAA69AD4B", +"-. c #9E26A4E9A759", +";. c #9C8FA81FAB63", +":. c #9A71AB31AEAF", +">. c #957FAD7EB290", +",. c #9CA0B36DB6BB", +"<. c #A5ADA774A3C1", +"1. c #A18CA9B2AB5D", +"2. c #AB1EABECA622", +"3. c #AF54AF04AA3C", +"4. c #ABA0B181AB40", +"5. c #A5ACB448B786", +"6. c #A3F5B62FBA55", +"7. c #A6DBBC8BBEAD", +"8. c #A91AB4B1B702", +"9. c #ABCEB9E8BD38", +"0. c #B2C1B2BCABDA", +"q. c #B4F5B67AB450", +"w. c #B480BAFDB704", +"e. c #B388BAB3BCE0", +"r. c #BEC7BEBCB6BF", +"t. c #BEE1C03BBC60", +"y. c #AB6ABF42C267", +"u. c #BC10BE02C157", +"i. c #BE2FC2FCBAA2", +"p. c #B046C27BC5E7", +"a. c #B0D2C1C0C5C4", +"s. c #B56BC727C91E", +"d. c #BC87CC84CEC9", +"f. c #C0D7BFD3C10F", +"g. c #C321C3DBBC67", +"h. c #C476C433C567", +"j. c #C8A0C7BDC987", +"k. c #C979C882C889", +"l. c #CAFCC8B2C9A9", +"z. c #CAF6CA2AC505", +"x. c #CE18CC86CCA6", +"c. c #C4C6D1DAD38C", +"v. c #CECAD3BBD399", +"b. c #CE8FD998DA89", +"n. c #D1BCD238CD43", +"m. c #D879D956CFE3", +"M. c #D37BD8ECD855", +"N. c #D3E9DE92DFA9", +"B. c #DB34DB34D657", +"V. c #DCECDE84DCDF", +"C. c #DE15E5D5E731", +"Z. c #EE99E129DFAC", +"A. c #E89DE804E652", +"S. c #E64DEC4DECEF", +"D. c #E9DCE9E3E753", +"F. c #EE71EEC6ED11", +"G. c #EEA5F2DEF318", +"H. c #F8E7EAE2E955", +"J. c #F1C4F1C3F022", +"K. c #F479F51DF447", +"L. c #F8F9F8EFF861", +"P. c #F93EF93EF8DC", +"I. c #FD93FDA4FD83", +"U. c None", +/* pixels */ +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U. % . 7 3 = 1 < U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U. % i > 7 p g [ ! J s > U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.o p @ % 9 9 Z [ +.3.r.g.w.Y c 4 U.U.U.U.U.U.U.U.", +"U.U.U.U.U.- & @ p j j { 0.q.g.g.n.B.D.J.,.J 5 o U.U.U.U.U.U.U.U.", +"U.U.U.U. 3 f n ! 3.r.g.g.n.D.J.L.I.K.K.b.T k 4 U.U.U.U.U.U.U.U.", +"U.U.U.U. i 9.` .i.n.Z.J.I.I.P.J.F.J.P.L.&.x t u U.U.U.U.U.U.U.", +"U.U.U.U.U.> ;.,.E c.P.I.I.G.F.F.L.P.I.G.L.d.J q + U.U.U.U.U.U.U.", +"U.U.U.U.U. m a.E ,.P.G.G.K.I.I.P.J.F.J.I.K.` l < U.U.U.U.U.U.", +"U.U.U.U.U. , ;.%.E C.P.I.I.L.F.F.J.I.I.I.I.d.D 8 + U.U.U.U.U.U.", +"U.U.U.U.U.U.o S 6.T i.I.P.F.F.P.I.I.I.I.I.I.C.R k $ U.U.U.U.U.", +"U.U.U.U.U.U. 6 6.( ( C.I.P.I.I.I.I.I.I.G.c.%.K V 2 U.U.U.U.U.", +"U.U.U.U.U.U. $ W >.U s.I.I.I.I.I.I.C.y.E K D D D y o U.U.U.U.U.", +"U.U.U.U.U.U.U. d ,.E #.P.I.I.K.c.&.R D F K ) G D c = U.U.U.U.", +"U.U.U.U.U.U.U. : | #.U d.N.p./ K D K _ ;.e.j.} c D w + U.U.U.U.", +"U.U.U.U.U.U.U. m >.T R T F F T =.e.M.x.j.x.q.x D k & U.U.U.", +"U.U.U.U.U.U.U.U. > @./ F D T 8.v.1.C >.h.x.x.f.H c D 8 . U.U.U.", +"U.U.U.U.U.U.U.U.U.+ C %.K D R v.D.W c ~ h.x.j.h.O.k r ; o U.U.U.", +"U.U.U.U.U.U.U.U.U. 0 %.T D F ,.F.*.x F e.x.h.w.! h ; . U.U.U.U.", +"U.U.U.U.U.U.U.U.U. @ Q #.F D T N.x.n D ;.u...M M O.3.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.. d %.I D F 8.V.*.| } A A o.3.2.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U. * ~ ) T F ) e.O.A A X.q.t.i.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.X < e A G n s b -.t.h.t.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U. @ q = @ 4 8.x.l.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.c y 7 H.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U." +}; --- gnome-utils-2.18.1.orig/debian/pixmaps/baobab.xpm +++ gnome-utils-2.18.1/debian/pixmaps/baobab.xpm @@ -0,0 +1,263 @@ +/* XPM */ +static char *baobab[] = { +/* columns rows colors chars-per-pixel */ +"32 28 229 2", +" c #004900450049", +". c #000014660000", +"X c #00001F840000", +"o c #1C6E1C631C6E", +"O c #049423950340", +"+ c #02872F230000", +"@ c #00623F6F0007", +"# c #0C85400506A3", +"$ c #14FD38000000", +"% c #12A83A860001", +"& c #1B0B365F000C", +"* c #18A838C50003", +"= c #285E1424027E", +"- c #280F32D801E2", +"; c #26963B590D74", +": c #29C231C90000", +"> c #244D243D243D", +", c #2E772E9A2E36", +"< c #323D3B5326BC", +"1 c #008B437B006A", +"2 c #000F4B360011", +"3 c #0C3445590BD8", +"4 c #0CFE4B3E0CE6", +"5 c #000353820000", +"6 c #00005C5E0000", +"7 c #12BC41C30000", +"8 c #10F146F91094", +"9 c #155A4DA0150D", +"0 c #19AF4F7D1997", +"q c #161E511E1617", +"w c #000062750000", +"e c #00006D390000", +"r c #22AF522C1F1B", +"t c #308B42C71CD7", +"y c #2FE04EF2203D", +"u c #29E657D22979", +"i c #30794B6322C0", +"p c #3152506721FC", +"a c #31B95E2B3177", +"s c #2E5F624B2F99", +"d c #37F161B937F5", +"f c #3E9865783E83", +"g c #42EE25000003", +"h c #41F229FD02EC", +"j c #457629DA0E29", +"k c #4B4221C60172", +"l c #5ACD238C06D7", +"z c #5CE635292474", +"x c #7F82402C3A66", +"c c #43F14C4D22E4", +"v c #405150952DFE", +"b c #48B253483C38", +"n c #55FC54883E2A", +"m c #58DE6C723DA9", +"M c #697548862729", +"N c #61584DCE3CE8", +"B c #452D45844531", +"V c #4AF64A714A46", +"C c #45615B3B4403", +"Z c #4ED9519A5194", +"A c #52D74F254C79", +"S c #552D567A4FC6", +"D c #5C525B864D1F", +"F c #5226524151E9", +"G c #54ED5885580B", +"H c #5C7E5B3B5C93", +"J c #5DAD604D6835", +"K c #475E6DBA4764", +"L c #4A6870884A70", +"P c #578478B7578C", +"I c #4E2461D96D96", +"U c #40CF65187AD2", +"Y c #45D06EF17C80", +"T c #66844B1358B2", +"R c #65E553AE4668", +"E c #6C2050E84FAA", +"W c #7EEA5157514B", +"Q c #6564788C5E0D", +"! c #629864CB622F", +"~ c #6AE66C1F6B78", +"^ c #6E72726E71E1", +"/ c #791F6939735B", +"( c #726570D17041", +") c #73DF75A77583", +"_ c #7C0E7FFC7A59", +"` c #1476729FA6F0", +"' c #1B4F788CAD20", +"] c #2541777A9675", +"[ c #296A7C4D9B64", +"{ c #21AC7428A25B", +"} c #23F17EB4AFB3", +"| c #632584BA3B30", +" . c #6D89888D6D8F", +".. c #74A68CC074A2", +"X. c #7AB986D97A96", +"o. c #76C791D476C7", +"O. c #40368FDDBA49", +"+. c #6114A08BB7CC", +"@. c #870039E637E7", +"#. c #99FF3DC43D1A", +"$. c #B8C425571C93", +"%. c #A43A3B5B302A", +"&. c #B39438D63936", +"*. c #AB7944BB3480", +"=. c #B54944763A17", +"-. c #865149595B4E", +";. c #88216246544D", +":. c #856064586350", +">. c #8D8E63006376", +",. c #84F17B987B1D", +"<. c #9CDF6AB36A5E", +"1. c #A3F4495247FC", +"2. c #AA7D542F52A2", +"3. c #B883440F4D8F", +"4. c #B2F550FD502C", +"5. c #B6EF553D551E", +"6. c #BE6553CD53E9", +"7. c #AA20792A77DE", +"8. c #C52331263125", +"9. c #C3F539523966", +"0. c #C9B632573257", +"q. c #D2E834BD3595", +"w. c #D45D3E7F39DC", +"e. c #DCFB33BE345B", +"r. c #EFEF2743271A", +"t. c #EF38274A2916", +"y. c #EE532B1E2A67", +"u. c #E5ED31DE31BA", +"i. c #E1F23FEB3FED", +"p. c #EC6134BE34A4", +"a. c #D51639D341AB", +"s. c #D4B33FFF4D18", +"d. c #E9AC3FEA40D5", +"f. c #EDA643402A9A", +"g. c #CF5150E45D19", +"h. c #DF93542F54E9", +"j. c #C30969B967BB", +"k. c #CD716AE56A23", +"l. c #C87E7CBA7CA5", +"z. c #CB097AAE7AB6", +"x. c #EAF84D5C4DDE", +"c. c #F3E746EF46EF", +"v. c #F5754D564C0C", +"b. c #F49A7016454A", +"n. c #8E827764900D", +"m. c #97A795B7262A", +"M. c #A365A3CD0F86", +"N. c #A4C9A51F1029", +"B. c #AAE1A295156E", +"V. c #B6E9AD710000", +"C. c #B8EDB01F0000", +"Z. c #B4A8ADF31365", +"A. c #BB07B3BF000A", +"S. c #B8F38DD54179", +"D. c #BED6C7F35B9E", +"F. c #C983C0330A82", +"G. c #DDCE91B154BD", +"H. c #E8D58CBE4156", +"J. c #F36C9E615B35", +"K. c #EAA5A9D241D5", +"L. c #F3E3AA30451A", +"P. c #F111BE995BFF", +"I. c #C792C1090000", +"U. c #D75FCC6B1AF4", +"Y. c #E02CD8C61E53", +"T. c #D030C4D527C3", +"R. c #E76CDC6C1AE2", +"E. c #E4B1D67F3DAA", +"W. c #F0F0E9163FFB", +"Q. c #D7F8CDE04804", +"!. c #DFD7DA704D87", +"~. c #FE86EEE44E0F", +"^. c #EE34E77E647E", +"/. c #EBF0E9BC6E78", +"(. c #EF1BEAC17A82", +"). c #F30BE4377DEB", +"_. c #824C821D821B", +"`. c #8E9D8C858A91", +"'. c #8D1D90189097", +"]. c #845B9A928462", +"[. c #89079C1C890C", +"{. c #94DB84B78ECB", +"}. c #95A38BDE821B", +"|. c #96968A188F1A", +" X c #911493A78EAB", +".X c #937E9A748E06", +"XX c #9639993A9296", +"oX c #996F990297D2", +"OX c #9DC19D739CFD", +"+X c #92588B24A666", +"@X c #91939AC6B9ED", +"#X c #8A45A20A8A47", +"$X c #981EA2F28BCE", +"%X c #9B65ABFA8E80", +"&X c #9513A8119492", +"*X c #96F0ABAF96E4", +"=X c #9C5EAECD9C59", +"-X c #9EB7B19E9EC5", +";X c #9E26B8E0B7D0", +":X c #B66A99AC99B5", +">X c #A4ECA629A633", +",X c #AD47AD9AAD2A", +"XgXhXhXhXhXhXhXgXhXgXgXdXdXpX[.0 @ @ @ @ @ @ @ @ @ 2 w ", +"2 1 @ K 4XfXgXgXhXhXhXhXgXgXgXgXdXdXaX=Xu @ @ @ @ @ @ @ @ @ 2 5 ", +"2 1 # P yXfXgXgXgXgXhXgXgXgXgXfXdXsXsX4XK @ @ @ @ @ @ @ @ @ @ 2 ", +"2 @ 3 ..pXfXfXfXgXgXgXgXgXgXdXdXsXsXsXyXQ # 1 1 1 @ @ @ @ @ @ 1 ", +"2 @ 9 &XsXfXgXgXgXgXgXgXdXgXdXdXdXsXsXpX}.< O 7 * @ @ @ @ @ @ 2 ", +"2 1 a X X.X%X XOX5X5X5X5X,X:X7Xl.z.j.%.$.p.x.h.*.M i u a 2 ", +"jXF _ OXOX_.F m | b J |.OXOX,.5.d.y.r.t.t.t.y.y.t.r.y.u.w.=.:.) ", +"jXH {.,X3X>XXX$X%X.XOX3X3X1X7.p.t.t.y.t.t.f.H.G.k.g.s.a.u.u.6.>X", +"jXB ) OX1X2X,X2X3X3X3X4X3X1X<.e.u.c.c.v.b.P.(./.0X;X@X+Xn.3.4.^ ", +"jX> , B H F F F V V B B B F -.9.0.e.c.J.).wXqX^.!.D.+.O.} -.1.G ", +"jX B ;.9.8.0.0.K.W.Y.U.F.V.M.] ` ` -.2.) ", +"jX . X C R @.&.q.e.L.~.R.F.A.V.N.[ ' { T E ~ ", +"jXjXjXjXjXjXjXjXjXjX@ 1 @ $ g j z x #.S.Q.E.T.Z.B.m.Y U I J V H ", +"jXjXjXjXjXjXjXjXjX@ @ @ @ $ & : - ; t y y t v n n D ! ( `.oXjXjX", +"jXjXjXjXjXjXjXjXjX@ @ @ @ @ @ @ @ @ @ @ @ 2 @ jXjXjXjXjXjXjXjXjX" +}; --- gnome-utils-2.18.1.orig/debian/pixmaps/gdict.xpm +++ gnome-utils-2.18.1/debian/pixmaps/gdict.xpm @@ -0,0 +1,243 @@ +/* XPM */ +static char *gdict.xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 205 2", +" c #00220016000D", +". c #0724082107AD", +"X c #0B1B01470155", +"o c #0E8009EF0A59", +"O c #000011810347", +"+ c #000019AE04D0", +"@ c #15860471032A", +"# c #12840B7C0B73", +"$ c #1C5A020201A4", +"% c #1E9E09790609", +"& c #1AB10DD10DD2", +"* c #1514128F1244", +"= c #1C7A147414CE", +"- c #213C0E060EF5", +"; c #284411780F9D", +": c #2407153B16E5", +"> c #24B019241A5E", +", c #29A51A761AE5", +"< c #31B30238030A", +"1 c #38EF025A0373", +"2 c #3B4F04830817", +"3 c #2DFF1F4B2089", +"4 c #38821E612049", +"5 c #2E0B29E329E7", +"6 c #3B4F220D2327", +"7 c #3F9B25522854", +"8 c #3CF72F72266A", +"9 c #3F8F284C28D5", +"0 c #36EA343B3491", +"q c #3BB2336C336E", +"w c #424E03B00534", +"e c #4A2C0FE01268", +"r c #52C8068B0A0F", +"t c #557B09490B87", +"y c #5E4E061F0741", +"u c #52EC19951BFC", +"i c #41B42C4B2CDF", +"p c #4AC72C072BFE", +"a c #4AEA37EA3AA0", +"s c #4C6B3F4E3E87", +"d c #544A27312AB3", +"f c #549C2A5E2E17", +"g c #5E7C24C32527", +"h c #5CED2EA13134", +"j c #548F3EA83FFB", +"k c #59AB32063341", +"l c #654B09000846", +"z c #6E300A6A0C9C", +"x c #761D0ACC0DB5", +"c c #78950BA40CA0", +"v c #75EF0DFB10E6", +"b c #7B1E0E5012E8", +"n c #77D813FE143A", +"m c #73E018D6188F", +"M c #7CBD12CF1629", +"N c #7E3E16881BB9", +"B c #80321AA620B1", +"V c #608D2CA02D4C", +"C c #679134BB3A9B", +"Z c #6AB93504358B", +"A c #727F2F1B2FE9", +"S c #714F34253873", +"D c #736639153D53", +"F c #7B1B340D35C9", +"G c #7FB33A0C3D02", +"H c #69DC3D64426E", +"J c #43AD43D2420D", +"K c #4BD54A994A90", +"L c #4F24530E5109", +"P c #5275444044E6", +"I c #521F4FCF4F63", +"U c #5FD94261424B", +"Y c #5BEC4EB94EC9", +"T c #5C9B4F67507D", +"R c #5A5355334CBE", +"E c #56FD572E55A3", +"W c #577459F857FD", +"Q c #5D88554B5598", +"! c #5FF6604F5F6E", +"~ c #5FD5642C6188", +"^ c #792D45F74857", +"/ c #77C956A159DF", +"( c #6106609A601B", +") c #648A6507645B", +"_ c #6AA86B9E6AF4", +"` c #72EA6D1E6CD8", +"' c #711070717021", +"] c #742C74BC7470", +"[ c #7C1E7CB87C49", +"{ c #823115E81BAC", +"} c #836818D81D09", +"| c #8A0C18BB1E61", +" . c #84741BB4222E", +".. c #8D331BEE22C9", +"X. c #92701E1E2574", +"o. c #84CA20C727D8", +"O. c #870A22172941", +"+. c #835A2BB62C00", +"@. c #8F0721C427B9", +"#. c #8CA124B22C52", +"$. c #89202838262F", +"%. c #811B2FFE35A7", +"&. c #86D037F03D86", +"*. c #80C539B63BAD", +"=. c #89ED33E136E1", +"-. c #927A205B2667", +";. c #949725352B1A", +":. c #96182A0B2E3E", +">. c #99712DC42FEC", +",. c #959E2ACD335B", +"<. c #98512F8F39AC", +"1. c #9A0C2E7334C4", +"2. c #971F3AEA402C", +"3. c #9BB331EA35B6", +"4. c #9E5635363B49", +"5. c #9E993A943EDF", +"6. c #A20835BD3985", +"7. c #AF5C3AE4401C", +"8. c #84AE3E56450F", +"9. c #9EC9360940F2", +"0. c #9DA03CA94514", +"q. c #A3703BF94452", +"w. c #A62A3E4448B9", +"e. c #A9E33D6D431C", +"r. c #AC123FF549FC", +"t. c #8C724EC8550F", +"y. c #8C2850D85782", +"u. c #914E40554520", +"i. c #9C655D5F5FB5", +"p. c #9B305CDE63C2", +"a. c #82386EA16EDC", +"s. c #A023634464E5", +"d. c #9FF1609368D1", +"f. c #A7DC44984C1A", +"g. c #B05F41ED48B7", +"h. c #A34356F15E57", +"j. c #AF355A4658BE", +"k. c #B43545774EFD", +"l. c #B1694D7A5048", +"z. c #B26A47585153", +"x. c #B38B4ACD5372", +"c. c #BC4D4F095AF1", +"v. c #BE5757695E3D", +"b. c #C0485CC75F3E", +"n. c #A4E85CDC65DD", +"m. c #A76A5E516A77", +"M. c #BB965F2165C8", +"N. c #A82B65F36D04", +"B. c #A6C36A936D08", +"V. c #AC0F67746F12", +"C. c #AF9A6B736D30", +"Z. c #A46378DC7D6C", +"A. c #B9466AB96CA0", +"S. c #B47C6E6D751A", +"D. c #B30D756C7B4E", +"F. c #BF657D337EE9", +"G. c #C5855D0966BD", +"H. c #C4B46CC16D66", +"J. c #CBA76B857879", +"K. c #C6F6738D7574", +"L. c #C418708E79D2", +"P. c #CCB975C67B36", +"I. c #CCDD7A897E86", +"U. c #D1A56A167AE7", +"Y. c #CE977F45856E", +"T. c #D42C7EF785A0", +"R. c #D4E57DFA8D6E", +"E. c #CEAC80848006", +"W. c #836F849A834A", +"Q. c #8D018E788DD8", +"!. c #8E7090C58F52", +"~. c #998D8D0F8C4C", +"^. c #90C991A79153", +"/. c #9A5F9B7B9B1D", +"(. c #A90781728159", +"). c #A0DFA02B9FBC", +"_. c #B4BC83218504", +"`. c #A3FAA52FA4A3", +"'. c #AC8EAD63ACAC", +"]. c #B73DAD01ACE9", +"[. c #B1B4B0CFB06E", +"{. c #B218B27CB266", +"}. c #B886B96BB957", +"|. c #BF04BF5BBF33", +" X c #CD68840684B1", +".X c #D00284E28C12", +"XX c #CFC1899A8ABD", +"oX c #D09395239288", +"OX c #CE2A9C29974F", +"+X c #D496836185E6", +"@X c #D4AA85648B1C", +"#X c #D3758A0F8BF5", +"$X c #D91687348D06", +"%X c #D2F385DF93BC", +"&X c #D29E87B09B84", +"*X c #D29F8BA19337", +"=X c #D9A98FB297A5", +"-X c #D28490E08849", +";X c #D2CF93AE976D", +":X c #D42193C59CFF", +">X c #D35D99F29C51", +",X c #D9B4937B99A9", +" i 9 p H ^ 8.G 0.4.5.3.X...N n t $ 2X2X2X2X2X2X2X2X", +"* a._.A.j.f.g.w.6.3.:.;.X... . .N M z 2 X 2X2X2X2X2X2X", +"= Z..;.;.#. . .N M b r $ 2X2X2X2X", +"= N.@X.:.-.X... .N M b v x r $ ", +" 9 D.*X#X X;X.;.X.X. . .} N v v x y < X ", +" 9 S.*X#X+X+X>XXXH.l.q.4.3.<.,.#.#.O.} { b c z v m u - ", +" 6 S.$X#X XI.OXOXH.x.w.5.4.<.,.#. .| } } $.+.F G f - ", +" 6 C.#X#XXXY.oX>XL.c.w.1.;.:.:.;.>.2.F A C a Y Q . ", +"2X 4 C.+X-X XY.#X;XY.M.r.5.6.u.G g d j Q ' Q.).I ", +"2X2X , s.+X#XY.P.I.oX Xi.H f 6 q I ( ] W.!./.'._ . ", +"2X2X2X > p.@XR.T.P.K.F.U 5 0 K W ) [ W.^.`.'.}.[.0 ", +"2X2X2X2X > p.@X@X.XP.N.P J K E ~ [ Q.).`.[.|.].(.Z X ", +"2X2X2X2X2X : p.@X%XT.p.s I ) _ [ Q./.`.'.~./ h r 1 X ", +"2X2X2X2X2X2X & y.R.&Xn.P ) ' [ W.Q.W._ R ; $ $ X ", +"2X2X2X2X2X2X2X & t.%Xm.Y ' [ W._ J 8 @ $ X ", +"2X2X2X2X2X2X2X2X & t.i.Y ~ J * # % $ X ", +"2X2X2X2X2X2X2X2X2X & k , . X X 2X", +"2X2X2X2X2X2X2X2X2X2X X X 2X2X2X", +"2X2X2X2X2X2X2X2X2X2X2X . 2X2X2X2X", +"2X2X2X2X2X2X2X2X2X2X2X2X . + O 2X 2X2X2X2X", +"2X2X2X2X2X2X2X2X2X2X2X2X2X 2X2X 2X2X2X2X", +"2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X 2X2X2X2X2X", +"2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X 2X2X2X2X2X" +}; --- gnome-utils-2.18.1.orig/debian/pixmaps/gnome-system-log.xpm +++ gnome-utils-2.18.1/debian/pixmaps/gnome-system-log.xpm @@ -0,0 +1,283 @@ +/* XPM */ +static char *gnome-system-log.xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 245 2", +" c black", +". c #014100DB0051", +"X c #01D801300046", +"o c #026501AB00A6", +"O c #02F2020900B9", +"+ c #0301026D0116", +"@ c #0420029B00EC", +"# c #042202BE0174", +"$ c #04A603230129", +"% c #0584039A015B", +"& c #049C03C2024F", +"* c #057C041001D4", +"= c #0610045C01EA", +"- c #06C204F2027F", +"; c #065805100252", +": c #07F105FB02E0", +"> c #09B306840278", +", c #096F06D70382", +"< c #090A071C0324", +"1 c #0A9106B701F2", +"2 c #0A98071F02CC", +"3 c #0B6406EB027E", +"4 c #0A6A07CF0468", +"5 c #0DB00871024C", +"6 c #0C1408BF0483", +"7 c #0C80098004C0", +"8 c #0D5909DB0536", +"9 c #0ED80ADD04C0", +"0 c #12A20C100412", +"q c #136A0CF705B6", +"w c #138C0DF10762", +"e c #13490E900674", +"r c #16B40FA405C7", +"t c #18060F5605EF", +"y c #13C00EDE0868", +"u c #145D0F1708A4", +"i c #18591101071A", +"p c #19DC1161067C", +"a c #1CA0123B0524", +"s c #1E0615560B4E", +"d c #226B156B05AD", +"f c #21F5170809D8", +"g c #21A818990AF2", +"h c #212518850B68", +"j c #22CD18770A50", +"k c #22C318820C65", +"l c #226D1B1F0D14", +"z c #29EF1F2C0E47", +"x c #2ADD1E5C10AC", +"c c #32961FC009C9", +"v c #329D1F8A0AEF", +"b c #35451F8808B6", +"n c #2B2920E00F8F", +"m c #301520430BF0", +"M c #2B1E233D114D", +"N c #3057218F0D23", +"B c #3383222D0C15", +"V c #36C5229A0CD4", +"C c #3D6524520A85", +"Z c #3EF527AF0B99", +"A c #3C7B28370EE3", +"S c #3EED28860D47", +"D c #3FA028410C7E", +"F c #3FF328F50D11", +"G c #337B264A1559", +"H c #37DE2567118B", +"J c #31FB289C13CB", +"K c #32EE287113AE", +"L c #368829661404", +"P c #36C42A17171C", +"I c #33F829D81BD5", +"U c #389724DB10EC", +"Y c #3AB42B411986", +"T c #3D992E401AE2", +"R c #3D0C3069180D", +"E c #412A2CEA11AA", +"W c #44732D1411D1", +"Q c #42A9304C15F2", +"! c #460730AF131F", +"~ c #441136B21F4E", +"^ c #46EA3535184E", +"/ c #4E73337412FF", +"( c #4EB23AEE1A27", +") c #506D32410DF0", +"_ c #51C535AC13DC", +"` c #530834F21724", +"' c #55D538CC1697", +"] c #54453BB31DF1", +"[ c #54193EB21C9F", +"{ c #52FB401D1F20", +"} c #56933EAB1AD3", +"| c #4D6D3B74244F", +" . c #50A03EF325BE", +".. c #672F3E181176", +"X. c #67803E361124", +"o. c #5DC0404C191F", +"O. c #53844184214D", +"+. c #55C9455825E1", +"@. c #599143432353", +"#. c #5A6A428627A8", +"$. c #590144BE2179", +"%. c #59AE47D92D44", +"&. c #615B435A1A5C", +"*. c #626540AA1D6A", +"=. c #640A44CC1B5C", +"-. c #630F457A1E85", +";. c #6B6E41A4145C", +":. c #6C03451B17EC", +">. c #6D4744551601", +",. c #6EDD48F71B7F", +"<. c #7021487E1BF4", +"1. c #72BC4C2C1E23", +"2. c #64E545D12100", +"3. c #630D48D422C5", +"4. c #63A248BC22C7", +"5. c #646B4CEF2EA4", +"6. c #686D4798250C", +"7. c #6AE24CBA25AE", +"8. c #6DFD4E0E21B8", +"9. c #69D0515627D2", +"0. c #6FF352B627E4", +"q. c #6CE952F12C0F", +"w. c #6BDC568C36E2", +"e. c #6A0559713052", +"r. c #72BC4E432172", +"t. c #739351C224AD", +"y. c #75EE52872BAA", +"u. c #754657592C09", +"i. c #771E563E2DA8", +"p. c #755459D52FFB", +"a. c #7B0353FB2457", +"s. c #799F57913303", +"d. c #78B859363350", +"f. c #7E035FE43062", +"g. c #7FB35E8B3045", +"h. c #7BAF628B37DF", +"j. c #7FDA624032AF", +"k. c #7EB360903595", +"l. c #98865E9D1F5D", +"z. c #8322587D2290", +"x. c #80EA5EFA2E06", +"c. c #8AED5C31267F", +"v. c #96DF5D662328", +"b. c #951B5FC627A3", +"n. c #994F605925FA", +"m. c #9A78603B248A", +"M. c #834F61BF3120", +"N. c #83C461CE31B5", +"B. c #8507620E36B0", +"V. c #868D63B03AC5", +"C. c #86EA66A93B06", +"Z. c #8F66639036F4", +"A. c #8CF567573BA9", +"S. c #8C03697D38BF", +"D. c #8E8869E43A76", +"F. c #8D546B523C61", +"G. c #93C062F62886", +"H. c #9481632F29D0", +"J. c #97EA65D22ED5", +"K. c #9D8F62FD268E", +"L. c #996366362D6E", +"P. c #9BEE66972D7A", +"I. c #A02566E92B0C", +"U. c #9F4C6BCA2D10", +"Y. c #94AD69463B37", +"T. c #98676BA53850", +"R. c #95BD6DE53D94", +"E. c #9A6C679335B7", +"W. c #9BC4707539A0", +"Q. c #9FA775893E94", +"!. c #A28A6B292D4E", +"~. c #ABAB6C0D24B4", +"^. c #A75D6E9537FF", +"/. c #A350721E3E8B", +"(. c #A424770A3D3F", +"). c #A49179843FBB", +"_. c #AED7740331B0", +"`. c #AE2E754334F0", +"'. c #AA4179013EB8", +"]. c #B0F773C532FA", +"[. c #B1157533379F", +"{. c #B39176C0376B", +"}. c #B2F97ACB3D65", +"|. c #B3307CE93F2A", +" X c #B69F7C173860", +".X c #B8ED7D933DA2", +"XX c #C0977FB338E9", +"oX c #8470680241A0", +"OX c #98A27040435A", +"+X c #940A769D49A8", +"@X c #926879724511", +"#X c #9AF97953459B", +"$X c #9BED7C444CEF", +"%X c #A5D6764D43C0", +"&X c #A6BE7B814347", +"*X c #A6C87EE5476B", +"=X c #B0317CEF4478", +"-X c #A9E07DC84B68", +";X c #B2557AC842DF", +":X c #B4B27C51442D", +">X c #B4B27E6540F1", +",X c #B5087CEA4223", +".>.8.t.i.j.M.M.S.@.: ", +" ~ +X8X#XN.9.[ ! S Z Z C E R Q ^ ( } $.{ h ", +"AX < e.@Xh.+.R K k q 1 : & & & 1 7 i j z J M & ", +"AX + L O.n 7 & : : ", +"AXAX : : ", +"AXAXAXAXAXAXAX ", +"AXAXAXAXAXAXAX ", +"AXAXAXAXAXAXAXAX AXAX AX", +"AXAXAXAXAXAXAXAX AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX", +"AXAXAXAXAXAXAXAXAXAX AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX", +"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX", +"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX", +"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX", +"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX" +}; --- gnome-utils-2.18.1.orig/debian/install +++ gnome-utils-2.18.1/debian/install @@ -0,0 +1 @@ +debian/pixmaps/*.xpm usr/share/pixmaps/ --- gnome-utils-2.18.1.orig/debian/gnome-screenshot.sgml +++ gnome-utils-2.18.1/debian/gnome-screenshot.sgml @@ -0,0 +1,153 @@ +Christian"> + Marillat"> + december 7, 2003"> + 1"> + marillat@debian.org"> + + gnome-screenshot"> + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2001 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + capture screen or window and save the image to a file. + + + + &dhpackage; + + + + + + + + + + DESCRIPTION + + &dhpackage; is a GNOME utility for taking + screenshot of the entire screen or a window, with optional beutifying + border effects. + + gnome-panel-screenshot is the same program. + It is provided for backward compatibility, and is considered + deprecated. + + + + + OPTIONS + + + + , + + + Grab the current active window instead of the entire + screen. + + + + + , + + + Take screenshot after specified delay [in seconds]. + + + + + , + + + Add effect to the outside of the screenshot border. + EFFECT can be shadow + (adding drop shadow), border (adding rectangular + space around the screenshot) or none (no effect). + Default is none. + + + + + , + + + Interactively set options in a dialog. + + + + + , + + + Show summary of options. + + + + + + In addition, the usual GTK+ and GNOME command line options apply. + See the output of --help for details. + + + + + SEE ALSO + + gnome-options(7), gtk-options(7) + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + Updated by Theppitak Karoonboonyanan + thep@linux.thai.net. + + + + + --- gnome-utils-2.18.1.orig/debian/gnome-utils.manpages +++ gnome-utils-2.18.1/debian/gnome-utils.manpages @@ -0,0 +1 @@ +debian/gnome-screenshot.1 --- gnome-utils-2.18.1.orig/debian/rules +++ gnome-utils-2.18.1/debian/rules @@ -0,0 +1,108 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +configure_flags += \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc \ + --libexecdir=\$${prefix}/lib/gnome-utils \ + --enable-ipv6=yes \ + --disable-scrollkeeper \ + --enable-gfloppy \ + --build=$(DEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + configure_flags += --host=$(DEB_HOST_GNU_TYPE) +endif + +config.status: configure + dh_testdir + CFLAGS="$(CFLAGS)" ./configure $(configure_flags) + +build: build-stamp + +build-stamp: config.status + dh_testdir + # Change DTD URL in documentation to the one on the local system, so + # the DTD is not fetched off the network + find -name "*.xml" -print0 | xargs -0 perl -i -pe 's/http:\/\/www.oasis-open.org\/docbook\/xml\/4.1.2\/docbookx.dtd/\/usr\/share\/sgml\/docbook\/dtd\/xml\/4.1.2\/docbookx.dtd/' + $(MAKE) + touch build-stamp + +clean:: + dh_testdir + dh_testroot + rm -f build-stamp + -$(MAKE) distclean + -test -r /usr/share/misc/config.sub && test -r config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && test -r config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + rm -f po/.intltool-merge-cache + rm -f intltool-extract intltool-merge intltool-update + find . -name "*.omf.out" -exec rm -f {} \; + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 $(MAKE) install DESTDIR=$(CURDIR)/debian/gnome-utils prefix=$(DESTDIR)/usr + # Remove scrollkeeper generated files. Re-created in postinst on user's + # system + -rm -rf $(CURDIR)/debian/gnome-utils/usr/var + # drop development files for libgdict + rm -rf debian/gnome-utils/usr/lib/libgdict-1.0.so + rm -rf debian/gnome-utils/usr/lib/libgdict-1.0.la + cd po; intltool-update -p + # Add translation domain to .desktop and .server files + DOMAIN=$$(grep --max-count 1 '^GETTEXT_PACKAGE[[:space:]]*=' $(CURDIR)/po/Makefile | sed 's/^.*=[[:space:]]\([^[:space:]]\)/\1/'); \ + for d in $$(find debian/gnome-utils -type f -name "*.desktop" ); do \ + echo "Adding translation domain $$DOMAIN to $$d..."; \ + echo "X-Ubuntu-Gettext-Domain=$$DOMAIN" >> $$d; \ + done; \ + for d in $$(find debian/gnome-utils -type f -name "*.server" ); do \ + echo "Adding translation domain $$DOMAIN to $$d..."; \ + sed -i "s//= 2.15.90)' + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- gnome-utils-2.18.1.orig/debian/menu +++ gnome-utils-2.18.1/debian/menu @@ -0,0 +1,18 @@ +?package(gnome-utils):needs="X11" section="Apps/Tools" \ + title="Baobab" command="/usr/bin/baobab" \ + icon="/usr/share/pixmaps/baobab.xpm" hints="Gnome" +?package(gnome-utils):needs="X11" section="Apps/Text" \ + title="GNOME Dictionary" command="/usr/bin/gnome-dictionary" \ + icon="/usr/share/pixmaps/gdict.xpm" hints="Gnome" +?package(gnome-utils):needs="X11" section="Apps/System" \ + title="GNOME Floppy Formatter" command="/usr/bin/gfloppy" \ + icon="/usr/share/pixmaps/gfloppy.xpm" hints="Gnome" +?package(gnome-utils):needs="X11" section="Apps/Tools" \ + title="GNOME Search Tool" command="/usr/bin/gnome-search-tool" \ + icon="/usr/share/pixmaps/gsearchtool.xpm" hints="Gnome" +?package(gnome-utils):needs="X11" section="Apps/System" \ + title="GNOME Log Viewer" command="/usr/bin/gnome-system-log" \ + icon="/usr/share/pixmaps/gnome-system-log.xpm" hints="Gnome,Monitoring" +?package(gnome-utils):needs="X11" section="Apps/Tools" \ + title="GNOME Screenshot Tool" command="/usr/bin/gnome-panel-screenshot" \ + hints="Gnome" --- gnome-utils-2.18.1.orig/debian/control +++ gnome-utils-2.18.1/debian/control @@ -0,0 +1,68 @@ +Source: gnome-utils +Section: gnome +Priority: optional +XSBC-Original-Maintainer: Marco Cabizza +Maintainer: Ubuntu Desktop Team +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier +Build-Depends: cdbs, + debhelper (>= 5), + libgnomeui-dev (>= 2.13.2), + libglib2.0-dev (>= 2.10.0-1), + libgtk2.0-dev (>= 2.10.0), + libgnome2-dev (>= 2.13.7), + libgnomevfs2-dev (>= 2.8.4), + libbonoboui2-dev (>= 2.6.1-1), + libglade2-dev (>= 1:2.4.0), + libpanel-applet2-dev (>= 2.13.4), + e2fslibs-dev, + scrollkeeper, + intltool (>= 0.21), + libgnome-desktop-dev (>= 2.9.91), + gnome-pkg-tools (>= 0.10), + libxmu-dev, + libgnomeprint2.2-dev (>= 2.8.0), + libgnomeprintui2.2-dev (>= 2.8.0), + libhal-dev (>= 0.5.5.1-3), + gnome-doc-utils (>= 0.3.2), + libgtop2-dev (>= 2.12.0), + libgnomecanvas2-dev (>= 2.10.2), + autotools-dev, + gconf2, + liblaunchpad-integration-dev +Standards-Version: 3.7.2 + +Package: gnome-utils +Architecture: any +Depends: ${shlibs:Depends}, + scrollkeeper, + ${misc:Depends} +Recommends: gksu +Suggests: yelp, + gcalctool +Provides: gdict, + dict-client +Conflicts: gfloppy, + gdict, + gnome-panel (<< 2.10), + gnome-panel-data (<< 2.10), + baobab +Replaces: gdict, + gnome-admin (<= 1.0.3-2), + gnome-panel (<< 2.9), + gnome-panel-data (<< 2.9), + baobab +Description: GNOME desktop utilities + GNOME is the "GNU Network Object Model Environment". + It is a project to build a complete, user-friendly desktop based + entirely on free software. + . + This package contains the following utilities for the GNOME desktop: + . + - baobab, a disk usage analyser + - gfloppy, a tool for formatting floppy disks + - gnome-dictionary, a program which can look up the definition of words + over the internet (including a panel applet to do the same) + - gnome-search-tool, with which one can find files by name or content + - gnome-system-log, a log viewing application + - gnome-screenshot, a tool to take desktop screenshots and save them into + a file