--- gnome-session-2.27.92.orig/debian/gnome-session-bin.gconf-defaults +++ gnome-session-2.27.92/debian/gnome-session-bin.gconf-defaults @@ -0,0 +1 @@ +/desktop/gnome/session/required_components/windowmanager gnome-wm --- gnome-session-2.27.92.orig/debian/copyright +++ gnome-session-2.27.92/debian/copyright @@ -0,0 +1,52 @@ +This package was debianized by Jim Pick jim@jimpick.com on Sat, 14 Mar +1998 20:12:23 -0800. Taken over by Raphael Hertzog + on Wed, 22 Sep 1999 13:24:34 +0200, and taken +over again by James LewisMoss on October 26, 1999. + +It was downloaded from . + +Upstream Authors: + + Dan Winship + Lucas Rocha + William Jon McCann + + Tom Tromey + Felix Bellaby + Ralph Mor, X Consortium + +Copyright: + + Copyright © 1999-2009 Red Hat, Inc. + Copyright © 1999-2007 Novell, Inc. + Copyright © 2001-2003 George Lebl + Copyright © 2001 Queen of England + Copyright © 2007-2008 William Jon McCann + Copyright © 2006 Ray Strode + Copyright © 2008 Lucas Rocha + Copyright © 2005 Raffaele Sandrini + Copyright © 2006-2007 Vincent Untz + Copyright © 1998 Tom Tromey + Copyright © 1999 Free Software Foundation, Inc. + Copyright © 2003 Sun Microsystems, Inc. + + +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-2'. + --- gnome-session-2.27.92.orig/debian/watch +++ gnome-session-2.27.92/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/gnome-session/([\d\.]+)[024678]/gnome-session-([\d\.]+)\.tar\.gz --- gnome-session-2.27.92.orig/debian/defaults.list +++ gnome-session-2.27.92/debian/defaults.list @@ -0,0 +1,282 @@ +[Default Applications] +application/rtf=abiword.desktop +application/x-abiword=abiword.desktop +text/abiword=abiword.desktop +text/richtext=abiword.desktop +text/rtf=abiword.desktop +x-content/blank-bd=brasero-nautilus.desktop +x-content/blank-dvd=brasero-nautilus.desktop +x-content/blank-cd=brasero-nautilus.desktop +x-content/blank-hddvd=brasero-nautilus.desktop +application/x-devhelp=devhelp.desktop +application/x-dia-diagram=dia.desktop +image/bmp=eog.desktop +image/gif=eog.desktop +image/jpeg=eog.desktop +image/jpg=eog.desktop +image/pjpeg=eog.desktop +image/png=eog.desktop +image/svg+xml=eog.desktop +image/tiff=eog.desktop +image/x-bmp=eog.desktop +image/x-gray=eog.desktop +image/x-icb=eog.desktop +image/x-ico=eog.desktop +image/x-pcx=eog.desktop +image/x-png=eog.desktop +image/x-portable-anymap=eog.desktop +image/x-portable-bitmap=eog.desktop +image/x-portable-graymap=eog.desktop +image/x-portable-pixmap=eog.desktop +image/x-xbitmap=eog.desktop +image/x-xpixmap=eog.desktop +image/vnd.wap.wbmp=eog.desktop +image/g3fax=gimp.desktop +image/x-compressed-xcf=gimp.desktop +image/x-fits=gimp.desktop +image/x-psd=gimp.desktop +image/x-sgi=gimp.desktop +image/x-sun-raster=gimp.desktop +image/x-tga=gimp.desktop +image/x-xcf=gimp.desktop +image/x-xwindowdump=gimp.desktop +application/xhtml+xml=epiphany.desktop +text/html=epiphany.desktop +application/pdf=evince.desktop +application/x-bzpdf=evince.desktop +application/x-gzpdf=evince.desktop +application/postscript=evince.desktop +application/x-bzpostscript=evince.desktop +application/x-gzpostscript=evince.desktop +image/x-eps=evince.desktop +image/x-bzeps=evince.desktop +image/x-gzeps=evince.desktop +application/x-dvi=evince.desktop +application/x-bzdvi=evince.desktop +application/x-gzdvi=evince.desktop +image/vnd.djvu=evince.desktop +application/x-cbr=evince.desktop +application/x-cbz=evince.desktop +application/x-7z-compressed=file-roller.desktop +application/x-ar=file-roller.desktop +application/x-arj=file-roller.desktop +application/x-bzip=file-roller.desktop +application/x-bzip-compressed-tar=file-roller.desktop +application/x-cd-image=file-roller.desktop +application/x-compress=file-roller.desktop +application/x-compressed-tar=file-roller.desktop +application/x-cpio=file-roller.desktop +application/x-deb=file-roller.desktop +application/x-ear=file-roller.desktop +application/x-gtar=file-roller.desktop +application/x-gzip=file-roller.desktop +application/x-jar=file-roller.desktop +application/x-java-archive=file-roller.desktop +application/x-lha=file-roller.desktop +application/x-lhz=file-roller.desktop +application/x-lzma=file-roller.desktop +application/x-lzma-compressed-tar=file-roller.desktop +application/x-lzop=file-roller.desktop +application/x-rar=file-roller.desktop +application/x-rar-compressed=file-roller.desktop +application/x-rpm=file-roller.desktop +application/x-tar=file-roller.desktop +application/x-war=file-roller.desktop +application/x-zip=file-roller.desktop +application/x-zip-compressed=file-roller.desktop +application/x-zoo=file-roller.desktop +application/zip=file-roller.desktop +multipart/x-zip=file-roller.desktop +text/plain=gedit.desktop +text/css=gedit.desktop +text/mathml=gedit.desktop +text/x-csrc=gedit.desktop +text/x-chdr=gedit.desktop +text/x-python=gedit.destkop +text/x-sql=gedit.desktop +application/javascript=gedit.destkop +application/x-perl=gedit.desktop +application/x-php=gedit.desktop +application/xml=gedit.desktop +application/xml-dtd=gedit.desktop +application/x-font-ttf=gnome-font-viewer.desktop +application/x-font-pcf=gnome-font-viewer.desktop +application/x-font-type1=gnome-font-viewer.desktop +application/x-font-otf=gnome-font-viewer.desktop +application/csv=gnumeric.desktop +application/excel=gnumeric.desktop +application/msexcel=gnumeric.desktop +application/tab-separated-values=gnumeric.desktop +application/vnd.lotus-1-2-3=gnumeric.desktop +application/vnd.ms-excel=gnumeric.desktop +application/x-123=gnumeric.desktop +application/x-applix-spreadsheet=gnumeric.desktop +application/x-dos_ms_excel=gnumeric.desktop +application/x-excel=gnumeric.desktop +application/x-gnumeric=gnumeric.desktop +application/x-mps=gnumeric.desktop +application/x-ms-excel=gnumeric.desktop +application/x-msexcel=gnumeric.desktop +application/x-oleo=gnumeric.desktop +application/x-planperfect=gnumeric.desktop +application/x-quattropro=gnumeric.desktop +application/x-sc=gnumeric.desktop +application/x-sylk=gnumeric.desktop +application/x-xbase=gnumeric.desktop +application/x-xls=gnumeric.desktop +application/xls=gnumeric.desktop +text/comma-separated-values=gnumeric.desktop +text/csv=gnumeric.desktop +text/spreadsheet=gnumeric.desktop +text/tab-separated-values=gnumeric.desktop +text/x-comma-separated-values=gnumeric.desktop +zz-application/zz-winassoc-xls=gnumeric.desktop +x-content/software=nautilus-autorun-software.desktop +x-directory/gnome-default-handler=nautilus-folder-handler.desktop +x-directory/normal=nautilus-folder-handler.desktop +inode/directory=nautilus-folder-handler.desktop +application/x-gnome-saved-search=nautilus-folder-handler.desktop +application/vnd.oasis.opendocument.spreadsheet=ooo-calc.desktop +application/vnd.oasis.opendocument.spreadsheet-template=ooo-calc.desktop +application/vnd.sun.xml.calc=ooo-calc.desktop +application/vnd.sun.xml.calc.template=ooo-calc.desktop +application/vnd.stardivision.calc=ooo-calc.desktop +application/vnd.stardivision.chart=ooo-calc.desktop +application/vnd.oasis.opendocument.graphics=ooo-draw.desktop +application/vnd.oasis.opendocument.graphics-template=ooo-draw.desktop +application/vnd.sun.xml.draw=ooo-draw.desktop +application/vnd.sun.xml.draw.template=ooo-draw.desktop +application/vnd.stardivision.draw=ooo-draw.desktop +application/vnd.oasis.opendocument.presentation=ooo-impress.desktop +application/vnd.oasis.opendocument.presentation-template=ooo-impress.desktop +application/vnd.sun.xml.impress=ooo-impress.desktop +application/vnd.sun.xml.impress.template=ooo-impress.desktop +application/vnd.stardivision.impress=ooo-impress.desktop +application/mspowerpoint=ooo-impress.desktop +application/vnd.ms-powerpoint=ooo-impress.desktop +application/vnd.oasis.opendocument.formula=ooo-math.desktop +application/vnd.sun.xml.math=ooo-math.desktop +application/vnd.stardivision.math=ooo-math.desktop +application/vnd.oasis.opendocument.text=ooo-writer.desktop +application/vnd.oasis.opendocument.text-template=ooo-writer.desktop +application/vnd.oasis.opendocument.text-web=ooo-writer.desktop +application/vnd.oasis.opendocument.text-master=ooo-writer.desktop +application/vnd.sun.xml.writer=ooo-writer.desktop +application/vnd.sun.xml.writer.template=ooo-writer.desktop +application/vnd.sun.xml.writer.global=ooo-writer.desktop +application/vnd.stardivision.writer=ooo-writer.desktop +application/msword=ooo-writer.desktop +application/vnd.ms-word=ooo-writer.desktop +application/x-doc=ooo-writer.desktop +application/vnd.wordperfect=ooo-writer.desktop +application/wordperfect=ooo-writer.desktop +x-content/audio-player=rhythmbox.desktop +x-content/audio-cdda=sound-juicer.desktop +application/x-shockwave-flash=swfdec-player.desktop +application/futuresplash=swfdec-player.desktop +application/mxf=totem.desktop +application/ogg=totem.desktop +application/ram=totem.desktop +application/sdp=totem.desktop +application/smil=totem.desktop +application/smil+xml=totem.desktop +application/vnd.ms-wpl=totem.desktop +application/vnd.rn-realmedia=totem.desktop +application/x-extension-m4a=totem.desktop +application/x-extension-mp4=totem.desktop +application/x-flac=totem.desktop +application/x-flash-video=totem.desktop +application/x-matroska=totem.desktop +application/x-netshow-channel=totem.desktop +application/x-ogg=totem.desktop +application/x-quicktime-media-link=totem.desktop +application/x-quicktimeplayer=totem.desktop +application/x-shorten=totem.desktop +application/x-smil=totem.desktop +application/xspf+xml=totem.desktop +audio/3gpp=totem.desktop +audio/ac3=totem.desktop +audio/AMR=totem.desktop +audio/AMR-WB=totem.desktop +audio/basic=totem.desktop +audio/midi=totem.desktop +audio/mp4=totem.desktop +audio/mpeg=totem.desktop +audio/mpegurl=totem.desktop +audio/ogg=totem.desktop +audio/prs.sid=totem.desktop +audio/vnd.rn-realaudio=totem.desktop +audio/x-ape=totem.desktop +audio/x-flac=totem.desktop +audio/x-gsm=totem.desktop +audio/x-it=totem.desktop +audio/x-m4a=totem.desktop +audio/x-matroska=totem.desktop +audio/x-mod=totem.desktop +audio/x-mp3=totem.desktop +audio/x-mpeg=totem.desktop +audio/x-mpegurl=totem.desktop +audio/x-ms-asf=totem.desktop +audio/x-ms-asx=totem.desktop +audio/x-ms-wax=totem.desktop +audio/x-ms-wma=totem.desktop +audio/x-musepack=totem.desktop +audio/x-pn-aiff=totem.desktop +audio/x-pn-au=totem.desktop +audio/x-pn-realaudio=totem.desktop +audio/x-pn-realaudio-plugin=totem.desktop +audio/x-pn-wav=totem.desktop +audio/x-pn-windows-acm=totem.desktop +audio/x-realaudio=totem.desktop +audio/x-real-audio=totem.desktop +audio/x-sbc=totem.desktop +audio/x-scpls=totem.desktop +audio/x-speex=totem.desktop +audio/x-tta=totem.desktop +audio/x-vorbis=totem.desktop +audio/x-vorbis+ogg=totem.desktop +audio/x-wav=totem.desktop +audio/x-wavpack=totem.desktop +audio/x-xm=totem.desktop +image/vnd.rn-realpix=totem.desktop +image/x-pict=totem.desktop +misc/ultravox=totem.desktop +text/google-video-pointer=totem.desktop +text/x-google-video-pointer=totem.desktop +video/3gpp=totem.desktop +video/dv=totem.desktop +video/fli=totem.desktop +video/flv=totem.desktop +video/mp4=totem.desktop +video/mp4v-es=totem.desktop +video/mpeg=totem.desktop +video/msvideo=totem.desktop +video/ogg=totem.desktop +video/quicktime=totem.desktop +video/vivo=totem.desktop +video/vnd.divx=totem.desktop +video/vnd.rn-realvideo=totem.desktop +video/vnd.vivo=totem.desktop +video/x-anim=totem.desktop +video/x-avi=totem.desktop +video/x-flc=totem.desktop +video/x-fli=totem.desktop +video/x-flic=totem.desktop +video/x-flv=totem.desktop +video/x-m4v=totem.desktop +video/x-matroska=totem.desktop +video/x-mpeg=totem.desktop +video/x-ms-asf=totem.desktop +video/x-ms-asx=totem.desktop +video/x-msvideo=totem.desktop +video/x-ms-wm=totem.desktop +video/x-ms-wmv=totem.desktop +video/x-ms-wmx=totem.desktop +video/x-ms-wvx=totem.desktop +video/x-nsv=totem.desktop +video/x-ogm+ogg=totem.desktop +video/x-theora+ogg=totem.desktop +video/x-totem-stream=totem.desktop +x-content/video-dvd=totem.desktop +x-content/video-vcd=totem.desktop +x-content/video-svcd=totem.desktop --- gnome-session-2.27.92.orig/debian/gnome-session.install +++ gnome-session-2.27.92/debian/gnome-session.install @@ -0,0 +1,9 @@ +debian/tmp/etc/xdg/autostart +debian/tmp/usr/bin/gnome-wm +debian/tmp/usr/share/applications +debian/tmp/usr/share/doc +debian/tmp/usr/share/icons +debian/tmp/usr/share/locale +debian/tmp/usr/share/man/man1/gnome-wm* +debian/tmp/usr/share/xsessions +debian/55gnome-session_gnomerc etc/X11/Xsession.d --- gnome-session-2.27.92.orig/debian/gnome-session-bin.install +++ gnome-session-2.27.92/debian/gnome-session-bin.install @@ -0,0 +1,5 @@ +debian/tmp/etc/gconf +debian/tmp/usr/bin/gnome-session* +debian/tmp/usr/lib/gnome-session +debian/tmp/usr/share/gnome-session +debian/tmp/usr/share/man/man1/gnome-session* --- gnome-session-2.27.92.orig/debian/gnome-session.prerm +++ gnome-session-2.27.92/debian/gnome-session.prerm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove x-session-manager /usr/bin/gnome-session + update-alternatives --remove desktop-splash \ + /usr/share/pixmaps/splash/gnome-splash.png + update-alternatives --remove desktop-splash \ + /usr/share/pixmaps/splash/gnome-debian-splash.png +fi + +#DEBHELPER# --- gnome-session-2.27.92.orig/debian/control +++ gnome-session-2.27.92/debian/control @@ -0,0 +1,69 @@ +Source: gnome-session +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette +Standards-Version: 3.8.1 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-session/ubuntu +Build-Depends: cdbs (>= 0.4.41), + quilt, + debhelper (>= 5.0.13), + gnome-pkg-tools (>= 0.13), + sharutils, + intltool (>= 0.40.0), + libglib2.0-dev (>= 2.16.0), + libgtk2.0-dev (>= 2.14.0), + libdbus-glib-1-dev (>= 0.76), + libgconf2-dev (>= 2.10.1-6), + libstartup-notification0-dev, + libsm-dev, + libice-dev, + libx11-dev, + libxt-dev, + libxau-dev, + xtrans-dev, + libxext-dev, + libxtst-dev, + libxrender-dev, + xmlto, + xsltproc, + libdevkit-power-gobject-dev (>= 008) + +Package: gnome-session +Architecture: all +Depends: ${misc:Depends}, + gnome-settings-daemon (>= 2.26), + gnome-panel, + nautilus, + metacity | compiz-gnome | sawfish, + gnome-session-bin (>= ${gnome:Version}), + gnome-session-bin (<< ${gnome:NextVersion}) +Replaces: libgnomevfs2-common (<< 1:2.24.0-3) +Conflicts: bug-buddy (<< 2.20), + libgnomevfs2-common (<< 1:2.24.0-3) +Breaks: gnome-panel (<< 2.26), + xserver-xorg (<< 1:7.4) +Provides: x-session-manager +Suggests: gnome-user-guide | gnome2-user-guide, + desktop-base, + gnome-keyring +Description: The GNOME Session Manager + This package contains an X11-compliant "session manager" (similar to xsm) + with GNOME extensions. When you log out, the session manager will save the + state of all your GNOME apps. When you log back in, the session manager + will restore your session. + +Package: gnome-session-bin +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + dbus-x11, + policykit-1-gnome +Replaces: gnome-session (<< 2.26.1-5) +Breaks: consolekit (<< 0.3.0-2ubuntu5), gnome-session (<< 2.26.1-5) +Description: The GNOME Session Manager - Minimal runtime + This package contains the binaries for the GNOME Session Manager, but + no startup scripts. It is meant for those willing to start + gnome-session by hand with the components of their choice, and for + applications such as GDM that use gnome-session internally. --- gnome-session-2.27.92.orig/debian/gnome-session.postinst +++ gnome-session-2.27.92/debian/gnome-session.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = configure ]; then + update-alternatives --install /usr/bin/x-session-manager \ + x-session-manager /usr/bin/gnome-session 50 \ + --slave /usr/share/man/man1/x-session-manager.1.gz \ + x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz +fi + +#DEBHELPER# --- gnome-session-2.27.92.orig/debian/gnome-session.dirs +++ gnome-session-2.27.92/debian/gnome-session.dirs @@ -0,0 +1 @@ +/usr/share/images/desktop-base --- gnome-session-2.27.92.orig/debian/gnome-session.preinst +++ gnome-session-2.27.92/debian/gnome-session.preinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" le "2.27.5"; then + update-alternatives --remove desktop-splash \ + /usr/share/pixmaps/splash/gnome-splash.png + update-alternatives --remove desktop-splash \ + /usr/share/pixmaps/splash/gnome-debian-splash.png +fi + +#DEBHELPER# --- gnome-session-2.27.92.orig/debian/rules +++ gnome-session-2.27.92/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.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-version.mk +include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --localstatedir=/var/lib \ + --enable-ipv6 \ + --with-at-spi-registryd-directory=/usr/lib/at-spi \ + --with-default-wm=gnome-wm + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +%: %.uue + uudecode -o '$@' '$<' + +SPLASH := debian/gnome-debian-splash.png + +common-build-arch:: $(SPLASH) + +clean:: + rm -vf $(SPLASH) --- gnome-session-2.27.92.orig/debian/gnome-debian-splash.png.uue +++ gnome-session-2.27.92/debian/gnome-debian-splash.png.uue @@ -0,0 +1,1034 @@ +begin 644 debian/gnome-debian-splash.png +MB5!.1PT*&@H````-24A$4@```:0```$E"`8```"KH)9(````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U@D%%"XP!(SU +M_0``(`!)1$%4>)SLO5>7)$EVY_>_YJ%3Z])=JG7W]$B,P`(#S,XL=X8'Y^PY +MNR`_`%_Y/7CXQ'<>OO"!+^0A(79`2&*P,\`"F)Z>UKI4EZ[4(C(RI%\^F%TS +M0=.Q;AT5E\&(J/7/>04P<&4&XVL5C='ZW^V*7%T=N?ZPE9)O=;H6&4#]015?+2P,W9FG!:.N3XX*1@F%T]?O+LF]/QJE +M*ZD+'09&/'H#&8Q.D+QVO@(`&*CJ[!9+^&)Y1?O)D^+I#5,A@-)QD,,IDW-(% +MI+92^')Y&:!TYIS3(AF,>G]P:W$1C5QN4+'4)ST*&(E(DV4P&DXR +M&&5R%!(!TGZA@%N+2T^K+T +M(;E"!J/A)(-1)DS,X]S;X>VM_'2VBKNS3T;6E(&H^&: +M\8O=7%Q"2PV`TE.$$0"HD#%]<)"N<$+;&8R&DPQ&F1R'*`!8V=O#9+.!W6() +M]6%--B=0,A@-UTQ2L9M+2PA[!;8\91B)G-O9Z=6!OB<;!D84>_5K=X@N=+7; +MU39WO\U@-&P+HQ7*8/3T1`'`_;DY?+&\\DRL..^HNJ>U>IW%@Z'X:;$JPE/()0LEPB;^XBS[1,T9@Q=%3'/8;D<$H?:$, +M1D]'ILL!_M./7AVP*O*420:C],VD/=-G/I1.&(P`H-#I(`C#5"=+TE#\SQ@, +MGS`.&3ZF6`,C3&1+XHNE+7:O)"W,=:@;5'VUM,0KC!W)8#2P4`:CIR?G9@LH +M%H+!J8-.BV0P2M_,4&V"G#/+`DX:3`"]""^6*UVM6W-9?944>U'ZI(M[)4TP+%F.O;: +M30)+PHL3C*+==0VT6`!F6HR!2I>D+D#);TD]BOZ27C(897*<D@Y;0I!RBY!HKT)'*Z(>69A%'W +MO"!]W4R.7*ZOE/%XIP7F%-F^3[)D,$K?S&%@)+_>FYL?J=6CAI'(F=T]H\%1 +M9&1VYC<9ZKOAXX.'"+#^)'/`FMSDU<>CT_OR7'V2ESB96.MR;.''(`]24M\" +MRMCWHG"R>(MHB&FDSYB=ZN).-(Q&K9O)D8LBX/)B"8^V=/:54PND#$;IFQD' +MC$0^.W,F=:N)@]P1C@+S!P=N`!X`(4((>(._!0\1V$+'?"::E_#$P"+Z5YCV`4B/MDKFZL:?\+DB`D``KUI^1I +M/7#?*VMT([8!"?`UF0AQE'EY(.OQ.7S0A;HMVWX<;+X1+@8H$E\7L3DNO3;U +M/+->M[\I*AF,,GF:XT('1I3,D:%(%! +M[+<#`S+E8"6@LNU[VI2^^`B@6#1!`R9?<_)->A0#4P:C3)ZFY`/"I84B;CXY +MI4#*8)2^F:."DVMV(0$L"P-Z8SE/APB,`D +M\&$00@,-@0V\&9\^P+3J-BLM?8I4$101$! +MH0.8=[?,#W:_ZCN",%JBMV0PRN2(Y/)2"=NU-K9K'7OLU``I@U'Z9HX:1B*? +MK:P,*#%J9[JE"T3<#2)`'Y]N-"*F.*TDA6;`]K0D`R#M(_*BZ>*0`46NPS\G +MNZ:@$EYQ=U2TKX!%A(&<6T4+#U*AZYOI'T'9]Y%[(7ZG")R<65`N)4ECZI(, +M1ID'&DWKDV*D`4@:C],T<%XP``$38F)CH76)(G\MIWKA^*M!_I&@]^^;4$EF3,@0(N=S&F3^R!D"BB +M15FK8FBT-4^+(]&:#-PHXE!R8')'7/!#M`_=DL$HDW%(*:]P=K:(6ZO1!,DG +M'DBG&T8R(@U5?>0.'2N,C*Q-324G81W'*)`$(O&FF.]%'$12X4RU:LUQ#D)F +M(-=#.+HT'WD)C"!CMYC]D.(E!/..2?O>,>TV(I"*` +M9B=P8K+GD/MEP02&'W'H:TSN7IOKSF"4R1'+M>42GNPTL=^(IOTZT4`Z_3`: +MNOJ0'PQ5I&>EWM@'S[62YL(Q%" +M\$UM$B!@QND;^*Z91Q:GDM4/V"Q/3QI0&B)Q+`!71<\24*'"" +M@Y/U<7E@$E\4FPME-@N"&7#!#QX\8KT>[=NNS$PFD#$;IFWK: +M,!+Y:F'A4*.`A4Y/\UP?$"D/1&:L540Q@+CV(UH0=\/'M[[%K]D'D3*:2^(+ +M2<$-KG$+%;#U(RF!A/*U(W>SI;H%JL#2@U-$:V+W5FMR":8\N48V6E?,C"=! +M]/VXVWV7O-\R&&42DVLK)=S;:*#1[GY2)PY(&8S2-W528"0'[_<(!1\HW@`H +MYC7=)%L?4:*60\;L%89FX*6N9I?V]JPF9*U_\F'D]5P?'.>IS&1,MHG"9@8 +MLA&-->,I-J8_?=3I;/TD@U$F@^5Z;#&L+R<*2!F,TCZ*8:6ZG7';`DA0_9J`^*!0P?U"#=960:Y@\S +MC]Q@[J\=LI]Y21=L+CF;$LA9P1Q^I&FYM_IE-2?EF?#D3I"#E%5@V"A.Y/KI +MVHW"2<#$$7.>LK#S?4P@@$-SC\6_9&^UKRUQQ(27+!F,,ADL"Y,Y3!0#?+7> +M;:X#3A"0,ABE;^IH8#3B>6,';RTNIFK+#T807Y'\[MY3]'LAQ!#3'!'6)J=P +M>WY!^TU$8S`C]MWY>70"9;0L`9QORA(-R`.0!QX+'3@SG/BT(FF'G(H3>>^G +M$HJ&C2>%.D1-=^QI4^1%SP%.>S+VNZA93WGYZV(:DYCR9"&NCIF,$H^6!' +M*3"1<K'G(][)V=HI:XV"C,1='(8^OO1QCK39#TX63`*?)#`92@QZ[36IX:D(X,1H>I/Z!B!J/TG;FYX'Q)?LBU +MU9!\T'@V*"*8P=-H1YSX-=^)<_,";+FP&$E@]'S(Y.E`"\L%O'1O5K?/#Q\-'G%'1Z7N3(2NYP%"4G,@==G +M#V(]X!31FES-")B@C,8G[SUZN,`'";@(W7WQ[KTUL\IS"@%6[D%QM-E4WY%1 +M"V0P.GWRYH4)W%EOH-KH]"UW[$#*8)2^J=,*(S/&X>[<0A>,(K\3P"%;$YV\ +M!XD/PVE%,B2*R`#MM\>L(^MDD"VWVQ%M*`E"=N#V``0BD#+;40B`2&L51-K( +M%5.F!K\,3)+,=[YYS<''79^N+[O6>EXI#TXV(X4')FNFE-MF@"=*C^0C4LH$ +M+GB%?!.>/+9(VCTBH`,=["!;:2`=E#(8/5]2R!%>.EO&AW>K`\L>*Y`R&*5O +MZK3#B$#H!&Z+!-]G)#`"(P:CT)KHV)CKM%:DU]&\L+7IF:A,N^1\*&34@/UB +M"?#V-[+NF!B$1`L22`F`K-\')A0;XE-B+ZV/?B7O$IOPD@['U!.K^?BMRGN* +M`DI:<(N=1"M+!I.&D02"B!8I3\?K$KP)@)#%FO`8,%%X+##SOQ0AAH)2!J/G +M3UX[7\':;@OKU?;`LL<")&;.8#1$4Z<51O*3+):`K^;G>\)(_$6$[HP,=F9/ +M;L%FN=VQ[6KSEH&1S3*@S_UH9@8$1K58C&A#21#B&(0$0"0=C)CIG-DL<9=8 +M63AK%]#*9R'TAH#N!;]/$>`D0$K`:P'EKE=N!H&ZP<1D-2M`@XF]RI%DLHKL +MN:(F/-DR70<[A*)E,MGL#FFAE,'H^1-%.ICAPWO[ZVH+7E$5Z5LQ@ +ME+XSGK$G`B,0<%`HFC)>E!8C`@B[Z3@Y=)F1VKX7TUVIU02!,%,[@`*#8Z8L +M/0XKM'-ZB9TR`ZZ`2.!BC[OQ.$%3\G9R]&P`!`H:8;F4!%->:/#!!;J&NZ1;;>NUY&2:LNNJ;\&S]T#Q5;=(4 +M3:D7E)RG;(BO4@:C9U*NKY31:(6XM]D[U-N7(P52!J,T'PQ5I&>EDP"CB"E' +MCY(@`!L3%=](U`6CN+^(2$Q]GB9A/K^\N85<)\29ZBZNKZ["[9**B&GNP=P< +MIAMU2#HA!QK77F1-D:_]P`W4%CHRM/O:DOG/C[2+OMC+7.=`9H'`#E;PLT10 +M%%`N))XL.,G\(V!R[;,M9S4QL[I6`&2UV)BVY)Z;RW&GBTEH.,#&3!B'D@0Z +M0!D-UH-2!J/G5[YV*;UV!!PAD#(8I?E@J"(]*YT8&/D#G-65&!L3D[:.#R,F +MDZXFYB^2/7M\;4O6Q(`(US;6[+')1L,"Q,*+@%80:#\0L]%BG(9C533R(&2T +M%44F&@]&2S(K9,GON]]>PLLNSO7-;-Y+PL8C6I=H:J`HH*QY$+8@]0&3O<<` +MQ*/$\$VILOF?:)1LS9YD*0/8[3;,WP2Q@M64$J"DS9<^E/3SZY$AIOM+--Q' +MF9P"N3A?1"&G<"-AWZ->S\S:=@5"\L#%5\("`)G9QT`!P&2-(*]? +MR3?++FI-NE\LU)('2.9K(OB&NT;3MY`=,!E>QYR5S94W#;"Y1C;G)`JMJ9!# +MK2WI6T`.8.1N+9MG%+U$@H:27K2LP-JG1`![6[^+N<]N$Q)O)GY3AOLHDU,B +M;UZ4,Q@&H`1DN>T)XV5W4H%*WN[]GPRY1>HD#(@,J?S37F^1B%A%:*D``![ +M^WQW;_D=I9$`SH'&_S5FXK*`@H63^'_DNA@RX),#$X`07AH@J6S!1/86RK-A +M8B@6'YY^#S89&.1<[$T@6!#LH$3$)F.X"W@@(H0>E&T>O:0O48)D,#K]LC"9 +MP])T'G_WT=90]<8*I-,&HV*KA>6]/92;S=%;2E%ELMG`BVNK`("#?!Z/IZ;1 +MR.=/-8SD=VM6,S]DL)1!7J\S(@VD:A4,;4AR,((U.?DPB$/F%F[&_T8G2"'8J>#9A!XVHW3ADCIJU`05`D:8,M+&C=S6@FA +MSW<28.1FO%ZG/'C`F&[L-@D,=(B0`[HTHRB,?&V"['LVHZG37J0L8;+91*-8 +MM.>6E#=$P..9*2S4]O%X>AH6='"F.!=Y9B!D&E=&:0L%7!X9E!UU?9IX482> +MA+`CM*=):8U%?#Y6__(N+(0&A6U5UEI!PR4T#BT!D\":33NB5(80B#@BZ.LQ +M)CRE@:8H-&8WT]%0,G]W0TFW83!&ROB@V&J_.NNXJ6^SA)NKYMY?MPQ&SX9, +M%@-<7BSB__S7M:'KC@5(IP)&S+B\N8EBNV4K'S>,XE7G:S7,UVJH%HIZMU7J +M'M#BE4X4C")F*&\X-LYM[3S7F3J9@(V)22Q7]P;`R&E-TI28JF2T)G=*`,!L +MXP";TU.>M@4;;58O%#"YLVN!XH,(<)%G@(.0K$UB&/B0.Z\=V+UGY7\:OU^* +M_;4_3H50YJ#57N"B#4,PE,61^4S>^6`*39B!(A"[G:3@;J\W.8`N8^HR*VC# +MFM82M99E`APL>/I`"0"Q0$D'?X1V,@*K'9N;"(0>&!,D@]&S(V]@/[ +MC8$A+5UR:""=!AA=V-["1*,1J?BT8>3+9+.!5U:?]-:83B",DOQ&UI1E%Q8I +M;_`"-B7ZH`<]K2\%9B,@MXVWT79,P7HA[P4G>%J2 +M]Q((Z;YJZ"BO4)?V8R'5_4=GT$^4\)DL!*L4<:HTV=FMM[-1:>+)=QYWUFIDCD#/AH=NO9*/E +M##@DV[I`26"L-2]SOUF99\_NN#7WR>,SNK0Y61Q+&8R>'2D$A)?/5O#S=S=& +MJG\H()UT&,WO[V.INM=5<5PP:N9RV"\4T%;*O`(0&$$8(@@9^4X'$\TF"IUV +MJK.)QG1O=@[[Q6*//O?H3+HN#ULUL5AOOY$;Z65\$R>Y!8H?V@V7+ZW+3-<7 +M1J:\.:<8MEQ&`3]8@;$Z,X/%:A4;D]/6)J?LN4WF-X$0N0':78_S*^GK]L#E +M@RK*COA'W@%][6QO%ADMTH_N3,A@]6_+*.9TF:"-%FJ`D&1E()QI&S'AY]4EBQ>%A1&@KA=6I +M*>R62B-WRB]2:39Q?GL;BL/XO!L`<'%["R$1OEC4.Z2>%!C9F6UD%F]=__I? +ML^['PB@2*LUHY@LHM%L8"48Q,Y[]7"DH#LV`#J^,ADI'*U9VUS$ +MHZ\)V?Y8"+$U2;G/$TQ//HS@_^(7%97);*L.!W=S]^R]TO$<^ET(QL)$`7_X +MQC*^]L)L*@CYLCA=Q$^_>19?>V$&_^O?W<+>00<4NMXR,51(")4V`T:A))J- +MP;X)J``S%"D-*',39>&L'WG'$D$!F#;EYG`&HV=,%`%O7)S`+S_;&;F-D8!T +MDF'4I15Y%=/"J*,4-BH3V)J8&%QC2!@!0*U0P)?>KJJSM1H6]ZO(A<[\HT+& +M*ZM/\-7L'&JB+0USTEZE#J$9)9GJ]'&VQVV*&IGQ&W.>1+4]F9K"Q>T-3V-@ +M&7WUD2%@1&14FI`Q4S_`3F72:D6NGO[9"0+GTS*G%:,A2#FSG6>6TIJ86QL% +MVTV.`#3B8TI6*>V@+.N#'-W=OJO6'"?:(PA!0/AW7S^+[UR;&QI$<3F_4,'_ +M^-,7\3__R2<(O0S?^MH9BGM!B<`4&C\5K%;$(;MH2`;8;-IGPQ+E7BA=QJY/ +M0BSJ+I-G0JZME%%OA;B?,DU0D@P-I),,HZOKZ\AW8JKB$#!Z,C7M%K2F.?<( +M,$J2[4H%VY4*P(SI>AWG=O0,@QFXM+6%6J&`N_/S0[0X?ABYP2/!5.?M6,IF +MP#?,TL.M(NL,/\A+^+4;=",!#'+A/6`DYBM_MUA2A)EF`SL3DYZIS0R*I,?# +MN_,+J#2;J!6+4%8Y<&8]P)FEK`9$@"P@%=6*#'0O+)7QPE(%DR4=OK]9;>#3 +M^[O8.^AAJG!-@F7?5H);L^6-SI(S;GZJ@#_^_D6LS/;0S$>0I>DBOGEE'F_? +MVM3!$*%,"-B9U534?(=0C)QL'JIH/&2B\>1Y*W,]$G"A[VG($FCB3(^9CO3L +MR9L7ATL3E"1#`>G$PH@9+Z^N=I=,!2/"ETM+"!,6K?8]]YA@%.T*8;=4QFZI +M###CI=4G(-8FOE<>/\9G9U92-7-D,)+9L)BQ`,A4UV;K-@.6OX^0]8\`8`KL +M6'9\[R'@)&(-L7((&ZBZ@`;&6?]05XXMVY4(NKT"$2D4RP%%@1F*/9R +M"Z6%4;58Q,;D)"YO;NC<;@RPR69J^V&CV(`@#"TTR>@A`DJGJ$4A)+`$`7_T +M[?-X_>),SWNDB/#CMU;0[H1X_\ZVN6_RC[X0$Q`(@:08Z62]$H%P>7D2?_S] +M"\@%1Y-JI0:8*2)-4W_EF"45L%N+&TC-L+BR<71IYT +ME,*-I27<6EP$`+RTN@H5)L?W'P6,K'&-NN^FM;#9$=TI4)'T0=KF8P?\@T+! +MM^E%%KVFUXP(4ZT6VKD`>^4R`$*QTP*1V>_(^(44W'JHCV*+=P-MM-*`&5(B@#X\E2#O_Q +M^Q>0/P(SG2\'S8[3+S*Y)1)/B!\Z\HD_O7&[J&U(V``D$XJC,",ZR8W7+RBM8AX+6U6)O#YRIF^ +MIJZ!YWZ*,/+ER?0T/EM9P8MK:\AU.KWKCL5,YVM'HLW``L*:[*!<5!H,:"!! +M`N)=,*8=)M2*)<@5F^VH```@`$E$050`*#XF`'9?'ZM-231=!$82R:?;+[;: +M(`(>S,YALMGT3'0,L`0IV#`"S-8/C`;D-"(!$8@-A,B"))=3^.'K+B(RK9R; +M*T,1(2!W#AF;G5:F+U8`]>^_<1:5XI$DX(_(X^UZ)(C"AQ*#NZ`D*>O(9'.P +M]CS)D.XYRNQ&A69QDBR89:^./B79+UBF)9U>^?H+D]C>;^/NQNB1=2)3E4)O +M()U8&`'=:XQ,18X?`.'+I66L34VE:/7DP\@*$3Y?6<'9W9WDYS0FS0A(T([@ +MQA592^,BM,Q=5QZ(O(%78-$H!*8#GI8$9^:S-BT;'.'#R(NR`^%L=1<$1J-0 +MP+8)TU=@`,IH.B8_@=)@:.4"$"L#!DX`D=;81(.YNC*!0GYXC>7L7,FVI\SU +MN'8=]`10KUVBP$!)AYBP?>;R.P&>IN-%)UK3G;D0 +M.&"Q>4;^@E\!'8!,2SKE,ED,\/J%"O[EQN[@P@-DHJCP[=?.4>)?VDF&T=4> +M9KHXC-I!@,]75E)I17W/?=)@Y,G=N7G,UV)AEF,ST\6THU"&&LFIYLQG;LV. +M'WDGVI(SU=E11U/+!+?%@QAT`9+W-G6"890'(Q"0[W3LN3MB4F0$A\13!BW`Y&OO2@"7CD_1/);3Y:FB_8^`LX_1L1>'\D"Z@=#F`0/ +M(R$SWKFUY3;I(V_+:B^SPZ@;A +M7*!P=<7M=CN,=$*&4H:[1DL*R#LG'*"N+$]@?BJ^^/EHY+/[N]C<:VB-R&JO +MRFUWSH`UIQHM,\ET9Y^Q)Q+J+QJ3V^X=J;6D3$Z'+$_G<7&AB-_(`H +MTMK6_2=['#%8GV08@1DK>S'5,`%&=^?F=1172CG-,!)IY7)CAY$&CTGU8I44 +MEYW!:4>>-B0/A&0&;$3">V7'5R;SWIL7B\G'PD[,>6;&#=A9O:.D[L?YG6W< +M65J*P$@#E'%IL8*7SDUC:::`9BO$9P]V\?#V.JK%D@60F"-MN#+IB+.)DAIY +M'5"]%3H$*[FG9&^N'=*9\C#KD,*`>,G +MDI!PJ\Z81R-8TA,/2,R/YG'02M$O=EVZY!.-(P`N\&=7S$.H\^75^Q@F$:>!1@-TYGTFI$9 +MF`R,""ZIIG;MZ'QU,`LF=?+,T&9DZ#H3NV`'T;1\4Y#,I.6A1OU&%'VD!D9* +M0O/@UAB%2ED8%0+@)V^=Q3=B@_TK%Z9QX\(T_ORWCQ"&PD`9:"7T60^@AUF4 +M6F^%NH_V%LAZ*P#'>HLI3W\EW&)9>/<`UK3G!\!DXE0>NS5MY3$+!DXVC(C9;8IF*L9A='-QZ?`PXEX?I*B;LM))AY&4E9U! +M`;.;1)&E$[5"3S2L>3>3DRJ!THM@W[ZUA\[AE2/D`\)T*7;MB +M#K7@X3A@!`#7UM,PNK6PB'80I&[ON`;V>*73`".I(,$,;`"B)[%F@-&C +MC#;%V,]D()&!Q>5&(QF8X#0?9ZISH[9=-.GM%R0!"S*;CRA+!,C"E@",B48# +M`3'^^`<7L3#`)_/-JW,H%5S`@[(#M#Z#4D#Q$$#:.VA!!;I[?K"$,@$5B@C% +MG,(K%T8+FAA6-JM-?')WU]U/@GU.<(_`9E00+8DD.B$D6PZ`>YY*PEP"F'7)O1J#K)I!`%EPMB`*"S@GN:!@"[AZR_,8+J2'WB=A9S"MZ_/&Q`Y +M+4\'(>@_C`Z//C@^W#JP4716.Q)=Q(S7B].%(\E5%Y,P6IN<0BO3C(:KFZ(" +MD]L2P9EBC)8CF^"9K`P^>"0;M-MZS@Q4L@>.!S"[4-(`SPY#H?%+=9GJ8K-I +MZ(&3[`!)6)^9Q@]>3;^(]8U+LC^2F*MD:%901-C>;PYJ(E&:[1#K>TV[(%:1 +MO]C606IN(GWPS6'D'SY>P]V-`Q?$`4`TV+CISN+*4W)(RGK:$^!@9+5E;XIA +MS;APVK+[5I&;8$3,=K#?P4Q/.GGR[2N3>+#5P..=UEC:FZGHL7N[YB*GAP;2 +M<9GI7EKSUALEP*A6*VZ]HD&0P2E>![:]L_3T"';M\D4(S0,%,=3W0R(GM +MX.+-MGWMB%TA:XPCP$_V%C756>JYP1).JP(!A84IS$P,UHY$*L4<)DLY'9X- +M";A0%H+M,,1^??@U%H^W#LRE:*W(+I!5Y@6]0'9V\NB!=&=U'[_Z9!4*-NVV +M#2)Q48:BSJM&0&$>W/S7?6&.G<&HQX5 +M)%BAVUSGG._^@.:&*#'MV.%)%D"2/P,WPYDW*+)WPW1MK?FPF''2 +MKC,1ROGTVK+(LMEKB$AK14JQ,]L186L$+>G1UH'3C)3NL^FQA1$=@X94:[3Q +M)[]^``MU9GO_(<,^:XW0/35E-4Y/&;5:$DNT7,QDYS1C]W+UR9KM6+3:S&QW +MJN2[UZ;P\8,:=@\Z@PNGD%)>8:H48&TWJFVE!M)QP6BJ7D<@B4,3801\OIS. +M+.-F^Z-UZ'F#D:?+>.\]CJ=$+<6:M%_$:* +M"!00`B4*H&Y[=@AM;A3YS[]YB.I!VX*G'23HB61=P)GMO.#&[K,=B*9V>Y$R87Y(I:F\GCOSGC"O`'@[&P!J[O- +MKH2LZ;:?&/G#X0?(R8<.Q"9]I*T([?G3L169P98_3:'SDA9LB=+>0U8 +M3RO200W:O';CT7!_A%\^KJ+9"J-9("`YZWSS'3!=/CH@_?K+#=QX6`5!Y^G3 +MCXRA<_O!;AGB(B!=4E2G(47-1A9:G`]OI3-QL!_0WVT7`ELG3%@+P +MO>M3>.=.%/360.FU1X^WNZT/@[>?&/G#X0?(2YN;MF(2C`!*Y3?*8#1< +M!;]NLKE.'-9NUBN?"S*+)VY,V%#40FP,++>"\FQ1\#>01M/MM.U&S+CTWN[7I"$-@,&2O8^@J3P`Q&A +MT1[#0HX$>>_V%O[N@R'W^M(9&6F@-V#-AKM[B?K/DLV`TS44>Y%UIA(BVI%-O&:"#\3\!->)W5H;M<:000CD8*1,N]ID9_JK +M@"\?I7/DWEG=1[T5(E#DO;[2(>HL1H.XY\?S)Y.C)9 +M"O"=JU/XKU_L'B9W0D1RBG!^KHA[/;:KZ+W]1+]6CP!&2]6]OC!JY'(#%[\^ +M4S`:[O0C51A`'S0X^_&K'@8RDOVQ-=SK< +MV\%I]V"\0'KGUB;^]H,G]KZ1,N94N4=B)O.U)+D/HJEZU@B6XV#O#LND@^PS +M3C;;N;:2HNWE%)D]+?OC*#+Y\?("'"::U4>7B0A&;U5;/''C) +MVT_T:_$(8`0`\]7]GC`"@#L+_;6C#$;#54BJ:^W_#(!#:SUQN]7HP212EPCB +MW';#D3/729&XN8Y,_A@QU[$=``&Q&]J9N.?(X+AV9$Y#``IA![<>Q[;C&"#M +MCBS*U>\E1Y_XD@+H'&^__&0-K1ZY4CHAXY\^6T>CU3%^*#81=@2EE`,1Y+B^ +MIKV#PZ?M%WGGYB9^\>&:-9WI7'F>EF0VRI-<@U9+\L`NSXQ,0>W+T\^BRVP' +MX4:RV2[^#8N;[<2/Y#W";A]D)D]-WKA0P40QP+_>'-\BV%)>87$JWW_]0*6S\V@T6CCQL^_O-`U/^8E`F`EB9@5W?VVI]/!K2VSV'T;P$C*[%3(Y1 +M9LH!OG5E"G_Y_N98\M6)7%[4ZXY:?8(CHMM/]&OMB&`$!BYM;?9MZ=YL[_3\ +M&8R&JS"XKANE[-`C9C>38TXT&O[V%[[T\ +MV-\(`)O[3:C8OC\1&)<@'NKA]@N_88+Y^;PL7%"JKU%CZYMXLGVPV0"LRM +M\N^PLEH(,1O@D]Z"@0A/MNMHML.1TP?5&FW\XJ-5?/FP:O/1AJ*9DAY).#1: +M$BN$;I=%2`2EX%R[D,PQ9DF%"H&NDU!$8NV(#-'HG&V.H_=YN8#E$HQ<17D-Q":KCO!NE]J-A?CY19[YZ*O/7" +M!`HY&LO&>[Y<7BSAWD:C:]U17&2)0F\Y8AA-'QRX`PGR8&9VN/-F,$JLD$XS +MZO.)OSY)-LXQYK)(=H;X2-+UUOF/0C.26JV"@4(AAQ__A[=0+/5>HW/^A06\ +M_JU+$=^2U;PX1.N@@=_\^L[`*WZR74'];OIR%G#Z3N.;IHN[CNY\H:G<=\/;K]2!(VWOO[U?6= +M$1$BE6,V>K.+.J'PV_4F/KJ[T[>-#[_:M>`A`,KT0;=`$1AI+4AI`!$L9!3I +MX30`D".WWBB0W\UG`BKKIU*Z[YV0\:M/UP9&\37;(3[\:AO_US_=P_VUFMVA +M0^8)`)L]IV3[=X;-P,#H#@%G08Q^(K)=%46>B2<6;/``GA85R>N1>@4V1"(P +M,SD6403\P:NS^/#N/M;WQF>J4P1<6BCBSGJZZ-?>-HUC@!$`$/?VFCV8F4E_ +MW@Q&B172PBCI[Y_MO\Y9$W=J]PIHB#SCB-'&;]\,;+9-PMD+Z7(4%DMYO'!U +M$7>^7(40CPE0%``(T[%U-O[3=Q=WS=YY51DP%36G^5@ +M!&BM2'GV2(+;5MT.UM$+!X?ZM@2B7"J"8KV5-Y0"PA"-5HB_>>\QKJQ,X/+2 +M!*8K>>0#A6J]C=U:"[=7J[CY>!^M#EM_C/7=A':8AWP8?Y9B)`MCST">E`M` +M@,G4@6X_$J(&U[@?23]+[]D;;2G+2G,E`.B88+5;[AQ36BM%-UC(8#5?AL&8Z,=I$#@PAVI$OIB]RLVP[^'EE +MS<_%E:G4[;_X^CD#)+_?H8G*)(0,_/G;#_&=%Q?P.]?=SJP[M98.D?:T(P)L +MY!Z#S7HAL0@J*`,CO4T[.Q#9J#R.^H\`@!FAV=9=-$[%0&B")C242&^Y`<+- +MQ_OX\J$.6^^$(=B`*V08C8@CR[WT%NS>A((I\I@DFL]M`Q']V2]@@`U=!72^ +M'RE)DJ<<_3^UK7$6:?0C@E& +M`&-AOW +MGS*W.(E2I8!&HVTU'(+"QL24'W,3-QWM8GBYBLIS#9P]VT>G`^GHL +M2%C\/\[$I#4B+QDI,Y0)QK#)(XQFI&(7'D*;[1BDX0&]69Z&DFX[M.N]9#V4 +M&?P%/*Q-B:'NGJ[+!)O\E#4@(5J7/Z@3+`S%;&?OM'W6T4Z3*>SCJZ_$P_R- +M%;`[TL[*/09Y%ST1X6W.2Y#R3@@13ST2!*<]< +M*\UL;]5P*4T?C"RN3./!5V;9@#)S>#_JS$+Q +M:0$*2K0?LJ5U.X&G+9$$`)CK82`@N[4=H(`P)&.E8ZB0$9+Q5I&!E/3#W`S9 +M`E[&B\2IXXG2K]MTR'?CMS7";/AGS[RA2:;<8'=X=; +M4#Y(*@6%AA5]UB +MNX57'S\"^OCL#M/GH<2,:BH,$8_=VMD8SH:]L#1I@0@&-B3Y+IEH/B87`."9 +MN_S."'S(0D76(I$%C3(PTGXJ:.@9;09^8`/9FYH0.3F"'*:%C']' +M(V=F\GCE7`7_Y=/ML=YC`G!MI8P'FXV^BV")M+EP]Z!MR_5?J&%DW#`"L[?V +M*$GT7UL&H^$J]*M[=5VOY,^%86).0']UOFTLY2C2J^B@ZBITZV$D!NSNS34T +MZJV^8=^^S"UI9ZRH$?O%8I?I+-(GL;%!S&UD_2\6!N2&8!UYI[^+@8&6^,)L +MAG#C7U(!(:],\(,`RIRHU0G1;'70Z#":S8XVRQDHP&A6Q.+7$=^/Z80\6&>I +MB]Y'8G3,546"'#R)I31-+6GT*&?03=EFZK5(GA:8R5@EIPB__\HLWKF]AYTQ +M;;HGJNE_C5SW6,9V10[O#V*M' +M8=@72$ +MQCX/(_5S&HW=F9PR.3=7P(MGROB_WUX?:[OY@'!]I8P;3P[ZFNJFRP$"`M83 +M@BAZ`NDH8`0`I?:`15<,'"0E4SW!,$HL<4)@!'#D?H;*G]DFM#V$F2ZU)/2Y +MWVD.]AMX^U4MG*ZF2,*;YO)RBG!NH8P+"Q,X,UM$+A@MU]RP +M4LP'>.G<%%XZ-X6=_1:^>+2'SQ^DR+9\7)I1)J=>BCG"#U^9P;_>V$6U/EY3 +MW?65,M;W6MCNL^9HHJA0RBNL]L2ZF^*=>*J@#$:)A8?MW;Y99!PJ=6C3XJA#=;^ZT<_TNW_YAR\P/5O! +MPG+OQ;+KFX/#53F$V48")D!!8L@8I7R`5\]/X^7S4X+^/!>?$\[)_F` +M,#^1Q]INJ^_BV_3;3_23E#`"NGT8\>(=-=QT.H-1^M8?3<^@W0?XLCW"<*WV +MZ,V09KHD:;P\__&]>Q[E+R2F%;M:>>'8BCS=?F,'5 +ME/_VELD1V#MJSL06')VP/CLS3+8BDQS*;AG!D#5H +MV1+8DR%7ETMXY6P%?_K.>E__SK`2*."E,Q7<6:NCWDJ.G"X$A(6I/#:J+;0' +MI()(M_U$/QD"1KWJ^]((`>?W]_%!1#:*H#+&J#/G'3^ +MR5(.WWMY`9>7*D,D!ST9\IUK<]BK-7$CMBMNZ`W];KGL'??[R-W3&'>%]=*J-:[V"M +M1T+68EYK1AM[+313@#`'C`M&([224*5:*F8PZE'X,#!*8Z9+V/7(%DT]I*74 +MC.;V:S)*`3W*2`,<,G[[3S?QZ;MW\?*;%U&9**#5[N#CW]Y%>WH.#Z=GL%2K +MQJO963L1(5"$;UR9PS>NS!Y;D,*XA8CPP]>7<7?]+AK-MM90NA:0N4?@-H'0 +MJHQD6F`OI)S9)84*#;]DV_)Q2H:4IR/%/.$G;\SAO:^JN+3%[.6"PDPYA[7=P9J12*J%L8ER!#`"@/U\,?F#P55351IBR$Y7XAF! +M$9`\!`TZKY\JIVL=H\F!$_?=`(R9^@%VRF7,U!M(PI:TX1^M'[3PP=MW;)@V +MD0(SHYG+&8W+[,C*)@>=X<[EI0K^S:M+F*ZD6VQ[DB47*%P[,X%/_*TU1.N0 +ME!2A,9GQ(,->;W'[&3GSG-S?XX9+%HT^FA`!__:U.:SNM@:N"QI62GF%RTLE +M?/)@/]$G-%%4F"H%6-MK#K4-^FA3Q1%A9,TT?:IT^3BZ3SV\9#!*U1@#$9,* +MP_W#)DD=`=Y,>_0^!\Q8+U<0_289.Q],_K8^&\,!T?V46D$`!J-C>\8(%.$G +M7UO!S[YU[IF`D]E.F`>''FF/=&$.(1S!D6EUWV/6#IM +M*G,Y'YSV)?J9^R)E/D=V(+'K84ZM,P&XR0I#%R"56)T#W2 +M7?]EYC-^X^'S(==72GAQI8P_?6N1*&8R&Z$B_,84U#BL``"``241!5,M+56,3<'H^ +M#)WM0&-,AAT'-2?E9A.;$Q,H=EIZ+R#R9M8L^"&$"+U$GPEF/=(I=0B$MLJ! +M.@P*""\L5_"S;YY%J7#RPKC')8K(Y,EE.W`[0UOT9]?(8"@C3TI_:MX9",6_ +M!1S[&9T@F)^9$G0B9'$RA]]]:09_^]%65VJ>P\K5Y1)R`>'3!]TIA^8G2(>$D9[(CO:-S6`T7.LCPPAZGQZ[_8(QGT6W0>UNNF\LE,<2B7O+ +ML?XC";A[T(OH01)EQ0PHUSZ1F*;T8!R2;``(?.O:+'[_M:53%T$WK)")2+/? +MX6XXO0)A8S#[>;KNG_R,(GR93#V"OI7(43]8;]4KA9NCN1 +M-A41NC*_LRM#H0RVC*]=F<4/7U]^YF$$``AU\(9\FUTV;W+O&2[0(>(_XJC_ +MR!-FIU_99VH#1KPRGJ]1$L%&0!,QL_:7B,G1]BUU]4R,*`+^[>NS>+S=Q(?W +MQAO$<':V@(6I/#YY4(OXA10!2]-YM#H\E@W^!@-I3#!*79L9"]7JB&=SE7K# +M*'43HU1-B;O>[3Y5&,'WUI@ILPQF;%X)[=JYKQO'/#^YYW2W)CTMLP<'"/V% +MTJ*1>:)W5)7125[:"!C"F/L(>/'L)'[RM?YIAIX5"4-&LV-,,3*`0P9S?VI@ +M-,@0<"H2V\?J9@.ZG/4?B?;$"3O*]@IHZ"GF3++EA`6._V7I'[F7:5#IY'O7 +MIU'($7[Y^7B#&):F\C@_5\`G#_8CBVJ+.<+*3`'[C<[8MK`8&-(V+A@!Z!NP +M(#)?JV%IOWIJ8324'!6,AJ1B?-+0%2HL8/%V)I4Q16LQCE7=0HDS:S"`D,U. +MI&P\YAP9L,31+67!85<;S(SS\V7\T;?//1^:$8`'FP>HMT*GQ["`GCPM-QI= +M9W17/2DP$X.H_PC:1,K1U$KZ`U?6E7?W6MC2-\(NS=HFLV9,?\$(T1V',^DG +M+YTIX^IR"7_[X?;0D6W]9&XBA\M+)7SZL(9&RXT+4Z4` +M/J1QPRAE*\O5O0Q&0YZA"T:C=\,>9#/"1"+MO#%%FX+(\^=XRE0DL,&5M]N; +M`W;7TWA?7`"#@%'OQBKOK2/>^+IFIDOX3]^_>&H7NXXB-QZ;"1NS]1TQAT:C +M$3.;IZ5Z\-9OY4,=11*:9^AG4(A^IYS_*![W9LMW?9\Y4L*)@TS_"+L1;\YS +M*$O3>7S_Q6G\S8=;J#;&%\0P50IP?:6,SQ_5+'2(3/`"@">[S;$'LB3_%1\! +MC/3QP?.=#$;#G6'L,)+CUD\$.W#)3-<-7*Z\,\_%_4C.NP'`FNW*S9:=.',8 +M?X#.-$B(FNV8&?OY/`!&KMW&3[]U[IF.IHL+,^/6XZH&B3&SA7"*9$0[,@C7 +MGSE?G`M7@)E!]#+71?U';A%T?_]15%SHN#Q0)C/%Z:O)Q[XWF21*N:#PDS?F +M\)M;>XEAV*-*I:#PRKD*;CPYL.F&\@%AQ?B+UJOM(XFJ[-:0C@A&T78'UZ4P +M!`]8).M7>C9A-,2G"47[W<-^+2=.&SR['!O;#(GM3MKTW$[^.4@&(`"A,<6= +MW=YVFI6?OXY"X/'+ZO0(,S`#8<&\'+#8:##R@>"+^(T\[=L\_ZA,2LVPT +MAYVO]9+3W&PE]/^29H)``3]Y8P[W-QOX."$,>U0IY@FOGJ_@J_6Z#52H%!1F +M*CEL[K38]MO5C_\GG5CF6 +M%EQ[OGD0\EX^\;3JN-_)TDP"&A+\1U(JDVY1I&'4[C#^<8Q!#/F`\-JY"3S: +M;F+5;*(W6\EALA1@=;=YI#`"?"`=,8R&K9M+VJ8BH5(&(_=K?&N/)$TG;;\9 +MWBP;B)KI_,`"0)N"(H.('MY\GU$(MFMCINIU_1<%#8:\LUV`JBP*_P[-)!A,T`M[>YZ0--: +M$BG9(, +MZ(1OJC=.N?VDBK]]_W$7C.2VA!3J``>CSMA`!A.,PE9;"NVS\GU'2=J1.>#" +M(R):LBU]77LELOV +M/3'C_NQLRI9[GX@!$\EEWHLF))%9$;.='@`YE.@N/?,F<8J'NO[*WIYM*SX( +M27"#B^2+^I(:^0)",-ZX-#W,%9UJ>;!1P\_?>81V)ZX9Z9^A[S>"-M5%[Z'Q +MOP%@26>K:66?D5_"UXY"CJ\]`D!L`E"ZH^OLQGJF?-1<1^AIKLO6'Z62;UV> +MQ.6E(O[?]S9Q,"903!8#O'&A@D=;3:SMM;`R4T"CQ5@[)A-=7$9>O#$*C`"@ +MGLMG,!JR]7XP>FGU"6XL+D6.7=Y81SU?2-'R@&X8+4;,=O#-=I(1E0A$;H04 +M+\>7$"KYZOX"_?WQS;6J/92@ZOGJ_@SGH=K4YHM:)Q +MKF4:5D;:H&]4&`'`3JF$Z7H/4,>-)`\["`P`(B7%E<\-\H-Q9&)98-H"!Y7QD]`*% +MNW/S`("7ST\-!ID"BX*+AJ^8,4`2N][Y)ZQ^*:X75V/4H8"TF%A +M-*S(.IK3"*/!=0\'H\EZ'6N3DYY6`91:36R5*^.#D3E"8NQGP,9R"SQ,1@?V +M/[8#BWZOD0(HZX\2+4E9'Y+CDD1R"=<(;:705@J*&0M3S]Z&>R(;>PW\Y[4)'[S92>;Q@!P+F='7RQXK); +MO[BZBES8P2=GS@X\>Z^VDTYEY[[6%Z0'&8+29CM(#C78O'9V-F[V,"(FG-O> +MUMJ51-9UG9'LS-R&DIO!]^[<+(@)I8)"^1E-$_3I_5W\[0>/T6J[0=KN5V3O +MJ:3ST0>3-2/G([(PXFA&!KVG8FCJB*XD1E;Q_T2U([L[>EP[LC-K-PD)?2J1 +MVYO)YJ[S%\/*7WGH)CV9=@2?[>#^9F-PA0%"!+Q\IHRYR1QN +MK]:QMO=T@A8&22H@C5LSJA:*F&[4!U9B!F9K-6Q7*L.=M%>I9P1&`+!7*B+? +M:6-E=P]3YE[>7%@<>/9>;??KE4ND"F>[46)B(0,FV,&$C+D-K)/E+NQ7K6;E +MYB'B'PIM##(I>&8A7;@3*'1(`QZ/N-)$>XB:4S_PN,8/D46O`10$:E\G)#]?8=B0(= +MUXY41#NR&K:MH-O+S'7`XE0>_^[-.?S+C5W<7NLS3J:40`%O79I`*1_@PWM5 +M[-5/((F,#`32N&$$``]G9S']Y''?2O+E7JI6/2!E,!)Y-#,+%89HF8"&9A"@ +MD4^1N2"AW=1W548LDMQS9+:D"*V91R*KEG9W,%^K@:R6!+BA2H(:)$S+#:(` +M1TQWM^?G`1/@4"D\6QF]UW<;^,MW'^')=AWZ?I#-OB!AV5U:D2&^TWP,%$*D +M@I%37BBB.4FV<*LL6=A(J]05@!"/JHL>CVM',/8Z%\P`Z:=I(N*??$YEMA+@ +MIU^;P[M?5?'YHW3!7_UDHJCPS;NR=2*_*E+Y".`D9I*OG6/+V( +MDE,;EI\'&(F$2N')]#3VBD7L%PJ#*XP,(]B!@VP\@O$EL`X9!I']K-QH8.'@ +MP$;D$5@/9G"38=V8\3>9M,]BSK-.=06$%&C?$Q$ZX\J1\I2EW0GQSU]LX.TO +M-]%A@0X,\WT0P:TI@F@R;.'!MKQ4]GQ&/6$D((!K'UY4G0&#"V3P\M[!F?)D +MK5!HURV17`"Z?4>>=F3-NN9\"MI +M/%O&5VMUW%H[O-GO.*0GD(X:1FVEHOGJ$F`D,G>PCZW*X*S.SQ.,_.*I(A.OWWN"K?V6'7[)1,YI_YP'"C,1CPZ2720;.#7WRTB@_O[H!",\";JQ=@ +M)(/(#?*B%,X&`DVI8Y[H(1Q)\46C"Q#Q`3R"#]MN6M +MN4VB`P67E*@=Z8D*6^THBKCG2R:+`7[ZUAP>[S3QSS=V1VZGE%=8F,QA9:8` +M9L8[MZMCR^AP7-(%I..`$0";26`0C$3L(MFTY\U@U+/@*#"R1\3,)D!A+XT, +M,\[L;+NRGIF'9>`D/;`J(*#9DS:F.FB`1$UUNGFWYU$(EQK[4^MBS@QRD1(!T7C$3V"D5,-1H#800`5S8V +M\.7R(_#$&2RC\NL7GQ&.M#!:$:2 +M00!BUM..]+UR&6R/:UUB:Z^-9CM$(7(Q$0G6@P#728Z@Q*R9CE'_"X8&8I9I8@=?)S?R'1:_$:(ZS&N;Y'"WKE] +M[(Y#YC@`L3>7Q[[\VAT\?UO";V\.;Z10!T^4<2GF%4IZP-%W`G;7ZJ3+1 +MQ<4"Z;AA!`8>3<]@&D?PBLUS!2@B=SPY`FQ1R +MW+8P`N"FOZ9NR,;J1U[4G1TP%=J!,K^91)R07`.$M9TZSB_XRP!.GC`SWKFY +MA5]\M(I6QVDR$E'H\R@.(0V:*(A$VR%3R6J;YJF(OT@6O6K=Q01XV\2KO6$4 +M#6(PD7Q,%I:(]->BQOJ4NL*\"0#K\$HVZXXBWYL$[>AYDW-S!?SDC3F\K.#F7*`4D'AH_O[I\Y$%Y<<\'1@!``=91971E2DWBU> +MV=C`C:6EWJ4R&/4L.#88F9\2R^`6N^K!;[]81*G5U)@A%:DGY8C9!BH0`:L3 +M$RBW.YAJU$$(L5F9`C/0(88R,_;00.G)3N-$`VFSVL3/?_,0]]9K"9J_F+(T +M"<0D%X&0KS7!#?@"(NLK\@,7`-.&W&H!G(.1VY,*?6&D`1'U&\GOSF_DH-IM +MJF.C%9DK%,P,WYF!F__G(3O_AH#>V.!QQ7`L[9 +MX\,C"B$+%D<,#T2P))'`!9<*R-];R/W"WOLT,))^"SQZ^XU\)GVW#86SY>\ER@%:'L;[7PN)4#M<7 +M)G!GO8ZUW=-KHHM+,I"."48`T,SET'VTMUQ=7\/GL82B)P%&Q"'.[6RCT.F@ +MK11:*D`["-"AZ)]'E]%:$9T&2)D@^E3Q^,'H5T5+*QU\"? +M__HA[FTD+V2TX`$<'>+F,#AMB`U%M,84`Y%GGK,I>`PN=$-N;R3)AV?[,"*, +M_#"')!!%H^JBICJ6:PW]ZL]G(,-;ER;PUJ5)_-4'FWB2,C==*:\P4PG0Z3`V +MJFV$S+BV7$:E^&R8Z.+2#:1C@M'RWAY6IW3FYML+\[BRL9&J"6*@W&SBH!"- +MTDMY^O0RI&;$1%`AH]2*?M&2`S:D%N$S+Q_=@&X,ZL+H=4>`D7_8FNX`Y#L= +ML"6/>(+D0>OX7H8.8[J*1=!1)]2,O.:;Y98(:&/`\3@!< +MGCL;Z"T+8_O!B$VYZ)-.]!O!FF(I8JHC>YU&.WJ.P[R_>VT*UU;*^/F[&]C< +M'YRUNY@GS)1S8`:V]MMHMG6FDI?/3F"WWL8'=Y\-$UUVFK(#%JL$6]VWL$&A`X#U7(1"!%).12!$@B?W-M] +MZD!JMD/\R;__*/K,^,+(M.`U/VK5S"JG@:3O$'#'5`9ZISCOG\Z(=$8#?>V4&9V8* +M^/F[&]@]Z)]=NY#3("("=FIM--IZHG-QOH@SLX5GSD07%P>D8X01H$UU9W>V +M\6A&;[AV:V'1\R7U/R^#<&%KR^Z5E.+TZ65$&/FR6RYCQP"WV&IAOE;#5+VN +MTR`!V"I7\'BF_T9SIP)&GEQ;7T>AU;*;])&0Q&A%LNNH4IHTJU.39BMT/1R& +MDOF9]<9_')(')8;$W(7$^)?/U_$';RQ!):DDQR`[M1;^CU]^A<=;XI`>=+,\ +M_XZ%CEM7Y*D1#D(>%"1*+?3*V^.`#;L.X6L?Y+0I2H*17I=$O6`4^;MEJX%% +M?&/6/V3LLU[DI5;$1!MS!#*G?BY@%"C@1Z_-8:HU6KE(%D6?;Q<)B(@A0!1ZBIM>U:CYNI%*% +MJ&M0^6W%9;3LT"L9U9^IBB)68G&LQ$P",C]O;R-W;KC;9$0!G%U?AV!*-#L# +M`W69L"R%"02&;H#C.:1#8?M:6"8K:A9N,RC`U9"25>:"D=)FIH3+\QD\M0?! +M#9FB@O_C._>0+[O-+@2M_J(MK[+U/7!9L7@"3,9E'$D&D`@QD[25.;U8U7!W +MM8"EK;)-1$[DG,O$AUH3G=M?9+6F=AR%$TW7S$S7E(P:",NL=F43D/.9:Z/J +M#I>I3N0)?O:Q(7`$^,:[:2AZ\T\M\@2Q(`^1)\B6==LGQ'/`]'``(U'QP&M% +M`/#HL3"^^.D+9'OE)[KHU(J,`&`K',;9M37<,OTH=T=&<6YUM:Y5Z\6CDQV2&DH +M(N'BJ2&#P`@6^_Z;=8T7!K.8^O_G01)<5P(AU-(K*T$T?;?>WP(9<7`J]>VFF;8E@2"6("' +MP!/DRCK2+NUI*"S@Y&@`^8J.]Q\4V%ZV`XR38P'$@P)>_O%MVGOYB2XZM2,C +M"YNA$)+%(C;#+%?=[OIN@XQZ'KESP]TF +M(V(8.+^VUM"%6OX?"M-O1&$[@4Q"J4J2F=';,>>A&2G!)"5J:E<@(-!!"(>' +MZ3)N+.9P_FBL^T5O$__Y1P^QFJF8XMDDU)H/WV$`EY;RZ-$XGC\SC%,38<>_ +MU@7"`0%/GQS"L9$0_OC5>TCE*C;!V"#N)*D6&3G^(BN\SSKOCJ9SEMF,C%P1 +M=02P4@,1RC;3DCJV<4Q[AX>,K+QT&WD5/[B9;0AJ"H@!$"^HM=$R8D\ +MP8G1`*(!'OMAG)&HZADK%3LU:PR['<.@V>XQP-"'557BDSJ5$K +M^P+J2(?"CGRK)2-T)".[HKT=Q.`:#W#"PDVR/`QD-!06\/-/)[&XJ>#[-VK) +M*"1Q&(^+B`1XY$H:UG-J#1F-QD0\,1V&JE.\OU`X%&0$`(]/1R#P!'?6V):) +MEH343S(*J`J(T3JZ9'YX&&.%O-WWWNBHRPW<>3'CN3QXP_"^9I^,O`X"2=-P +M9GV]:1=&*(R4""%,4*.>E#CV76`RSO1;F/VIX]^PQK*-0R8IV3+ICM';^&:4(BIK9A"M[O7&Y1>;B/*"LZYI8+<'+`$1@U!?(<=8B) +M:/9RSK+U_MQ31W`D&>PPFS<$9*Z6B"RM"*[R%/9$!!\]&\?WKF=P>:%H)CWE,9&0(/`$&WD%Z8+6X`LZDI#P^+$( +M\F4=EQ\4D:^T#PD_:'CN9!2%BH[KRTXNO^[+3[1#&S("*,(*2PD34%546I39 +MOCLR`LXP8)AI9E1>0"HUG9,**$`+#H-!%`;=&QC"5RT`C'&"2$J&L()]A4'`34LPU +MFI)A"4SS"=W6/#]X6&SUDMW +MX`V*V5;F09^,O`U"*,*NP?/$9R>C,`VR[F)I^8SDYI7_?7H +M=ZJ7VRL%5'6]"1&Y(^RHK4TZ)CM7#@A:OTY2][G,OD!G,J*'@XRFAV7\PM,C +M6-RJXKW[!42#/!3-P$I&0:&B-T36<028&I+PY'$FW]Z[7\!J=G\6F^P'3H\' +M,1P1\6:3ZK@N+F0;B'<*UI2+F5LK(E36L +M9544J\TUG=&HB*>.1Q`)\+CRL(CYC8JY#^]P0N`(+IZ*XOI2$=DF:91ZLR%X +M(",+:[&8O7'P^.9F3:M3J11D56W[+>Z4A+0>HFXXYKL!(:/M--Y-,I(T#1=6 +M5^W0WEZ0EV4[M1,C#C:2(DI.$(,EV"C,-$)VH#>H*W,`$XY.[AGJ='6T)0K\ +MI^\_0*:X,T^>TR,A/#Z3<`Y0Y]405%#_,H"(+"`2Z&H?>M>XNI!M)"*8I+=%A5SOA-0#&5FX +M-;WQ"&<_E +M,+NQX7'>6F0#02P,)1O680D^.W^:Z\D=EFD)'#,IF0+/H*:CWHRL<\B,V/+2 +M$J2%JHX_?>U^;=1>'_$//SJ-TY,1TXSHCJ"C#4$/]N@XF)W"U%;MIJFL5O+^1W;,"L)''[C,R?QV'2\J29D&+3A99W[\+F1OJ[E +MZY>6`3#":T]$L$V--JA;*W+*1YB,PY*T6MJGFXP`V$EA76G8#QH9\1P+VYY, +M2)@QJ[O>7"GC;][;A-)"(Q)Y@I-C`3QR-(Q<6<-[#PI(%0['YM9NP!'@DQ<2 +MV"IJN+GUA&=XSR; +M[RB`\VNK$/567Y##149GU]:P%0K;(?:$4EQ868&H&ZVZ=(7-4!AKT?:I?.PG +M<6LBNW(H,>,8+$$'N&*8&[2E^L]H5L0&*,77WE[>L0VS`L_AUSYY`B^<3;HT +MI!:F.O/U_.DD9B>C?5O#C<4<[JP4[&O52$06'")R]E#1.JW(^GLP[93]2:AC +MXG,'FECC6/N,#A@9R0+!<$3`:%0"I!H4L:3 +MQR.@E`4L+&\IS438H<;SLS'$0SQ>O99I^UWICI#Z1$86YL;'`0H. +M:=([M[96<[Q^!DH(;G6H)62W=8TSN[&!L7Q]9,?A(J-S:ZNX,SIJ:T=3F2V< +M]V36;(Z56,S6?CO!(B4[FX.=V@8FN1C.$SFXUMJ2J8'H+I\4!3/K_<&W;F,A +MU?I);#O@.()_\)'C^*V?F\583(8==MWD]:&S27SQP\?Z.O_7WUZ".U@!J-6( +M`$LKJOW^UY!*G59$[0:U_B+W%^(@DA%'6(F'\;B(6%!`L6H@E5?QW*DHSDZ& +M\#?OIG%OO=*T[UA,Q%,S$81ES@]8:(.38P%R*'38_,LG3G_Z=S]T +M\1S2K=3+/I.1=2`ORQ@JEQ%1JLB$G$V-FZ$0AHM%#)>*2$@A"`=#F.D +MV/I)N)F9+J2J&"J5L!FVPGB[7W.W&$@RHA3GU];`48KU6`Q#Q2).;*814+7& +MOAYQ?RB)7-!;!@("L%39U/S-]9;`JJD$5FJ!6#W,**^:04C-=]0JUZ!H!MZ] +MMX6S1Z)(A*4>/UE[C,1D?/C\*"8308@>F\(G'AL' +MS_4O5\$[=[?PO2OKCLD3@'4!K#!Z]IXVY,FSB,CV%0%PM"+G[U_C+Z(N?Y%K +MTZWY2+`OR8B`^7KB(0&QH`!-I\B6=!2J.H(2AY>>3`(4^.;E312:1,\EPP+. +M3`81EGG<6Z]@>4OQB:@%$B$>/_M8$E<>%G%SN=RRW6A,Q*7WYCID^]XA,@)8 +MNJ!<((!8I0*XGM@,CL-",HGIS4W,KJ_;554%78=6EW25$H(;X^,XO];H,VCG +M,Q(,`^=7EW$_.>R40N]BS=U@(,D(P`67%G1A964;\];BQOB$IWUBSGP4Q"Q) +M`<.J,$I-$Q&I"0VWW156>+*9)XT]T%MUE\S,!(!M\2M6=?R[OYG#/_O\:9R: +MB/3X"=N#YPB>/C6$IT_M?"F,S;R"+__H01-M"+#HP2(0=IS1!J5687'`5GLH +M9YK\8&NH=I%76Y6RS8X'\.+I +M..962_CIG7S-YR,`AJ,BCB8EZ`;P,%WMJA3Y88;`$7SZT2%LY%1<:A%55X_F +M)CN7JKX39&1A.9&`QG$X4Y>'KB1)2(=#$`P#Q[8V`;"]3$>R3?:9$((;$Q/0 +M..>C=!O`,+.9QNGU=9`VYL']3D:\830EH-[F=?Y$I=&ZC:/.J4C:$U_1OY61%[]_X,/*T!A(BXA +M'A*@:`96LPHVBPX962F`/C0;PP]O9O"FBXP(8::Y)V]^_V!C81$F[YMWJ`-NA7L=\;&P%&*:*52TW0]&D,F&$2DJF`B +MQ_P^R_%$\RP,%+@].H8JSWN.IA,,'>?65C&1:U*#:9^34:QY$01$@J^\G<+] +M%$MEPQ%@,B'AZ9D(1J(B[JZ5<76QA$S))Z)N\,A4""=&`_CNM8RG_5>UA+3+ +M9&3AYL0$CF:V&IJNQ.,H22*&2B6[YM&=D=%:(>OJ<'=D%)FVOHS6"TD42SB_ +MLH)PM=K5FKL;M;O&.T%&9]=6<333_LFD%^%R>V04#X>&^D)&-4>I9:)#4VW) +M"@\W#.>IWC(A-1`3=;0#:P)5I_B/W[J#*P_V'RF]>V\+WWE_#18)N:^?%37G +MO&]/1(`90&*3.NQQ[3'L4B'`?C+1R0+!4%C`1$*"+'+(E36L9A7DRGK#OB&. +M`!=/1O%S3PSAZL,BOG5Y"R7%`,^Q-#]/ST00#_*XM5S&]:62OY?(`T9C(IZ? +MC>&G=W)8]UAZW?$A[1$96;@Q,8E$J8BM4.T&P@?)81S?3&,BEX?""RC*,AXD +MDZST^>B8[7NRIEF))U"2Y";FO=8+<3\Q36]NFO,F49+DCNL>)#(BE&(JDV%^ +M.>]+:0N#$-P<&S>=XKV@.1FU6ACEJ+TY%J;I2#=]2U:);N*=NYOXXU?GV2\N$G)\1M8?WVKB +MIB0G(2J(F?K'O(:,D$RJL7QV;JW(CJ*C[JD'#@)'$)8YA&0>FDY1K.K(%+6V +MZXT'>7SB0@(<1_"U=]+8*FH0.(+)(0D3<0G9DH;K2R64#FGBT^U`%@D^_4@" +M\QL57%OR'N7:9?F)G24CJVD]&5EXD!S&D4P&TUM;)E%(R`8".+>^AIOCC::C +M;#"(@B3AC&W>ZXZ,W#AN$E,J',%&M/D>DNV0D;<;O#T9A:M53&4S$+JL[.55 +MN*3"$:Q'K4)PO:!+,H+SX&Z'%MM:CQ/T8%A"%:@E)@I00LR(,7:`]3;K,@'0 +M=(JOO+&(]^YE\&N?G,%X(M#3)]H-O'4[C3_Y[KPK*6LC";FHB5TW2ZML1D3N +M:$8`3MHZBXC8-7=?KT$D(D*822XL\^`(4*P:6,^USI[@QKG)()Z?C>'62@EO +MW-\0F<6UM%J^?@;C:OC10+ +M&"D6H'$S&.AXFAL`;!J8WMVH",GI82D=<'Y_H[3/7S=@- +M&37T,,UTU&0;8H:!6:NQ$[.")0<',4RARX(?V#Y9VTMB)A9@`1%WUPKX5W]^ +M#7_GA2E\ZO'!TY9^.7J%M(%%3.C`8Q$1*0* +M*CY8*+3,2^>C.SQS(H*QF(2OO9/J.0S>)J1!)B,+F^$P%)['S-8F%N,)W!D9 +MQ9FU-9Q;7\-B(H%\H,Y_1)A_ZD0ZA4!=GCRO.ZD%P\#Y-18ZG9,#6(M&H0I= +M),O<+AE1BEBEPOQ!II)P,I7J25IXZ;(1B6`CXFB&NT5&C2-0T[I$F!F/PB8= +MJX5A.*8\4.9CLO8R`H' +M:[`V"SDY`!M)"+"T(=C:$,QB>Q:KM"0BUMFUE6OPB$CD"4(RAY#$0]4,%!6C +M]9[)%CB:E/"Q3?2S)RWEC[EH`Z8C+J3'DP-W)2\WK96A,;JADYW5[- +MXW?_XAK^WO-'\42JIJ!8R,! +MK&84W%TO=V7B\]$9CTR%\,)L##^ZF<7\1F?_=3NT(*3!)",+JF6.6U]#O%S! +M3=,T%ZE6<6YM%3?'QFH$*@!D@R'DY$#',&BOD'0=HX4"1LU2ZQ1,Z"F\@&P@ +MB'Q`ALH+33^OH.N(5*N(*%6$JU5PU(Z7:FB[&V1T8WRB(>'JGI-1PW&3F"R- +MR3YA$1.QA;,5W`!J[6MJ14Z`HE+\V8\7\.9<"E]X]@@>/Y[8-6*BE.)'-U+X +ML]<7H&@LM+TU`5D/*&VT(5>P@CV'Q5Y.;?B!"UJH-37#V> +M/Q7!Q9,QK&85_.16%BM9U0]4V`%O9M,5.D5$7 +M)J^%9!*A:A4GTBD8A$#C>`B&CB/9+,;S>=P>&07EN)J^M\?&<#R=1DC9@6)N +M/9KI6K7NE8PZ-3<(P?UD$A6Q>9ZW02,C=X/F#T-F\`-QF?/L,'`K.JV1G(`Z +M[F,1SY].XKG3PS@^&JJ?N;?/2"G>G\_@:V\OX6&:F3A( +M72EQ-P&92ZXQQ[DU(3<)L>6[S'*N#!:LW=X3D2P2A"26PD?3*4J*CEP/)CDW +M>`Z8&6&E(@(BA^]>V\*ME7+?R\;[8#A_A)'1ZWTD(Z"&D/8?&5DHR;*9TVX5 +M;BL.;Q@XM[Z&HBCAP?!PS6`/DL,XO]H^I8YG[`J)%PT$FHV8S +MU@C8.C^3T[B.G,QC+0D*`(B!K8*";[^_BF^_OXJ)>``79X=P^D@4,Z-AA#U4 +M@%4U`S<60*VGNN(Q:\C$_D$5`=D@[T)F$S,]E?7FLO\=>FN8( +M@(#$(2ARD$4.JF:@I!C(EK1M$T9(XC"9D/#D\0@FAR3<7"KA^S>R?K+3'<2Y +M(R&\>":&U^=RN-E',@)L0MJ_9&2W(`0W)B9K@A<`=E^&%`7G5U;P<&@(!9E% +M4@FZCAL3DQC+YY`LE3R'3V]_S>U;]IN,LL$`EA)#'1ON%S)RPZKB9$4P6WXA +MNX!R4/Q97(D]2I*;;V8\YGGR+V#J/N2*AFR7L7K$`( +M$!0Y!"7F$ZJJ!LJJ@:T.FU:[1=+,R#`1EW!L6$:IJN,OWMSPG!G`AS>P).1"]E@"-E`$*>,:!D5!4$+"42C?ZA`T1&M.E[,]^=)'&TIU=)AVWY-1L^.6IN1H"Z;D=@=# +MV$1@_K!"I-T1:F:..#OJC@+NB(.:=5C]2+N%.VF-ZHFG!J09`6&@2(CG@*#$ +M(R1QX#F"LJ(C5]9:EOKV"H$C&(D*&(U)D`6"C;R*BF+@R9D(TGD57WDKA7R' +MHF\^MH\S$T%\Y&P<;][.X7H/*8&Z15M"VI=DY#I3$27U0.3*O-ON"FWC@4L6H\SM@&1?W +ME(1$GIB:$`<"H*P8VPK1K@K,`R*%\_$,!06\<;M +M7,M*KC[ZBS,307ST'".C7O+3>4%+0MKO9.0^L!Z-83T:P]&M+42KC5]B2==P +M?G4%PI4JPDH5D6H5`GPWCR>`2W5\OX +M[M6,GUUAE_#LB0B>.![!3^_L/!D!+0CI()&1&XM#0R"48B:=1D!K='Z>V5C' +M>B1:0SRM)BK*,HJRC/6HRT1D&.`I!4G5[89N&,I]B#*-IRC)*,@2 +M2J($@Q#H'-=4^]E],JHS4^T3,NHTAEOTUUMHF^HY+;>T-&O=1-NJ\26Y?%LU +M7:@=8&$=VFT1+(L$09%'4&+AV67%P$:ENR2FW8*9Y$2,QD3;).?.M#T1%_&1 +MLW$8%/CF^YM^T,(N0>()/O%(`I,)":]=S^R:-MI=MN\#0$;V84(P/S("`)A) +MIQ"LRW$W5LACK)#'K=$QZ,VTI39KIAP'RWVK"`*VPN$6+9L<\2AM?#+J'YJ- +MV_`00;?W_6S5S-)Q2>.I72<@`D`6.80D)SR[K!K(9;)BN(EMR+`VR0/#K'"]C+O7,M8=GBT+'*J:P7Q"):WO!!`+\DB&!8R8)KGUG(([:XTYY6;' +M`WA^-H94C@4M%*I^T,)NX<0HVUR\EE7PVO7,KF=`;Y_M^P"3D;OI6BR&M5@, +MDJ;A9#H%SKP30ZJ""VNK,`C!9C#$PL,]3^.345?=!HB,NL6@KJL3>([EC:L/ +MS]XL]&>/D!NQ((_AB(CAB`#=`-(%%=>62B@W*7X7"_+XR)DX$F$!/YG+;3M1 +MIP]ON'@RBL>GP_A@H8BW[^7W9`T"<+C)R`U%$'#3C*R;RFPA5JF"@((S6)3= +MB!FI5Q($+,<34`2A(1EIIUE\,O+68+\*_4$"`2")!$&10T#D`!!45!WYLK8C +M3\#-2.C&<@G%:G/GD\03/'$\@D>.AC"W4L8K5[?Z%K'GHS-D@>`3%Q(8CTOX +MWK7,GCX(-(^R.X1D5(^EQ!"6`,"@&"OD,5PLVB&V04W#J73*;JL3@H(<0%Z6 +M49(D,U)O<,BHMUO;)Z/]#)$GD$T"DG@"Q?0'Y2OJCI1=<).09E"D"YW+@',$ +M.#\5PM/'(UC/J_CJI;2?C7N7D0P+^,QC0Z`4^/J[K)S[7J*1D+S[97OJ,,AD +M5-.8$#ML'(:!L*K@2#8+P7!N-)Y2Q"MEQ"ME5T<&G7`P"(%!`(-PJ`H"-,)! +MXS@8'`>-(^`H6.D)\\69+YTC2$6B/AFU0#0@(%_9VQN($!8IMM=/](0P,YSU +MT@V*JFKLF!8$`/$@C^&HB&38)*%\9Q*R<&(T@(LGHU!U`]^]EL%R9@<2'?MH +MBY-CS%^TDE'PVK7!"*6O):3]1D8[I64T:4P!@.-0D`.8&W,JBT8J%4SD<^`- +M`[Q!&W;H\]0`9]^?.@)*Z[!52EBFA0=#2;L:K4]&#B[.)G'A:`Q'1X(X.AQ" +M4.)1574L;Y9Q8S&/;UQ:1DFI=8!_[,(H/O[(*+YQ:1GOS6=:C`R$91[_PR^< +MM7__7[Y^"\46SO3CHR&\>'8$)\;#.#X:@LAS6,M6L)@N8WZM@%AUX6Z'4T&\.N?.@%"S`VR5MHA +M`,U"+MZYNXEOOKO:=EWM0&!J0CV2$`",Q40\/QM#1.9P:;Z`VWVHH>/#&PAA +M_J+'CH5Q^4$!E^9[2)>V0W`(R2>CEHW;]2T$`K@3"-2TY`P#846!K&F0-`T< +M961%J)FIF0`:QT/E>91%$45)8MFW>UWS`2>C>$C$?_7)&3QU8JCAG"SR.#$> +MP8GQ"#YZ801?>NT^+MW=LL\G(Q).343P3W_V%'[WSZ]A+=/TT.!3$Y%,3%V21>/#>"/_SV72QOMA:VSYP:PK&1 +M$%X\.]R2D$Z,A_'H=!P`<&PXB(54"4')-,,)')(1$3-C81!"NBHF:%6B]0*. +M`/&0@*&PT#,)`8S(+IZ,8FI(Q@XYOV+K[F,D(N"CYQ*(!7F\>G4+#U+5 +MO5Y2#3P]AOMDU%U'@^.0#P20ZWD1/AE9>.18#/_U9T\A$JQ-$*L;%/FRBD38 +MJ><4#8H-6H2%H,3COWUI%O_J+ZZ;55F]XU<^?`R?>WJRYEA5U:%J1LWZC@Z' +M\+N_\@C^W=_,X?IBKGX8B#S!5#((`'CZY!"^]-K]II_]F9-#H-0`I12/3<=0 +M4;2:B#A1$,`U>9#9+F218"@D8B@L(!KD4:KJR)2TEM%QG<9Z^G@4YXX$<6NE +MC+_XZ89?+&\/P'/`,S-,*UK.5/'*U2T4!C`'8-<%77:6C#R<'7`R:GK$)Z.. +M#9J="H@ZM83)>@ZA2)L(C'C\?Q2\\?Q59!:6N6FQH. +MX=<_=0+_^]]:"^JE```@`$E$053>[;32!LQ.1&K(Z/YZ$7_ZVGTL;+`LTT-A +M$1^[,(I??'X*'"&0!`[_X*/3^)?_^6K#9YL>#8,SJ]#&0B).'XG:6I+`$=,/ +M1/#,R3@,@^7/&XT'L9IM[V?YM__?36P56[C2,)Z8C6,DH^.NW4\B6!T\`'@9,)B1\]&P)C`#@[[YPU-:`**7XT]?NXP?7-FK:9(HJ?G@] +MA3?G-I$(-Y9AK\<+9X9Q;[6`[UQ>Z]C6C2^^>,Q^?V^U@'_[U9LU3_I;115? +M>WL9:]DJ?O.SIP``QT9">.'L,-ZX59MQ_L28D\HKG9X>PD2U#%C@8E`4C +M!&01$T,AVQ1W8CR,3EC/5I#*=Q<<('#$)J!X2("BL02I]]8KR)?U;44XGAX/ +MXMF3$904`]^YLM612'WL#"2>X+E349P]$L+\>@4_N9T;>.VTM_(3'CKX9-3S +M,CPU/&AD-)4,XM./C]N_OW$KW4!&;BB:@?5L=_;P7_G(-.;7B[B]TITS]Y%C +M,9R=BMJ_?_6MI98W]IMS:7SAV4D<'6;ESE]Z>K*!D$Z.AV$8AIGMF^*IDPE\ +MY?WLW[V;CW$-/#,CYREOD?7[FRA87T8/F*6L%[^0D/'7PRZGD9 +MGAH>-#("@$>F8[992],-?.7-1:]+:PF>(_BMS\WB?_JS:\B6.B?K/'_4R="1 +MRE5QY4&V36O@M:OK^-6/SP``)H<"$#A`$E@P@BQRF!EC_B..XT`(03(J8'PH +MB/DU)WW5TR=K`S@XCN#X:!AW5KN/B.(Y(!9D6M!0B-WJ6R4-2UM*7\J'6Q@* +M"WCN5!3C,0GO/2C@VJ)?+&^O$!`YO'@ZAA-C`=Q:+N&MN_F!".?N%M[*3[2# +M3T8]+L(GHV:82H;L]PNI$M)=FJ+:82U3P7!4@L!S2(0E_-;G9O%[?WVCH_"< +M2#AA_@NI4L>U;V0JM@9$0'%J(H2U3!4EA04D3`R%P-5%Q3U[*FD34CPDUD3\ +M63@QWIZ0/O'8.'1=ARP0R"*!R`&*#KQ^,XT;R]ZBXKK!<$3`4S,1'$W*N+%4 +MPO?W(/>9#P>G)X)XX504%8WBY?&L)?_N0A`."I +M$PG[N+M-,S^281CVZ]./#H$0`H[C3.V+:6#?^2#55S(:C8EXZG@$DPD)-Y9+ +M^+,W_,BYO41$YO&1LS$<&9)QY6$1[][/[]N0^N[*3[2#3T8]+L(GHW:8B,OV +M^XT6OJ'G9I/X)Y^8:3C^\CO+^,N?-#?QO?K!&LX"YT\,`@)]]<@)W5PNX +MN=1ZZEQ^HAU\,NIA`1Z['$(R`H!L6;/#O2/!KGX\CHV$,#G$ +MM+!?_]0)_/MOW&[9/E-4$!0Y4$HQ%F/[Z,`8+/@F$YF7%K. +M_%H1MY<+^/F+1P``S\XFD4;O)A(2GCDY*MTV27L,Q!Y`1(`H=LH8K)A`R.(Y`DH6/5TF2TEI#6729' +MMX9T?[V(!QLEAY!.#6$M4P8!A:JJN+V>]=&>SZ[#O;C`U).&IF0B&0@*N+!;QZM6M?>4@/VC@.>#\D1">/,[\B^_, +MYW%CN;1OS7/-T+K\1#OX9-3#`CQV.<1D!`"KF3(`9KHZ/A)J&O)\_6$.UQ^R +M3`B_\\4+71,2P/Q)7_K^??S&IQD1Q8("=%VW?38<(OI?'5A<<\3^NX$O-M"?#+J80$>NQQR,@*`^^M.WK5( +M4,1GGYK`-RZM]#A:+22!^8#FEG+XZ:T-7#P];`<#```QR7RP4#AP3]_[$2?'`GCF +M1!01F<.-Y1+>>U`XT'X[;X3DDU$/"_#8Q2/L>BX:Z +MNU[%9Y^:`N_*2_?FK;3MFWK@2HHZ,]8Y8X-7G!@-X*F9"&2!X(.%(FZN^$2T +MUSB:E''Q9`3)L(BYU3+>O9]O6>#P(*'[S(S[C8QH8V.?C'H9I;<&VWV&HP#^ +MTP\?V+\')1Z_\\L7\)DGQB&+M5_;)V;B&#.C\BBEX`G++CT:%1&6"0RS=I5N +M`,L9!:F\BEQ9AZ)1J#K%'WSS#HK5UM%)5=7`M]]WRC9`\Y.!O%?/#>"YT]%<7VI +MA#]_

P=??'$*1X8"ML]I,LDR=Q/B:$OW5@OXP[^] +M@U3.B7@+2;RMQ0$LPLZ-]^:$U`ZZKF,L0O`K +M+XSBX685KUS-[,N=_`<)(D]P9C*(1Z;"B`9Y+*2J^,9[::QFMQ>FOY_1GI!\ +M,O(ZB/=Y?3)J"9$GD`2":PL9_/[+9?S,(V.8&`I@/!&$)#"M1]4IUC,5/-@H +MX=OOK>!AJC:U?D75[:P-K/OGX.!Z=CN/82,@LY,?&7DB5<.UA%M]Z=[6A+M.19!"Y,IN_JNI8 +MKQ,/,1!"4`C=72KB^5/+_+@#(S$O_AO[WO_D+N+525R/# +M)R.O@WB?UR(VQO4D71L;6-39\$ +M0%#B$)9Y1`(\H@$>L1"K!_1@HX1<6:^)MJL'SQ%,#@50JNHUFU][15CF$0^) +M6-[:7I9L62`X=R2$"U,AZ`9P;;&(6RN]U37RT3\<3;.FBX,!7"__8GW]";:T@^&7D=Q/N\AYR,))X1CV02$,`R$U0U`Z62UG:/ +MA4&!%8]"6Q((0A*/D,PA;/X,B!P4C:)89<23RJLH5/6&S`NMH!L4B^G^%3LK +M5G44J[T_)2="/!X]&L;L1!#K616OS^7V3=F!@PJ1)S@S$<2%J1!B(0$/TU5\ +MZ_(FEK=\!_$^[R$C(]XLOV"1C\BQ3:Y5S4!),9#I8RD$GH-- +M/.Z?E%*4%`.EJHYL6<-*QD!)T0^$,_]HDCG$)Q,2[JQ5\+5WTM@J'CZ'^"`A +M%N1Q82J$,Q-LD_3<:@G7KVPAYU?-;8M:0O+)R.L@WN<]X&1$`(@F\5CF-TJI +M;78K5=MK/]W",K>%)`XAF;=_BCQ!66%DPW+-J2A5C0.WJUW@"$Y/!/'HT1!$ +M@N^$G.]U+\!PP/1S`Z8D@C@W+R)4T7)K/8\XWEW8-AY!\,O(ZB/=Y +M!XB,NNK2!1E9@0WZ12EJHZ28F`C +MKZ*4KJ*B&'T/KA@DC$1%G)L,XN18$-FRAGCMHWV&QE9Y".8Y"-P9N"!9C`" +MJM!M/0GR'-L`&ZXSMP%`2=%1JAK,W)8U4%;T0[.!4Q8(9L>#.'LDA&B`Q]VU +M,KYU>1,;^<,;'KS7&(F*F!T/X.18$"&)PUI.Q:5Y5K;=KPW5.SR6G_#)R/.\ +M^Y2,ZC4?P?+[Z-LG'P(@8)K;PBYSFR28YK:J@:*B8ZNHH:3HA[;4P61"PKDC +M(1#S((U/2<'VIB#MK%3]DNT_P +M4'[")R//\^X3,JHA']XA'Z6.?+Q.*0FLBJKU"DK.3T5SS&TIT]Q6/N#FMFX0 +MDCB[6,O[Z40K;D"[R]0%#B<&HL@%/C08Q&112K.NZN57!W +MO7PH,RGL-+HL/^&3D>=Y!Y2,6FD^BF9`40T4RLTUGU936J6[ZXE'%C@8E-4> +MJJ@&*HJ!S8*&BLH"#@Z+N:T;$`),#\LX.\GVJ"QM5?'671:R[2M#NP])(#@^ +M$L#L>`!'$C(4W<#\>@4_O9/WLUOL,+K(9>>3D>=Y!X2,FOI\]!8^GQ;C$@!2 +M#>$0!"2>_10Y:#IU2$9R1#.3`2A&Q2W5LIX?>[P +M)-(<)"3#`HX-RY@>EC$6DV!0B@>I*EZYRH(3_*_R[J`#(?EDY'G>/2*C9M%N +MFKG71]$,Y"M&2ZW$\NG4:SH!B8VE6J2C,-+)YQ2;@'Q-QQMX#C@Y&L29R2#& +M8B+NIZIX[4;&WRBYRQ`X@B-#$J:'91P;EA&6>12K.AZFJ[B\4,3REN(_4.T! +MVA"23T:>Y]T%,N(YEO6ZIJR`23Y6I@.+?-SSW6J8E\M%_Q(,\CID$-)E@^0#7 +ML@JN+Y6PD*[ZFXD'`"T(R2)QTO'HAJ4A668Z +MBE))0]5,3EI5ZR+8VBS.OT5[QW!$P*FQ($Z-!R!P!/,;%7SO6@8K&=\DMQL8 +MC@@8CTLXFI0QF9`@\`0;.16W5\MXF*X@Y4?$`*ZR93X9>9[7`QD)'(%8 +M1SR2P($0"@("0MA3'<\1B`)G)R"US'%6Z>VJ:J!8U6P"0`CEA1;Q2*QLH%!`+"3@:)*5A19Y`@K8&9*S)492 +MV9*&;%E'6>E\YQT4,N((,ZV)9JT>@2.0!6*334#D($L<))X#S['"<575,$.@ +M=>0J.A35,#>;LG.J3DVRZ3VTVU,7GXRVA8#(X<1H`*?&`QB+25C:JN+*PR(> +MI*H'+GGK("`6Y$WR$3$>EY`("3`HD,ZK6,TJN+Q0P%I6]5/U'"`(`*!H+.8> +MJ$T&&)0XQ$,"XD$>\9"`1$C`]+",D,SRBVDZM;6H8E5'H:*CX/K9]9/B'I`1 +M@14TX+P$@6LX9@45\!Q`*1N24@J`N,QGK)9.R8Q0YT[O,VH_0F^-?'':'(D0C^,C`1P? +M"6`D*F(]I^#^1@4_O)E%J0NK@(_VB`5Y#$=$#$<$)",B1J(B0A(KTEBHZ-C( +MJ_A@H8#5K(IT0=UVMG@?^P=-":E3`(.F4Z0+6M-<3H0`D0"/B,PC;/YT$U9( +MYL$1IJ%4S7QF5ABR%9)L.>L)ZDF%_TUGH="*1J$;AGU> +M-UAF`DUGQ"/PCD9DD9054JT9%*I6I^WLPCXC[R/TULB_QQT0L!#MZ9$`9D8" +M",L<%C<5W%QF^U-\DU!OX`C+@)",B!B.,@(:CHAV%.E6446ZH.'R0@'IO(;- +M@NJ'81]RV(3$$>9DAQGI10BQB8,C+`*,F&UJSIOO>0)P=9H(9VHAA8J&LD*0 +M)HS`ZJ/,@B+;.R.+;-^,I7M45`.%BH%\14>AHB%?T;%9U)`MJ2A4:E/3M!+L +MEN_'VM,3$!D)&91I.JK.*HFJ>H>L`SM%1CW>?SX9;0\\QRJM'A\)8'I8!@6P +MD*KBS3LY+&U5?;.01X1E9MY/A@63?$0D0@(X`E0UEL"^/61MS:B6Z8 +MVD8;,QU'@+"I545D#N$`CVB`1SPH8&I(1DCF[##UBLK,@?D*JX]3KM9J6800 +M4&L_CYE&IUBE-0[HW1?L/AGM%0(B\P<='PG@:%)"H:+C0:J*[US9PGK.WZS: +M";)($`\*-7YEZSW/L;NR4-&1*JB8WZ@@G5>Q6=!0J/I1;SZZ@P`PP?[^0KGV +MC`?)Y4G(=?`9&13(5_2FH9L\1R'Q!-&@@'B(1S0@(!KD$99X),."7=X`8*19 +M5@SD*QJ*50.EJHZR:1ID+U;ZH*PV9BGHYL/Y9+0_$`_QF!X.8&9$QFA,PD9> +MQ4*J@K?NY?R2#DT@<`3Q$(^8>8]9?N)XB( +M/K:#YD$->T1&`.R4.7;P@?F>YQRMJZ(:*&SJ4(VJ[2^R0,R<;=&`@$B`0\3\ +M&0L)F+!J\I@.5`N5&J)BY1&:_6X5BO/):'`A"P1321E'DS*FAB0$1`Y+6PKF +M5LMXY6KFT/N#!(X@'&"%$=U^WFB`1SS$(VQ&T%H/AKF2AO6<@MNK)NF4-3\; +MN8\=0R,A[0(962'7O)MXS)\&94$'5O!!536@&8W^G58^(TJ!8M5`L:H`V=;+ +ML>KV."]6N30H<1B-20B:YR7!R6.A&["U*T943,,JFX7FK',5M;ZFD$]&.P5" +M@/&8R`@H*6,D*B)3U+"T5<6/;N6PDCD\_B">8^9N]N(0"?#V[^P]9VLY`.Q\ +MB(6*CEQ9PT*::3NY$O/7^CX>'[N-6D+J,QDQD@$$0LR(-G8,`%0#-O&4%<-^ +MW\U,_8A,*ZN,3%!L/R7/`4&);R"OH,ARR@U'!/L\[U*\#(,Y,U!5F=^MTB8S@T]&M8@&>!PUM:#)A`2=4BQOL:S-2YO5`Q6:30#( +M==5V`Z*3_<,BGW"`?28#(AV204 +M"?!8S2A8VJKBW?OY?5-*VLG@[D27!LSOBUUIMXYT))&#^QOBKL)K:>I+6YJ] +MQ\_2>'Q?CH_]"$9(;;Z[!'!,:QP+[19X9V^0M>_'VF1:5IFVTRF:KC/VGHR\ +M3F?EI,M"MWMU,M,1,"*S2$H6&4D%1(>P9)%#2.*1"!.[C2QPX.JXC%)`T0WH +M.H5F[LNR'PIEY`K:UC: +M5/#&[1Q6,CM3/,TR)5ND83]HN1ZV1-=YM[F9'3>M`#SG.N:<)XW/'M"-VI(@ +M%=5`*J_6^#7==:I\K<;'088`L"@UQSO!($06PMC),5R[=E_0_M!PM%4WD9@T,"H?( +M&LB,MOYNT-J@$#O4'T`XP",69,[U:$"`3BER9N[$A70%BD8A"@0SHP',C`:: +M7$6TC9;D7==`K"<8U_>^'2QR5JV?=61O6P%TK28+B-:DO:(QLO%SX/GPX4`` +M8$?<6$_$5;,T==.-I]W`)Z-="6#0*(56I3513_T0;QQ!#8G5D)N+Y!B)H2FY +M\Q3T:#$,!@4+#:2WUZ>I=X +MPK(V)R1,)EC9@$)%Q_U4%2N9O%\RP(UX).1MQGW.QGU`U;=FLD$ +MJULS'!&1+6M8R2BXNEC$:D8Y4)%P/GSXZ`_:$I)/1MYF/(QD)'`$(U$1(U$! +MHU&6N3D6%+!95+&24?#^@P)6L@JJZB!1I@\?/@81;?C':6C-HTV$F1 +MSW-`TB(?\S44$E`VPY)3>17WUBM(Y=6N*@?[\.'#1R<(7WS6P*_^S`GP/+^] +MD3K%"N_J,'T:I4^?J1_HQU+:1J@1%NY-7.5'6(7"\JY(EEIIVO2Y`&NR5S.I6V^D-;K[/KTOEOU=TU;]>^OE_MYVF_@+;7O,6%KF&S>?J?,UK2;2[:\[Z>+_FW3\DLK%K +MU]>IO;.^=N#:G_;APT=WV&DR\KZ6?K7O23/JT?:^G:?T;MMWW\>+=M19,^JV +M??MYNL%@7O-NX!.2#Q]-,%B"LR(8=Y88!^N:#Q(9>7D(V,EK[IZGJY:> +M^_F$Y,-''7S!V&F>]AATP=A+^UZN12_7O-?VO:W/^UKZ_P#EC`WXA.3#1PU\ +MP=C]6KJ?JU.?P1.,W?=I?K(_Z]LY\VBO_M%>VGNYYCXA^?!AXO`(QLZ+/NR" +ML;L^7LEH<'QUWK![)FF?D'SXP&$3C!UF]P6CI['[T=X/'&'P"/W<;@W*3],P'Y@M&:QUO[SOUV +M\IIWCX,8.`+X&I*/0X[!$HQ-1O`%HVN>KEIZ'7D;=%XSNN;R/[0M&9^S=$HR]7/->V_N!(ZXC=8<$`"A_ +M\Q*J8FTEBL"%:4@GQKM=F0\?!Q0[>9/VAXQZ;>\+QNVU]0-'K'F\M6_7CVE( +M38+L*M<70'6_SHV/@X7!N4G[)XQ\P6C-XZU]YWX[>G/EZON5>-M'OL9_]H6Q\2-0P4?G"U +MTXP^?`P\?,'8JH\7P;C39#0X@K'59WC[S?X``!2+241!5-V;*,;NQ]_?_M$N +M@AJ,0AGER_.=FOGP,;#P!:.WL;N;JU.?_2P8O5SSSO`#1[KIPTYV%66G+J90 +M?O^>]Q7X\+''\`5CJWZ^8.PTMM>U=)YK9Z_Y8)FDO:\%\!#VK2ZE47SCIH=) +M?/C8;]C)F[0_9-1K>U\P;J^M'SABS>.M?>=^M2<\[4/2-_,H?/>RERX^?.P9 +M!N0U[QZ'/7#$\\98HZ(@]_(E4,T/"?\S40)'_VW=0_/%U?Z^2CX'# +M_A6,.TU&OF#LMGWK/CNC8?J!(PQ"TZ-=0L\6D?_V.Q"&8Y!F)R&,Q+8SG`\? +MV\;^%HPM1CF`@K'_FJ4SMK<^7LBH,_S`D6[ZM#ZY+4*RH*5S;#"?D'SL(7S! +MV*K?X`G&7MK[$77N?H-DDO:^EE;@"/I1H(\@],+9;8[AP\=N8B<%8W_(J-?V +MOF#<7MO="APYJ-=\.R;IOF3[CGW^V7X,X\-'SQB;^T[]]O) +M:^X5.WG-K3X[LY:=N.;;)B1Q,KG=(7SXV!8&2S`V&>'0"\;>KWFO[?W`$3;^ +M?O./"LV'[A[JRB;4ESRZ4RN4WIY#[N6W4;FQN.VQ?/CH!%\P=K^6 +M[N?JU.?@"48_<&1[5H!>R:A9/]MD%_W,DY#/'O6^FB90[JT@]\U+,$I*7\;S +MX:,>OF!LU>^P",:=>TKOIKWOJ]M>VU9SU?B0Y-E)1#_W+)I6[/,*2E%X[3+* +M[\]O?RP?/ES8^0V!OF!LWF^0!*,7[*1Y]#!=\YTW23<$-1".(/;Y9R%.#7>Q +MP,Y0EU(H?//YMC)F[1_Y.(+1FL>;^T[]]O):^X5@WG- +M>VV_$]>\991=\,F3B'SJR98#>X%149#_UB54KC623^#"-`K?O]*7>7PIZN6'OMYM0*T&*6+:\ZUL\YQ`1&Q +MSU^$-#/N??8F4.ZO(??RVZC>7JXY+DP,(>]G$??1`;Y@[#1/>PRZ8.REO1\X +MPM8RZ/[1;M'5/J3`(].(?O89$('?UF06JG-+R+W\-DIOWH)14A`X=Q2THJ#P +MO0_Z,KZ/@P=?,':_EN[GZM3GX`G&00\<.:C^T6Z_ZUUOC"4"A^AGGT;H^?ZE +M"-+2.11>NXS<-R^!CX5@E*LH_.!JW\;W<3!P>`1CYT7[@K&;/E[)J/_FT=V, +M8CQ(@2.>,S4((S'$/G\1PFC":]?6H!1ZK@0`,`IEOS*M#QN'2S!VF-T7C)[& +M[D=[/W#$=6073-(]IPX*/7<:T9][!EPXT.L0+:%OYE%^[U[?Q_5QT+&3-^GN +M$6/3L[Y@[*)?_P1C8Y^=_?O[UYQA6[GL",\A\C./(?(SCP/;SAA>"W4Y[>]A +M.N08G)NT?R8@7S!:\WAKW[G?3E[S[M$L<$11%.1RN39]O$^VN+C4[8IJ?LO\ +M_?\5Z\=^$\;29E?M@=ZN1:\FZ;YD^^;",F(O/8O()Y]`7S;5FE"74DU#Q7T< +M?`R68&PRPCX4C)W[>)_,#QQIG*M<+B.52F%N;@[__)__-L;')[&^OMZB3^>Q +M2Z423 +M4G],TMM!7PKT6>""$F*??Q;:6@;E=^[T]`6OAW)_#535$7SR1!]6Z&,_P!>, +MW:^E^[DZ]?&^%C]PI%D?BG???0]?^,+/UYR?G9UMTJ>[L;_\Y2_C7_R+_['F +MV,3$1#>KLM^E7_P=Z/?704U]@4H\4H__-D;G?A\D&4$_R6@[#UY]*M!7"V$\ +M@>A+SR+\XOF^C*OMFG_H0R_4G/__V[OV +MZ";*+/Z;2=*D34J;-GU!6\J[U"+04H];Y8@'?+!%7!Y+U045Q<0-%C +MJWM$5Q'WL.!Q#ZOR$`2E*Z*M4A"*"RST0>F#2ENTM*70AZ4\FJ:O)/M'R21? +M9J:9:3-I6N=W3@_YON_>^]VY"??.]WUW[B@4_7M<9MFR91@Y]F!SC-+`L]NC[MTRQ7\HC=DDY,3!#!S[8Y[>^+H&-_@\(0``H4`G:_!)\[8UGTSGR]R1;&(VY+ +M6M*`9`.E4L!_=B+\[TV`(E#;+UDWOLM'YP7N_5@9OR5(Z1BEWDOWC&,4QB?. +M,9)S":,7SB->%\Z1?CO&_G^?HT;9CQB<;=P7FX>%":V6PV]S6J]#T*'7,>R# +MQZ&>=2N+GH^/2[8P'G'!"'#S&9(K4"H%M'?$`0`ZJQKZ7%BU_6PU.BKKH)MQ +M*RB5>ZI'R!A8>(]C=%]P\0;'V/ML387NR+EAN.YO&W[KC_GH\[;?EJM +M\TZ3\RK,M6R3R01?7U^!/.+^C[:V&J'3\>^&\=UX#5A`LH%2T!B6,@T`T'FA +M$1T5=;!V=0OFMYHMN)Z9!]I7#2T +M>79V-C9L^`"%A6?0U=4%H"?P3)DR&:^^NA;3IMEOM",B(CAU*2@XC;2T=.3G +MYZ.KJPNAH:&8/?M^O/_^>H(N-S<7)I,)9\^6H;BX&`4%!4A/3T-*RN^9:ZJK +MJ\/NW7MPZM0IE)65H;.S"RTM+0"`X.!@1$9&8N[<.5B^_'G0-W,";)>5F9F% +MAH8&5%96(C^_`-75U:BH^`G-S2,9 +M;H?L&,7)YI]+N'PY<82/3[C-K58KMFS9@C5K7F:-F\UFE)7]Y%+.BA4KL6W; +M=E;_M6O7L7_\>EBY]G%,_BJ)P[-AQ//C@'XC^QL9&;-NV'5]_ +MO1]%187,2FKTZ-&(C8TC:&-B1C+7].*+?\'GG^_FU;>YN1G-SEO,.V0$`-,)A,F3HQGR:JMO8B//OH7?OVU&9LW;R3& +M/)+4(!:4@H9Z;`2&I21A6$H2_)+&B^*WM'7`5%")ZYEYN)Z9!^-QUS\0&9Z% +M[!CY^*0+1N+AV>W1P9(XDI&1P0I&@8&!N/_^^Y"4-,WE=MK*E7]E@A%%47CX +MX8>P<^<.K%RY`AJ-O13;ZM5KF)63,_S\_%C!R!%7KU[%4T\]S;0-!@/BX\G@ +MX*AG4E(2,>;CXP.M5@N=3@<_/S]BK+R\',N6/4WTS9@Q@VC[^OKBL<>6,I^U +M6BVSJK)A[]Z]L%@L1)]7!B1G*$,#F."D38Z#0N\OBM]\M94)3MS9>>VTM2DOM[X6S6"QX +MXHDG.>6L6K4&`'#WW3-P[MQ9;-JTD463G7T0]?4-3#LL+)1%8[-%:NHB:#0: +MA(:&(#O[>U14_(3SY\N9/V?Y)27D3D',6^?1DH+R]#1<4Y +MY.0<9LV_>_<>HCTH`I(C%'HMM,FQ&):2!-VL*=#<,E)T@5>+J0,=E74PGO@) +M-PX4W`Q4^3`>+T-[62W,U]HDTEX&X$V.T7W!1J:7HFGXC!L.]5CN0T49XN!=CI%#PB!QC.)XQ$\F)XXX\_709F1D +M$&///ON,(!DV%!>7,)]'C!@!E4K%Z&+3;]*D6W'FC'VE1#I_.]Y]]QT'_8"Q +M8\<@-345>_;85QWY^?D0?,>1&9F)M,^?_YG8GQ0!R0N4`H:B@`_^$X>!=_)O=>_L[1WP=K>R?QK +M[>B"Y>:_5K.EYYNV6-%]Z4I/<+-8`(4"FK@H*(+\0='N+;DTU#%X':/4P4B\ +M8Q0*.7%$G&Q7/&(B0DA*7?,\\\302DA@:Q103X=5>KU:(DW7)+'&L7P/E,S'G5-N0"DAC0 +M&A6@44%^M%9Z#&['R"-E`!VC,!XI;>X\EVO9XGC$!"/7D.*L+CHZ6I0.QX\? +M)]H]]>C8NP#.M46Y:HTF)"1PVD*O)S.+32:3"`WM`@L+"W'@0#9HFD9143$F +M3YZ,FAK[V5B/3OQV-!B"^_1=_:8#D@S/0':,?'SN<8SN0=\#Z5#.J.N-?M(D +M=DIS;[]UQS1I`-BPX0-LW/A/%AU?9ITCG(NMVN?@O[V.CX_'P8.'>$9[]'[D +MD<4X<>($C$9R59:=?9!HLS,)2;"#J#"[RP%)AI=!2L?HGF#45WHYHZY_M)Y* +M'!%J?_XYI*6]3E"FI:7W(2")^ZW+`4F& +M9/`NQ\@A88@X1G(N\9/)B2/.?,)HV]O;;_((H_?U)1]/T>ET2$]/(-H&@X&QA6/`<41-30U.G5[><^]-B1EF.1#'?#DW?ILF.T\4@9C)SG#2BD._WM!#9#0:D9'Q'Z;W +MN>?^+(09"0E3B?:WWW[+DKUJU6IR1JO8WY$PR`%)Q@!!2L?HON#BK8[1SN=- +MP]'8V$A4>.#3_8$''B1&7GYY#='FRQ4( +M"PLGVE]]M0]OOODW`%945]=@YLQ[<>1(#FZ__7:&QF@T2G"#(F?9R7`3O,LQ +M2Y<^CD\_W'"A5]89T-'CN1`I5)!J]6BM+04'W[X$>KK[34XL[*^A8^/#\'3 +MU/0KT;9MU8T9,P8JE8IX)FK3ILU$BGI$1`22DA)Q\N1)3KN83&3"`T5QKW7: +MVSN84DH]^0':.K>7J'9S+J^F;SOM(/Y<21]>O?P]2I4WGIUJY]!=W= +MY%NOCQPYPGR>-6L6=NWZC,7WRR]5*"DIQ>'#AU%65L8$(8U&@_/GSQ.T.W9\ +MAB5+'L/\^0OQ^NOI3#!2J]78M6LGZ_U&@)551JBJJHKY?.S8?WFO1Z52X="A +M;-:S3Y65E;RRG<_1@!Z;Y^7ELZ[9$7)`DM$OR(Y1N"["YW+%(UX7.7&$BT?X +MI(XVIR@*/_QP$,N6/0F#P0"U6GUS91."CS_^-Q8O_A-T.AWT>CV&#X]`>'@8 +M*_GAOOON0W-S$Q8N7(`1(T9`J]5"H]$P?VJU&L'!P1@W;BR42B66+%F,Y.3? +M(3@X&#I=#RU-TZ!I&FJU&F%AH7CTT26X>+&&(Y&A1_>VMC9$1T +M#H,A&&^__7=&=FWM100&!B(Z.@K1T5'P\_-%75T=R^85%16(BHI$5%0DHJ.C +M6*GOU#OOOF5]8?E**!72QZ:A]KS3;_UZI'>,_3LWLEI[NR:QCM$[SHWZFCCB +MJ;,Z]P8C[[!Y#Y^\"\#-XUIAH3;?NGTKE&8+K/_8N*'?KE6('8>8__889+/U +L'4/M-R?%0?)`8HA=3@\\=%%#S78*&O@_Q_*6F_+5?!\`````245.1*Y"8((` +` +end --- gnome-session-2.27.92.orig/debian/55gnome-session_gnomerc +++ gnome-session-2.27.92/debian/55gnome-session_gnomerc @@ -0,0 +1,20 @@ +# If we are running the GNOME session, source ~/.gnomerc + +BASESTARTUP=`basename "$STARTUP" | cut -d\ -f1` +if [ "$BASESTARTUP" = gnome-session -o \ + \( "$BASESTARTUP" = x-session-manager -a \ + "`readlink /etc/alternatives/x-session-manager`" = \ + /usr/bin/gnome-session \) ]; then + GNOMERC=$HOME/.gnomerc + if [ -r "$GNOMERC" ]; then + . "$GNOMERC" + fi + # We prepend /usr/share/gnome since its defaults.list actually points + # to /etc so it is configurable. + if [ -z "$XDG_DATA_DIRS" ]; then + XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + else + XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS" + fi + export XDG_DATA_DIRS +fi --- gnome-session-2.27.92.orig/debian/changelog +++ gnome-session-2.27.92/debian/changelog @@ -0,0 +1,2330 @@ +gnome-session (2.27.92-0ubuntu2) karmic; urgency=low + + * debian/control: + - gnome-session-bin Breaks/Replaces gnome-session (<< 2.26.1-5), + to ensure that the old gnome-session package is deconfigured before + installing gnome-session-bin on upgrade. This fixes a race condition + when registering GConf schemas (LP: #424511). + + -- Chris Coulson Mon, 14 Sep 2009 18:28:35 +0100 + +gnome-session (2.27.92-0ubuntu1) karmic; urgency=low + + * New upstream version + + -- Sebastien Bacher Wed, 09 Sep 2009 22:07:00 +0200 + +gnome-session (2.27.91-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #419588): + - Install splash desktop file in $(sysconfdir)/xdg/autostart (Vincent) + - Do not install gnome-splash.png unless --enable-splash is used (Vincent) + - Fix idle watch not working (Vincent) + - Fix typo in debug message (Oskar Wallgren) + - Use GTK+ accessor functions instead direct access (Javier Jardón) + - Remove deprecated Encoding key from desktop file (Frédéric Péters) + - Port to PolicyKit 1 (Matthias Clasen) + - Remove dependency on PolicyKit libraries (Matthias Clasen) + * debian/control.in: + - Bump build-depends of libgtk2.0-dev + * debian/gnome-session.install: + - /usr/share/pixmaps now empty as no splashscreen + * debian/patches/20_polkit1.patch: + - Applied upstream + * debian/patches/10_session_save.patch: + * debian/patches/80_new_upstream_session_dialog.patch: + * debian/patches/98_autotools.patch: + - Updated + + -- Robert Ancell Thu, 27 Aug 2009 10:58:22 +1000 + +gnome-session (2.27.5-0ubuntu2) karmic; urgency=low + + * debian/patches/80_new_upstream_session_dialog.patch: + - change the hibernate accelerator to not conflict (lp: #292734) + + -- Sebastien Bacher Thu, 13 Aug 2009 18:26:59 +0200 + +gnome-session (2.27.5-0ubuntu1) karmic; urgency=low + + * New upstream version (LP: #406344): + - Prefer compiz-manager over compiz when available in + gnome-wm (Vincent) + - Add --with-default-wm configure option to let distributors + specify the default window manager they want to use (including + gnome-wm) (Vincent) + - Use silent-rules with automake 1.11 (Vincent) + - Add --enable-splash configure option to build splash, and disable + splash build by default (Vincent) + - Add Presence interface to the documentation (William Jon McCann) + - Do not exit when the system bus restarts (Vincent, Sjoerd Simmons) + - Port from gnome-power-manager to DeviceKit-power (Richard Hughes) + DeviceKit-power is a new dependency. + - Code cleanup (Vincent) + * debian/control: + - Build-depend on libdevkit-power-gobject-dev. + * debian/rules: + - Configure with --with-default-wm=gnome-wm. + * debian/gnome-session.install: + - Don't install splash-screen related files - the splash is + not built anymore. + * debian/gnome-session.preinst: + - Add a preinst script to clean the splash from alternatives on + upgrade. + * debian/gnome-session.postinst: + - Don't try to install alternatives for splash images now. + * debian/gnome-session-bin.gconf-defaults: + - Remove obsolete default. + * Updated patches: + - 01_gnome-wm.patch. + - 10_session_save.patch. + - 19_gnome-wm-tweaking.patch. + - 20_polkit1.patch. + - 80_new_upstream_session_dialog.patch. + - 95_dbus_request_shutdown.patch. + - 98_autotools.patch. + * Dropped 11_dbus_exit.patch - merged upstream. + * Dropped not needed 97_aclocal_amflags.patch. + * debian/patches/96_no_catch_sigsegv.patch: + - Don't register a handler for SIGSEGV. We want Apport + to catch these crashes so that users can submit useful + crash reports. + + -- Chris Coulson Wed, 29 Jul 2009 18:32:43 +0100 + +gnome-session (2.27.4-0ubuntu1) karmic; urgency=low + + * debian/watch: + - watch unstable serie + + [ Chris Coulson ] + * New upstream version (LP: #399962): + - Rewrite a good part of the capplet. + - Port to GtkBuilder. + - Load default apps after saved and autostart apps. + - Honour the SmRestartNever SmRestartStyleHint. + - Default clients to RESTART_IF_RUNNING instead of NEVER. + * debian/control{.in}: + - Removed build-dep on libglade2-dev. + - Bumped libgtk2.0-dev build-dep. + * debian/gnome-session.install: + - Don't move desktop files from /etc to /usr. + * Refreshed patches: + - 10_session_save.patch. + - 20_polkit1.patch. + - 80_new_upstream_session_dialog.patch. + - 98_autotools.patch. + + -- Sebastien Bacher Mon, 20 Jul 2009 11:48:14 +0200 + +gnome-session (2.26.2-1ubuntu3) karmic; urgency=low + + * debian/patches/20_polkit1.patch: + - Change to not crash in gsm_consolekit_can_{stop,restart} + funtions. + * debian/patches/19_gnome-wm-tweaking.patch: + - Don't start gtk-window-decorator before Compiz. This is + not necessary as Compiz will start it anyway, and running + it on some setups that don't support compositing can cause + issues, as it bypasses all the sanity checks that Compiz + normally does. + * debian/patches/80_new_upstream_session_dialog.patch: + - Change to not crash when ConsoleKit tells us we can't stop or + restart the machine, or if ConsoleKit is not contactable + (LP: #399531). + + -- Chris Coulson Wed, 15 Jul 2009 20:19:35 +0100 + +gnome-session (2.26.2-1ubuntu2) karmic; urgency=low + + * debian/control.in: + - use Replaces on gnome-session rather than Conflicts + + -- Sebastien Bacher Wed, 15 Jul 2009 14:44:12 +0200 + +gnome-session (2.26.2-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #396292), remaining changes: + - debian/control: + + Don't build-depend on libpolkit-gnome-dev. + + Build-dep on xtrans-dev. + + gnome-session depends on Nautilus. We still specify a + filemanager as being a required component of the session, with + Nautilus being the default. Debian don't have the filemanager as + a required component, but use it's autostart file instead. + + gnome-session doesn't break nautilus. See last comment. + + gnome-session-bin depends on policykit-1-gnome rather than + policykit-gnome. + + gnome-session-bin breaks consolekit (<< 0.3.0-2ubuntu5) due + to polkit-1 migration. + - debian/gnome-session.install, debian/gnome-session.links: + + Don't install /etc/gnome/defaults.list - this is installed + by desktop-file-utils on Ubuntu. + - debian/gnome-session-bin.gconf-defaults: + + Don't change the default required_components_list. + - debian/patches/19_gnome-wm-tweaking.patch: + + Some magic for determining which WM to use. + - debian/patches/20_polkit1.patch: + + Port to polkit-1 API. + - debian/patches/80_new_upstream_session_dialog.patch: + + Bugzilla patch to change the session dialog. + - debian/patches/95_dbus_request_shutdown.patch: + + Add "RequestShutdown" and "RequestReboot" DBus methods to + allow other applications to shutdown or reboot the machine + via the session manager. + - debian/patches/97_aclocal_amflags.patch: + + Add ACLOCAL_AMFLAGS = -I m4 to Makefile.am. + - debian/patches/98_autotools.patch: + - Autotools update. + * Dropped debian/patches/81_gnome_wm_install.patch - the change + is in 01_gnome-wm.patch from Debian now. + * Refreshed patches: + - 19_gnome-wm-tweaking.patch. + - 20_polkit1.patch. + - 80_new_upstream_session_dialog.patch. + - 98_autotools.patch. + * This version also splits the package in to gnome-session-bin, which + contains the minimal runtime needed to actually run the gnome-session + binary, and gnome-session, which contains all the startup scripts + and has much larger dependencies, including the components which are + required by default (LP: #396657). + + -- Chris Coulson Tue, 14 Jul 2009 20:59:51 +0200 + +gnome-session (2.26.2-1) unstable; urgency=low + + * defaults.list: use brasero-nautilus instead of nautilus-cd-burner. + * 55gnome-session_gnomerc: make it clear that /usr/share/gnome is not + a symlink to /etc, since users are stupid enough to think this + should be the case. + * New upstream release. + * 01_gnome-wm.patch, 10_session_save.patch: updated accordingly. + * 11_dbus_exit.patch: replaced by the much improved version provided + by upstream. + * 12_desktop_crash.patch: dropped, merged upstream. + + -- Josselin Mouette Tue, 07 Jul 2009 22:43:05 +0200 + +gnome-session (2.26.1-7) unstable; urgency=low + + * 12_desktop_crash.patch: new patch from Petr Gajdůšek. Use + g_ptr_array_free to free a GPtrArray, not g_strfreev. + Closes: #532702. + + -- Josselin Mouette Mon, 15 Jun 2009 12:00:24 +0200 + +gnome-session (2.26.1-6) unstable; urgency=low + + * 01_gnome-wm.patch: + + Don’t set LIBGL_ALWAYS_INDIRECT, compiz does it by itself if + needed and it slows things down if it’s not needed. + + Don’t enable the glib compiz plugin, only the gconf one; the glib + plugin makes it lock up on startup. Closes: #531388. + + -- Josselin Mouette Tue, 02 Jun 2009 14:41:45 +0200 + +gnome-session (2.26.1-5) unstable; urgency=low + + * 01_gnome-wm.patch: + + Actually install gnome-wm.desktop, it’s pretty useless otherwise. + + Don’t read the GConf key, it’s obviously set to gnome-wm if we’re + starting gnome-wm. + + Make compiz the default if compiz-gtk is installed. + + Remove a few unneeded things from the script to make it start + faster. + * gconf-defaults: make gnome-wm the default window manager. + * README.Debian: document how programs are started and how to + configure the different kinds of startups. + * 90_relibtoolize.patch: updated. + * Split the package between gnome-session-bin, which contains the + minimal runtime needed to actually run the gnome-session binary, and + gnome-session, which contains all the startup scripts and has much + larger dependencies, including the components which are required by + default. This prepares us for GDM 2.26. + * Update the list of copyright holders. + + -- Josselin Mouette Sun, 31 May 2009 18:18:06 +0200 + +gnome-session (2.26.1-4) unstable; urgency=low + + * gconf-defaults: remove the file manager from the required components + list. Now that nautilus has an autostart file, this is no longer + necessary. It avoids restarting it endlessly when this is not + required. Closes: #525718. + * Break nautilus << 2.26.2-4 to ensure the autostart file is here. + + -- Josselin Mouette Sun, 31 May 2009 14:04:06 +0200 + +gnome-session (2.26.1-3) unstable; urgency=low + + * Stop mentioning GNOME 2. + * defaults.list: add nautilus folder handlers and x-content handlers. + Closes: #530567, #530691. + + -- Josselin Mouette Fri, 29 May 2009 10:34:21 +0200 + +gnome-session (2.26.1-2) experimental; urgency=low + + * prerm: only unregister the alternative when deinstalling the + package. Closes: #524900. + * Break xserver-xorg << 1:7.4. See GNOME#568989 for why. + * Drop build-dependencies on gnome-keyring and libgnomeui. + Closes: #526960. + * copyright: + + Update list of main authors. Closes: #526963. + + Point to versioned GPL. + * 11_dbus_exit.patch: new patch. Don’t exit when the system bus is + disconnected. Thanks Sjoerd Simmons for the hint. + + -- Josselin Mouette Thu, 21 May 2009 10:55:25 +0200 + +gnome-session (2.26.1-1ubuntu2) karmic; urgency=low + + * Add 20_polkit1.patch: Port to PolicyKit (which essentially means to rip + out all PolicyKit code, since the backend now talks to the authentication + agent itself). Patch taken from Fedora (see patch headers). + * 98_autotools.patch: Regenerate to include changes from above. + * debian/control.in: Update polkit dependencies, add Breaks to older + consolekit. + + -- Martin Pitt Mon, 13 Jul 2009 14:52:14 +0200 + +gnome-session (2.26.1-1ubuntu1) karmic; urgency=low + + * Sync with Debian Experimental. + * debian/control{.in}: + - Add XS-Vcs-Bzr URL. + - Dropped build-depends on libgnomeui-dev, gnome-keyring. + - Added build-depends on xtrans-dev. + * debian/copyright: + - Added new authors. + * debian/gnome-session.gconf-defaults: + - Set gnome-wm as the default WM. + * debian/patches/19_gnome-wm-tweaking.patch: + - Use GConf key to set default WM. + * debian/patches/80_new_upstream_session_dialog.patch: + - Bugzilla patch to change the session dialog. + * debian/patches/81_gnome_wm_install.patch: + - Install gnome-wm.desktop. + * debian/patches/90_no_debug_flood_by_default.patch: + - Ship patch to disable debugging by default. This patch should + be re-enabled during the gnome-session development cycle. + * debian/patches/90_relibtoolize.patch: + - Dropped in favour of 98_autotools.patch. + * debian/patches/95_dbus_request_shutdown.patch: + - Add "RequestShutdown" and "RequestReboot" DBus methods to + allow other applications to shutdown or reboot the machine + via the session manager. + * debian/patches/98_autotools.patch: + - Required autotools update. + * debian/gnome-session.install: + - Don't install /etc/gnome/defaults.list - this is installed + by desktop-file-utils. + * debian/gnome-session.links: + - Don't create hanging /usr/share/gnome/applications/defaults.list + symlink. + * debian/rules: + - Don't move autostart files to /usr/share/gnome/autostart. The + upstream default is to install them in to /etc/xdg/autostart. + + -- Chris Coulson Fri, 08 May 2009 19:54:30 +0100 + +gnome-session (2.26.1-1) experimental; urgency=low + + * 10_session_save.patch: fix bug that leads to saving the session + every time a SaveYourselfComplete request is received. + * New upstream release. + + Refresh or regenerate patches. + + -- Josselin Mouette Tue, 14 Apr 2009 19:24:09 +0200 + +gnome-session (2.26.0.90-1) experimental; urgency=low + + * New upstream release. + * Require gnome-settings-daemon 2.26 for the startup mechanism change. + * Don’t require gnome-control-center, everything needed should be in + g-s-d now. + * 01_ignore-gdm-lang.patch: dropped, merged upstream. + * 02_gsd-spawn.patch: removed; fixed upstream in a different way. + * 03_powermanagement.patch: dropped, upstream finally standardized the + logout dialog. + * 04_at-spi_startup.patch, 09_splash_hide.patch, + 10_update_notifier.patch: dropped, obsolete. + * Rename 90_autoconf-autoheader.patch to 90_relibtoolize.patch and + regenerate it for the new version. + * Remove files corresponding to obsolete components. + * Remove gnome-wm from the default session, it has a startup file now. + * Remove debian/gnome-wm and patch the upstream version with + 01_gnome-wm.patch instead. + * Document how to change the Window Manager in README.Debian. + * Massive update to build-dependencies. + * Make dbus-x11 and policykit-gnome dependencies. + * Remove manpage hack, not necessary anymore. + * Install all autostart stuff in /usr/share, not in /etc. + * 10_session_save.patch: new patch, based on the patch by Ghee Teo. + Enable session saving from the capplet again, and make it work on + the manager side. + * Use patch-translations.mk, require gnome-pkg-tools 0.13. + * Add translations based on the strings in gnome-session 2.22. + * Break gnome-panel < 2.26, since previous versions (2.22 and our + patched 2.24) are not able to talk to this version. + + -- Josselin Mouette Sat, 11 Apr 2009 15:30:31 +0200 + +gnome-session (2.22.3-3) unstable; urgency=low + + * 55gnome-session_gnomerc: change XDG_DATA_DIRS to include + /usr/share/gnome when gnome-session is being launched. + * defaults.list: move the defaults from gnome-vfs. + + Add some subtypes of text/plain to gedit defaults. + * gnome-session.install: install it in /etc/gnome. + * gnome-session.links: link it from /usr/share/gnome/applications. + * Standards version is 3.8.1. + * Conflict and replace with the older libgnomevfs2-common versions. + + -- Josselin Mouette Thu, 19 Mar 2009 22:25:42 +0100 + +gnome-session (2.22.3-2) unstable; urgency=low + + * Recommend dbus-x11 instead of dbus for the availability of + dbus-launch. + * 04_at-spi_startup.patch: new patch. Do not try to start at-spi if it + is not installed. Closes: #501407. + * Remove build-dependency on esound. + + -- Josselin Mouette Fri, 24 Oct 2008 21:07:03 +0200 + +gnome-session (2.22.3-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/90_autoconf-autoheader.patch: + - Updated for the new version. + * debian/control.in: + + Update Standards-Version to 3.8.0, no additional changes needed. + + -- Sebastian Dröge Mon, 30 Jun 2008 12:28:28 +0200 + +gnome-session (2.22.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Drop dependency on gnome-power-manager. Closes: #472202. + + [ Sam Morris ] + * Refresh 01_ignore-gdm-lang.patch, 02_gsd-spawn.patch, 09_splash_hide.patch + and 90_autoconf-autoheader.patch. + + [ Josselin Mouette ] + * New upstream release, includes migration of the trash to the new + location. + + -- Josselin Mouette Wed, 28 May 2008 02:10:26 +0200 + +gnome-session (2.22.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastian Dröge Wed, 19 Mar 2008 02:34:13 +0100 + +gnome-session (2.22.0-1) experimental; urgency=low + + [ Josselin Mouette ] + * default.session: remove gnome-cups-icon from the default session. + + [ Loic Minier ] + * Update 02_gsd-spawn's header to give a bottom line explanation on the + rationale for the change as I keep forgetting why we need tihs. + + [ Josselin Mouette ] + * 02_gsd-spawn.patch: fix cosmetic issues asked by upstream. + + [ Sebastian Dröge ] + * New upstream stable release: + + Upload to experimental first because of intrusive changes. + + debian/control.in: + - Update build dependencies and dependencies. + + debian/patches/02_gsd-spawn.patch: + - Updated to apply cleanly again. + + debian/patches/90_from_bugzilla_fix_session_sounds.patch: + - Dropped, merged upstream. + + debian/patches/90_autoconf-autoheader.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Sun, 16 Mar 2008 19:58:07 +0100 + +gnome-session (2.20.3-2) unstable; urgency=low + + [ Loic Minier ] + * Include CDBS' utils. + + [ Josselin Mouette ] + * 02_gsd-spawn.patch: updated to spawn gsd through g_spawn while + still waiting for it to answer to dbus before proceeding. This + avoids a race condition leading to applications being started + before g-s-d is ready. Closes: #454149, #465483. + + -- Josselin Mouette Sat, 16 Feb 2008 14:44:50 +0100 + +gnome-session (2.20.3-1) unstable; urgency=low + + [ Josselin Mouette ] + * 90_from_bugzilla_fix_session_sounds.patch: fork the shell that + encapsulates esd in the root directory, so that the home directory + can be safely umounted upon logout. + + [ Sebastian Dröge ] + * New upstream release with translation updates. + * Update Standards-Version to 3.7.3, no additional changes needed. + * 90_autoconf-autoheader.patch: regenerated. + * Build depend on gnome-keyring as configure checks for the + gnome-keyring-daemon binary. + + -- Sebastian Dröge Sat, 12 Jan 2008 07:16:22 +0100 + +gnome-session (2.20.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * gnome-wm: + + Fix indentation. + + Support for compiz. Closes: #448560, thanks Andreas Klöckner. + + Also use compiz if metacity is unavailable. + * 02_gsd-spawn.patch: spawn gnome-settings-daemon using g_spawn + instead of DBus. Closes: #339785. + * Require libgnome-settings-daemon-dev 1:2.20.1-2 to obtain the g-s-d + path from pkgconfig. + * Switch to quilt for patch handling. + + Refresh 01_ignore-gdm-lang.patch. + * 90_autoconf.patch: re-run autoconf and autoheader in the sources. + * Add some references in the patch headers. + + [ Loic Minier ] + * Only suggest desktop-base; the desktop meta packages should pull branding, + not gnome-session and gnome-session has a default branding anyway. + * New patch, 02_no_warning_crash, doesn't make critical warnings fatal when + the version number has 3 dots as in dev releases as this makes the desktop + too unstable. + * New upstream stable release; translation updates. + - Update patch 90_autoconf. + * Don't force an upper bound in gnome-control-center versions as this makes + updates too hard; some configuration might be missing in the interim, but + the session should still start properly. + * Rename README.debian to README.Debian. + * Disable the splash screen by default to speed up login and document how to + enable it in README.Debian. + * New patch, 10_update_notifier, adds update-notifier to the list of known + applications. + * New patch, 09_splash_hide, hides splash screen unconditionally when all + apps have been launched as to avoid it staying visible with broken apps. + * New patch, 03_powermanagement, shows hibernate option in logout dialog if + gdm supports it; will probably disappear with either the gnome-session or + the gdm rewrite. + * New patch, 90_from_bugzilla_fix_session_sounds, fixes playback of session + sounds; GNOME #466458. + * Refresh patches 03_powermanagement, 09_splash_hide, and 10_update_notifier + to apply cleanly. + * Rename patch 90_autoconf to 90_autoconf-autoheader to clarify that both + autoconf and autoheader need to be run. + + -- Josselin Mouette Wed, 28 Nov 2007 16:01:56 +0100 + +gnome-session (2.20.1-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Fri, 26 Oct 2007 12:21:23 +0200 + +gnome-session (2.20.0-2) unstable; urgency=low + + * Conflict with bug-buddy << 2.20 for breakpad support. + Closes: #443638. + * 01_ignore-gdm-lang.patch: ignore GDM_LANG. This only serves the + purpose to break anything that modifies locale settings. + Closes: #445646. + + -- Josselin Mouette Thu, 11 Oct 2007 22:35:32 +0200 + +gnome-session (2.20.0-1) unstable; urgency=low + + [ Josselin Mouette ] + * default.session: don't run vino-session as gnome-session has + included this feature for 3 years, d'uh. + + [ Sebastian Dröge ] + * New upstream release, no API changes: + + Clarifies session saving text (Closes: #259718). + * Upload to unstable, drop check-dist include. + * debian/control.in: + + Build depend on libgtk2.0-dev (>= 2.11.1) because gdk_window_set_opacity + was added in that version but configure checks for >= 2.3.1. + + -- Sebastian Dröge Thu, 20 Sep 2007 12:38:07 +0200 + +gnome-session (2.19.5-1) experimental; urgency=low + + * New upstream development releases. + - Target at experimental; include check-dist. + - Add a libglib2.0-dev (>= 2.13.0) build-dep. + - Drop patch 01_splash-memory-corruption, merged upstream. + - New patch, 60_dates-no-padding, fixes build on the 8th and 9th of the + month and in August and September; GNOME #454797. + * Drop obsolete patch to display a warning when switching from GNOME 1 to + GNOME 2, 02_conversion. + * Uuencode debian/gnome-debian-splash.png instead of shipping it as a SNG; + this makes the file smaller; build-depend on sharutils (priority standard) + instead of sng (priority optional). + * New upstream development release; bug fixes and translations. + - Drop patch 60_dates-no-padding; fixed differently upstream. + + -- Loic Minier Tue, 10 Jul 2007 18:44:14 +0200 + +gnome-session (2.18.3-1) unstable; urgency=low + + * New upstream stable release; translation. + + -- Loic Minier Fri, 06 Jul 2007 23:08:26 +0200 + +gnome-session (2.18.2-2) unstable; urgency=low + + * default.session: remove gnome-volume-manager, it is now run through + the autostart facility. + * gnome-wm: add support for openbox (closes: #429729). + * 01_splash-memory-corruption.diff: patch from upstream r4382, + backported by Michel Dänzer. Fixes memory corruption with some + icons (closes: #430630, #425742). + + -- Josselin Mouette Wed, 27 Jun 2007 21:28:43 +0200 + +gnome-session (2.18.2-1) unstable; urgency=low + + * New upstream stable release. + - Drop patch 01_clever_save; merged upstream. + + -- Loic Minier Mon, 28 May 2007 16:18:59 +0200 + +gnome-session (2.18.0-2) unstable; urgency=low + + [ Sven Arvidsson ] + * Add the only missing manpage (Closes: #252006) + + [ Josselin Mouette ] + * 01_clever_save.diff: stolen from upstream's SVN. Be more clever when + saving the session, so that e.g. multiple xterms are not forgotten. + Closes: #364463. + + -- Josselin Mouette Tue, 15 May 2007 20:45:31 +0200 + +gnome-session (2.18.0-1) unstable; urgency=low + + * New upstream major stable release; fixes and translations. + - Pass --with-at-spi-registryd-directory=/usr/lib/at-spi to configure. + - Drop patches 05_session_save, 07_kill_esd, merged upstream. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Bump up Debhelper compatibility level to 5. + * Fix URL in copyright. + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Prepend -z defs to LDFLAGS for additional safety. + * Rewrite rules generating the PNG splash; misc cleanups. + * Fix copyright to really document licensing and copyright holders. + + -- Loic Minier Sun, 22 Apr 2007 15:23:12 +0200 + +gnome-session (2.16.3-2) experimental; urgency=low + + * Merge SVN 2.14.3-1 up-to 2.14.3-6; r7581:8951. + - Drop patch 06_ro_po, merged upstream. + + -- Loic Minier Sat, 17 Mar 2007 12:24:06 +0100 + +gnome-session (2.16.3-1) experimental; urgency=medium + + [ Josselin Mouette ] + * Quote the readlink call to handle the case where the + x-session-manager alternative is broken (closes: #403931). + * Medium urgency because it has the potential to cause all X sessions + to fail starting. + + [ Loic Minier ] + * 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. + * New upstream stable release; bug fixes and translations. + + -- Loic Minier Sat, 17 Mar 2007 12:04:03 +0100 + +gnome-session (2.16.2-1) experimental; urgency=low + + [ Josselin Mouette ] + * New upstream release. + * gnome-debian-splash.sng: updated. + * Update build-dependencies. + * Build-depend on libdbus-glib-1-dev and libgnome-keyring-dev. + * 03_implicit_conversion.diff: removed, integrated upstream. + * 05_session_save.diff: patch the session properties capplet. + + Add a "save current session" button. + + Remove the "ask on exit" checkbox, as it isn't used anymore. + + Add 36 translations based on the existing ones (minus the "- "). + + Remove the annoying "session saved" dialog from the session + manager. + + [ Loic Minier ] + * Fix watch file to track stable releases and use HTTP. + + [ Josselin Mouette ] + * Build-depend on libgnome-settings-daemon-dev. + * Tighten dependencies on gnome-control-center with ${gnome:Version}. + * Require gnome-pkg-tools 0.6. + * Call gnome-version.mk. + * 04_manpages.diff: removed, integrated upstream. + * 05_session_save.diff: update patch for new version. + + -- Josselin Mouette Mon, 27 Nov 2006 20:43:07 +0100 + +gnome-session (2.14.3-6) unstable; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Sat, 13 Jan 2007 23:30:57 +0100 + +gnome-session (2.14.3-5) unstable; urgency=medium + + * Quote the readlink call to handle the case where the + x-session-manager alternative is broken (closes: #403931). + * Medium urgency because it has the potential to cause all X sessions + to fail starting. + + -- Josselin Mouette Wed, 20 Dec 2006 21:37:44 +0100 + +gnome-session (2.14.3-4) unstable; urgency=low + + * 06_ro_po.diff: new Romanian translation from Eddy Petrișor + (closes: #403595). + + -- Josselin Mouette Tue, 19 Dec 2006 21:25:14 +0100 + +gnome-session (2.14.3-3) unstable; urgency=low + + * gnome-debian-splash.sng: grab new version, without the "2.14" + string. + * 05_session_save.diff: pack the "save session" button correctly. + + -- Josselin Mouette Tue, 10 Oct 2006 19:14:02 +0200 + +gnome-session (2.14.3-2) unstable; urgency=low + + * 05_session_save.diff: patch the session properties capplet. + + Allow editing of sessions (bugzilla #336820). + + Add a "save current session" button. + + Remove the "ask on exit" checkbox, as it isn't used anymore. + + Add 36 translations based on the existing ones (minus the "- "). + + Remove the annoying "session saved" dialog from the session + manager. + + -- Josselin Mouette Wed, 4 Oct 2006 22:26:30 +0200 + +gnome-session (2.14.3-1) unstable; urgency=low + + * New upstream release. + - Drop 01_create_autostart patch, merged upstream. + * Suggest gnome-user-guide | gnome2-user-guide. (Closes: #371106, #371107, + #371108, #371109, #371110, #371111, #371112, #371113, #371114, #371115, + #371116, #371117, #371118, #371119, #371120, #371121, #371122, #371123, + #371124, #371125, #371126, #371127, #371128, #371129, #371130, #371131, + #371132, #371133) + + -- Loic Minier Tue, 8 Aug 2006 11:15:38 +0200 + +gnome-session (2.14.2-1) unstable; urgency=low + + * New upstream release. + + -- Loic Minier Wed, 31 May 2006 18:36:45 +0200 + +gnome-session (2.14.1-2) unstable; urgency=low + + * 03_implicit_conversion.diff: Fix for implicit conversion + (closes: #368062). + + -- Josselin Mouette Thu, 25 May 2006 00:49:18 +0200 + +gnome-session (2.14.1-1) unstable; urgency=low + + * New upstream release. + * Standards-version is 3.7.2. + * 07_kill_esd.diff: updated. + * Build-depend on libwrap0-dev. + + -- Josselin Mouette Thu, 18 May 2006 07:51:21 +0200 + +gnome-session (2.14.0-2) unstable; urgency=low + + * Update watch file. + * 01_create_autostart.diff: create the autostart directory when it + doesn't exist (closes: #360590, #360431). + + -- Josselin Mouette Fri, 7 Apr 2006 09:59:27 +0200 + +gnome-session (2.14.0-1) unstable; urgency=low + + [ Loic Minier ] + * Launch esd with a cwd of "/" to avoid blocking pam_mount / pam_umount, + thanks Daniel Kahn Gillmor. (Closes: #335944) + [debian/patches/07_kill_esd.diff] + + [ Josselin Mouette ] + * New upstream release. + * Build-depend on libnotify-dev. + * Enable IPv6. + * gnome-debian-splash.sng: update for GNOME 2.14. + * 02_conversion.diff: updated for the new version. + * Build-depend on libgnome-desktop-dev. + + -- Josselin Mouette Sat, 1 Apr 2006 16:58:40 +0200 + +gnome-session (2.12.0-4) unstable; urgency=low + + * Only depend on dbus, dbus-1-utils isn't necessary. + * rules: don't remove empty directories (really closes: #340765). + + -- Josselin Mouette Sun, 22 Jan 2006 15:35:55 +0100 + +gnome-session (2.12.0-3) unstable; urgency=low + + * 03_splash.diff: removed. + * gconf-defaults: ship the defaults here. + * control.in: require debhelper 5.0.13. + + -- Josselin Mouette Sun, 8 Jan 2006 12:02:30 +0100 + +gnome-session (2.12.0-2) unstable; urgency=low + + * dirs: create /usr/share/images/desktop-base (closes: #340765). + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 01:27:42 +0100 + +gnome-session (2.12.0-1) experimental; urgency=low + + * New upstream release. + * Edit upstream logo to add the debian swirl: + + Add it, using the sng format. + + Build-depend on sng. + + Call sng in the build target. + + Install it in /usr/share/pixmaps/splash/. + + 03_splash.diff: use it by default. + + Add it to the desktop-base alternative. + + Only recommend desktop-base. + * 02_conversion.diff: update to apply cleanly. + * Update watch file. + + -- Josselin Mouette Sun, 9 Oct 2005 03:19:58 +0200 + +gnome-session (2.10.0-8) unstable; urgency=low + + * rules: set --as-needed again. + * Rebuild against the latest gconf2 (closes: #330476, #330913). + * Build-depend on gconf2 2.10.1-6. + + -- Josselin Mouette Mon, 3 Oct 2005 20:57:52 +0200 + +gnome-session (2.10.0-7) unstable; urgency=medium + + * The "now all dependencies in GNOME are back to the old times + madness, why not do the same here?" release. + * rules: remove --as-needed (closes: #325639). + * default.session: + + Remove gnome-smproxy. It slows down the startup process and + sometimes hangs. + + Remove magicdev, which is deprecated. + + -- Josselin Mouette Sun, 4 Sep 2005 11:13:41 +0200 + +gnome-session (2.10.0-6) unstable; urgency=high + + Matt Kraai : + * Added a build-dependency on libxau-dev to fix FTBFS. (Closes: #323327) + + Loic Minier : + * Recommend the dbus-1-utils package as it is xorg starts a dbus session by + default now (use-session-dbus in /etc/X11/Xsession.options). + (Closes: #320015) + + -- J.H.M. Dassen (Ray) Sun, 28 Aug 2005 14:52:19 +0200 + +gnome-session (2.10.0-5) unstable; urgency=medium + + * Depend on gnome-control-center instead of capplets. + * Remove unuseful conflicts field. + * Fix a typo in the description (closes: #299992). + * Standards-version is 3.6.2. + + -- Josselin Mouette Sat, 25 Jun 2005 19:11:59 +0200 + +gnome-session (2.10.0-4) unstable; urgency=low + + * Undo previous changes, we are renaming the menus. + + -- Sebastien Bacher Thu, 9 Jun 2005 11:53:39 +0200 + +gnome-session (2.10.0-3) unstable; urgency=low + + * 70gnome-session_menus: set the XDG_CONFIG_DIRS environment variable, so + that the menus use GNOME's implementation. + * gnome-session.install: install the file in /etc/X11/Xsession.d. + + -- Josselin Mouette Wed, 8 Jun 2005 23:09:56 +0200 + +gnome-session (2.10.0-2) unstable; urgency=low + + * Upload to unstable. + * Update debian/watch. + * rules: avoid the LDFLAGS hack overwriting all environment. + + -- Josselin Mouette Tue, 7 Jun 2005 21:47:24 +0200 + +gnome-session (2.10.0-1) experimental; urgency=low + + * New upstream release. + * Update build-dependencies. + * 06_shutdown.diff: removed, similar functionality is integrated upstream. + * 20_ca_po.diff: removed, integrated upstream. + + -- Josselin Mouette Wed, 13 Apr 2005 20:15:32 +0200 + +gnome-session (2.8.1-6) unstable; urgency=medium + + * Use --as-needed option in LDFLAGS to reduce the dependencies. + + Incidentally removes the dependency upon libhowl0 (closes: #298849). + * gnome-wm: add support for fvwm (closes: #289969). + + -- Josselin Mouette Thu, 10 Mar 2005 21:44:15 +0100 + +gnome-session (2.8.1-5) unstable; urgency=medium + + * 20_ca_po.diff: fixes to the Catalan translation. + + -- Jordi Mallach Fri, 7 Jan 2005 17:54:47 +0100 + +gnome-session (2.8.1-4) unstable; urgency=medium + + * 09_splash_hide.diff: disabled, this patch only manages to make things + worse (closes: #284090). + * postinst,prerm: install alternative for the splash image + (closes: #282653). + + -- Josselin Mouette Sun, 5 Dec 2004 19:54:49 +0100 + +gnome-session (2.8.1-3) unstable; urgency=low + + * 09_splash_hide.diff: stop displaying splash when all applications are + launched, it avoids waiting when some of them are broken. Thanks seb128. + * 07_kill_esd.diff: kill esd upon logout (closes: #187730). + + -- Josselin Mouette Tue, 23 Nov 2004 15:08:47 +0100 + +gnome-session (2.8.1-2) unstable; urgency=low + + * Forward-port changes from 2.6 branch: + + 55gnome-session_gnomerc: support arguments to gnome-session. + + control.in: + - Depend on capplets. + - Recommend nautilus, gnome-panel and a window manager. + + patches/05_debian_gnome_upgrade_check.diff, patches/00_Makefile.am.diff, + patches/01_autoreconf.diff, gnome-1-to-2, gnome-launchers-1-to-2, + gnome-panel-1-to-2, gnome-stuff-1-to-2, nautilus-666666.desktop: + removed. + + gnome-session.install: don't install those. + + rules: don't have to fix the permissions. + + 02_conversion.diff: only print a warning, don't launch the broken + upgrade script + + gnome-volume-daemon: removed, obsolete. + * Upload to unstable. + * control.in: + + Bump build-dependencies to 2.8 versions. + + Build-depend on libgconf2-dev, not gconf2. + + -- Josselin Mouette Fri, 19 Nov 2004 14:40:42 +0100 + +gnome-session (2.8.1-1) experimental; urgency=low + + * New upstream release. + * debian/patches/03_splash.diff: (change from trunk) + - use the desktop-splash alternative as the default splash + * debian/control{,.in}: (change from trunk) + - the change above required desktop-base 0.3.15, so updated + Depends + * debian/patches/00_acinclude.m4.diff: + - removed, not needed anymore + * debian/patches/01_autoreconf.patch: + - updated, result of "libtoolize --force --copy; + aclocal-1.7; autoheader; automake-1.7 -acf; autoconf; rm -rf + autom4te.cache" with the 00_ patch applied. + + -- Gustavo Noronha Silva Sun, 24 Oct 2004 12:47:32 -0300 + +gnome-session (2.8.0-1) experimental; urgency=low + + * New upstream release. + * debian/patches/01_autoreconf.patch: + - updated. + + -- Sebastien Bacher Wed, 29 Sep 2004 21:43:42 +0200 + +gnome-session (2.6.2-5) unstable; urgency=low + + * 06_shutdown.diff: test for /var/run/gdm.pid (closes: #261969). + + -- Josselin Mouette Sat, 31 Jul 2004 12:23:23 +0200 + +gnome-session (2.6.2-4) unstable; urgency=low + + * 06_shutdown.diff: new, provide reboot or halt using gdmflexiserver if + available. + * rules: remove halt/reboot configure switches. + + -- Josselin Mouette Mon, 26 Jul 2004 23:22:29 +0200 + +gnome-session (2.6.2-3) unstable; urgency=low + + * Rebuild with working dh_gconf (closes: #258139, #258144). + + -- Josselin Mouette Thu, 8 Jul 2004 16:44:01 +0200 + +gnome-session (2.6.2-2) unstable; urgency=low + + * gnome-volume-daemon: + + removed, it didn't register correctly with the SM (closes: #253729). + + gnome-session.install: don't install it. + * default.session: + + start both magicdev and g-v-m, they now conflict with each other. + + -- Josselin Mouette Tue, 6 Jul 2004 22:30:07 +0200 + +gnome-session (2.6.2-1) unstable; urgency=low + + * New upstream release. + * 01_autoreconf.patch: updated, result of "libtoolize --force --copy; + aclocal-1.7; autoheader; automake-1.7 -acf; autoconf; rm -rf + autom4te.cache" with 00_ patches applied. + * gnome-volume-daemon: + + new script, runs gnome-volume-manager if available, or falls back + to magicdev. + + gnome-session.install: install it. + + rules: chmod it. + + default.session: use it instead of gnome-volume-manager. + * gnome-wm: store the window manager in the "current" gconf key, not the + "default" one. + + -- Josselin Mouette Tue, 29 Jun 2004 23:25:01 +0200 + +gnome-session (2.6.1-6) unstable; urgency=low + + * Gustavo Noronha Silva + - debian/README.Debian: + + did some small cleanups + + wrote a small explanation of why the splash screen is + different from GNOME's upstream and how to get it back + and set it up + * Josselin Mouette + - debian/default.session: + + add gnome-volume-manager, gnome-cups-icon and vino-session to the + default session. + - debian/postinst: + + make gnome-session's priority 50, to be greater than KDE. Thus the + default DM is gdm and the default session is gnome-session. + + -- Josselin Mouette Thu, 24 Jun 2004 14:02:52 +0200 + +gnome-session (2.6.1-5) unstable; urgency=low + + * Grrrr, configure doesn't check for libXmu while it is needed. Add + libxmu-dev to build-depends. + + -- Josselin Mouette Fri, 28 May 2004 15:05:42 +0200 + +gnome-session (2.6.1-4) unstable; urgency=low + + * Add explicit build dependencies on X libraries (closes: #251367). + + -- Josselin Mouette Fri, 28 May 2004 12:13:39 +0200 + +gnome-session (2.6.1-3) unstable; urgency=low + + * Upload to unstable. + * Tighten dependencies on liborbit2-dev. + + -- Josselin Mouette Wed, 26 May 2004 16:11:18 +0200 + +gnome-session (2.6.1-2) experimental; urgency=low + + * 55gnome-session_gnomerc: handle the case where we are running + x-session-manager, symlinked to gnome-session. + + -- Josselin Mouette Thu, 22 Apr 2004 11:37:15 +0200 + +gnome-session (2.6.1-1) experimental; urgency=low + + * New upstream release. + * Source .gnomerc at startup (closes: #242065): + - gnome-session.install: install 55gnome-session_gnomerc in Xsession + directory. + - 55gnome-session_gnomerc: source .gnomerc if we are running + gnome-session. + * gnome-wm: get the default window manager from gconf. It now uses the + /desktop/gnome/applications/window_manager/default key + (closes: #241361, #244694). The x-window-manager alternative is now only + used when nothing else is found. + * patches/01_autoreconf.diff: updated, result of + libtoolize --force --copy; aclocal-1.7; autoheader; automake-1.7 -acf; + autoconf; rm -rf autom4te.cache. + + -- Josselin Mouette Wed, 21 Apr 2004 17:12:10 +0200 + +gnome-session (2.6.0-3) experimental; urgency=low + + * rules: force poweroff and reboot paths (closes: #242091) + * gnome-wm: don't set the gconf key, it is unused. + + -- Josselin Mouette Wed, 7 Apr 2004 12:31:16 +0200 + +gnome-session (2.6.0-2) experimental; urgency=low + + * Move gnome-sesssion.install to gnome-session.install. + * Forward-port changes from 2.4.2-4: + + Use metacity by default: + - gnome-wm: use metacity or sawfish when it is available + - default.session: let gnome-wm discover the window manager + + docs: removed, cdbs takes care of these. + + postinst,prerm: remove gconf stuff, dh_gconf does it for us. + + control.in: require debhelper 4.1.84 + + Provide a session for the display managers: + - add gnome-session.desktop + - gnome-session.install: install it + + patches/: + - 01_configure.diff, 03_Makefile.in.diff: removed + - 00_Makefile.am.diff patches gnome-session/Makefile.am + + Use the splash screen from desktop-base by default. + - patches/03_splash.diff: for the code and gconf stuff + - control.in: depend on desktop-base. + + control.in: don't depend on debianutils, woody provides a sufficient + version. + + fix permissions: + - compat: use debhelper v4 + - rules: chmod 755 the debian scripts + * control.in: require 2.6 versions of packages. + * patches/: + + updated 00_acinclude.m4.diff includes a copy of + gnome2-macros/compiler-flags.m4 as aclocal 1.7 seems unable to + find it. + + updated 01_autoreconf.diff is the result of running + libtoolize --force --copy; aclocal; autoheader; automake -acf; + autoconf. + + update patches/03_splash.diff for the new version. + + -- Josselin Mouette Thu, 1 Apr 2004 15:33:35 +0200 + +gnome-session (2.6.0-1) experimental; urgency=low + + * New upstream release + * GNOME Team Upload + * Gustavo Noronha Silva : + + debian/control.in: + - set maintainer to Josselin Mouette + - Build-Depends on cdbs and gnome-pkg-tools + + debian/patches/*: + - converted all from dpatch to cdbs' simple-patch, some + of them were regenerated for various reasons, including + failure on apply and not including diff for Makefile.am + + debian/rules: + - use cdbs + + gnome-session.install: + - install some debian specific files that were installed + manually through debian/rules before + + -- Gustavo Noronha Silva Sun, 28 Mar 2004 13:23:41 -0300 + +gnome-session (2.4.2-2) unstable; urgency=low + + * Orphaned package. + + -- Christian Marillat Fri, 19 Mar 2004 15:50:59 +0100 + +gnome-session (2.4.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 14 Jan 2004 20:47:13 +0100 + +gnome-session (2.4.1-3) unstable; urgency=low + + * debian/prerm Unregister schemas file from the database. + + -- Christian Marillat Fri, 9 Jan 2004 15:42:34 +0100 + +gnome-session (2.4.1-2) unstable; urgency=low + + * Build with --with-window-manager=metacity (CLoses: #216769) + * Update desktop migration from .gnome-desktop to Desktop + * Update Build-dependencies to GNOME 2.4 packages + + -- Christian Marillat Sat, 1 Nov 2003 16:45:42 +0100 + +gnome-session (2.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 18 Oct 2003 17:27:21 +0200 + +gnome-session (2.2.2-4) unstable; urgency=low + + * Fix broken manpage (thanks to Marcin Owsiany) (Closes: #204604) + + -- Christian Marillat Sun, 10 Aug 2003 20:10:08 +0200 + +gnome-session (2.2.2-3) unstable; urgency=low + + * Fix typo in gnome-session.1 (Closes: #192575) + + -- Christian Marillat Mon, 14 Jul 2003 15:25:48 +0200 + +gnome-session (2.2.2-2) unstable; urgency=low + + * Add changes from Greg Hudson for conversion scripts. Thanks. + + -- Christian Marillat Wed, 28 May 2003 21:55:00 +0200 + +gnome-session (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 16 May 2003 17:22:21 +0200 + +gnome-session (2.2.1-1) unstable; urgency=low + + * New upstream release. + * Cleanup debian/prerm (Closes: #180928) + + -- Christian Marillat Tue, 11 Mar 2003 14:16:20 +0100 + +gnome-session (2.2.0.2-1) unstable; urgency=low + + * New upstream release. + * Add a note about GNOME 2 compliant window manager (Closes: #174021) + + -- Christian Marillat Tue, 4 Feb 2003 15:26:22 +0100 + +gnome-session (2.2.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 22 Jan 2003 13:20:07 +0100 + +gnome-session (2.1.90-1) unstable; urgency=low + + * New upstream releae. + + -- Christian Marillat Sun, 19 Jan 2003 15:27:47 +0100 + +gnome-session (2.0.9-3) unstable; urgency=low + + * FIx manpage for gnome-session-save (Closes: #171661) + + -- Christian Marillat Wed, 4 Dec 2002 12:47:04 +0100 + +gnome-session (2.0.9-2) unstable; urgency=low + + * New pacthe against gnome-session/Makefile.in to really add the binaries + conversion. + + -- Christian Marillat Wed, 27 Nov 2002 13:11:27 +0100 + +gnome-session (2.0.9-1) unstable; urgency=low + + * New upstream release. + * Fix lintian warnings with manpages. + + -- Christian Marillat Fri, 15 Nov 2002 14:26:18 +0100 + +gnome-session (2.0.8-8) unstable; urgency=low + + * Handle fully-qualified panel path in conversion script. + + -- Christian Marillat Wed, 6 Nov 2002 17:14:54 +0100 + +gnome-session (2.0.8-7) unstable; urgency=low + + * Fix wrong indentation (Closes: #167454) + + -- Christian Marillat Sat, 2 Nov 2002 19:27:57 +0100 + +gnome-session (2.0.8-6) unstable; urgency=low + + * Colin's fix : + * Correctly transitions the background + * Handles the multiload applet + * Handles aligned panels + * Tries to convert menu items + * Doesn't crash on invalid UTF-8 + * Doesn't crash on an empty launchers dir + * Me : + * Don't try to overwrite gconf gnome-terminal configuration + + -- Christian Marillat Fri, 1 Nov 2002 18:05:20 +0100 + +gnome-session (2.0.8-5) unstable; urgency=low + + * Add a note in the confirmation dialog box for how to report bugs. + + -- Christian Marillat Mon, 28 Oct 2002 21:01:02 +0100 + +gnome-session (2.0.8-4) unstable; urgency=low + + * Oops, forget to apply yesterday changes in conversion code. + + -- Christian Marillat Mon, 28 Oct 2002 17:32:53 +0100 + +gnome-session (2.0.8-3) unstable; urgency=low + + * Fix gnome-wm. Gnome don't like symlink. + * This package contains conversion scripts for GNOME 1 to GNOME 2 (Closes: #153682) + * Upload to unstable + + -- Christian Marillat Mon, 28 Oct 2002 11:34:22 +0100 + +gnome-session (2.0.8-2) experimental; urgency=low + + * Uploaded officially to experimental + + -- Christian Marillat Tue, 22 Oct 2002 18:00:11 +0200 + +gnome-session (2.0.8-1.1upgradetest) experimental; urgency=low + + * EXPERIMENTAL TESTING RELEASE + * Add upgrade scripts. + + -- Colin Walters Sat, 19 Oct 2002 22:54:05 -0400 + +gnome-session (2.0.8-1) experimental; urgency=low + + * New upstream release. + * Add metacity in gnome-wm + + -- Christian Marillat Mon, 14 Oct 2002 16:09:35 +0200 + +gnome-session (2.0.7-4) experimental; urgency=low + + * Change the default window manager in the default sesion file by + x-window-manager (was gnome-wm) + + -- Christian Marillat Wed, 9 Oct 2002 23:43:32 +0200 + +gnome-session (2.0.7-3) experimental; urgency=low + + * Upload with original tarball. + + -- Christian Marillat Sun, 29 Sep 2002 17:40:55 +0200 + +gnome-session2 (2.0.7-2) experimental; urgency=low + + * Update to standards version 3.5.7 + * Upload without the 2 suffix + * Update libgnomeui-dev build-dependency to 2.0.5-3 + + -- Christian Marillat Sat, 28 Sep 2002 17:59:43 +0200 + +gnome-session2 (2.0.7-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 5 Sep 2002 18:56:12 +0200 + +gnome-session2 (2.0.6-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 27 Aug 2002 10:38:48 +0200 + +gnome-session2 (2.0.5-3) experimental; urgency=low + + * Build against the latest gconf2 1.2.1-2.1 (Closes: #157727) + + -- Christian Marillat Thu, 22 Aug 2002 19:04:39 +0200 + +gnome-session2 (2.0.5-2) experimental; urgency=low + + * Add esound in build-depends + * Build against the latest libgnomevfs2-dev 2.0.2-4 + + -- Christian Marillat Fri, 16 Aug 2002 17:31:02 +0200 + +gnome-session2 (2.0.5-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 8 Aug 2002 16:28:59 +0200 + +gnome-session2 (2.0.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 5 Aug 2002 19:40:25 +0200 + +gnome-session2 (2.0.3-1) experimental; urgency=low + + * New upstream release. + * Use gconftool-2 to store window-manager preference + + -- Christian Marillat Tue, 30 Jul 2002 18:16:53 +0200 + +gnome-session2 (2.0.2-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 15 Jul 2002 15:20:51 +0200 + +gnome-session2 (2.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 17 Jun 2002 15:46:23 +0200 + +gnome-session2 (2.0.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 10 Jun 2002 16:03:08 +0200 + +gnome-session2 (1.5.21-1) experimental; urgency=low + + * new upstream release. + + -- Christian Marillat Tue, 4 Jun 2002 16:34:27 +0200 + +gnome-session2 (1.5.20-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 28 May 2002 15:22:12 +0200 + +gnome-session2 (1.5.19-3) experimental; urgency=low + + * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. + * debian/postinst check if schemas files are present before calling + gconftool-2 + + -- Christian Marillat Mon, 27 May 2002 16:03:24 +0200 + +gnome-session2 (1.5.19-2) experimental; urgency=low + + * Fix a typo in postinst (Closes: #147600) + + -- Christian Marillat Tue, 21 May 2002 11:15:32 +0200 + +gnome-session2 (1.5.19-1) experimental; urgency=low + + * New upstream release + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Wed, 15 May 2002 20:04:03 +0200 + +gnome-session2 (1.5.18-1) experimental; urgency=low + + * new upstream release. + + -- Christian Marillat Mon, 29 Apr 2002 20:45:49 +0200 + +gnome-session2 (1.5.17-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 22 Apr 2002 16:34:38 +0200 + +gnome-session2 (1.5.16-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 17 Apr 2002 15:41:33 +0200 + +gnome-session2 (1.5.15-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 1 Apr 2002 22:33:26 +0200 + +gnome-session2 (1.5.13-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 29 Mar 2002 16:38:29 +0100 + +gnome-session2 (1.5.11-1) experimental; urgency=low + + * new upstream release. + + -- Christian Marillat Tue, 26 Feb 2002 15:10:17 +0100 + +gnome-session2 (1.5.10-3) experimental; urgency=low + + * Fix broken postinst. Thanks to Mark Nelson. + + -- Christian Marillat Mon, 25 Feb 2002 17:44:33 +0100 + +gnome-session2 (1.5.10-2) experimental; urgency=low + + * Should build-depends on intltool + + -- Christian Marillat Mon, 25 Feb 2002 15:37:19 +0100 + +gnome-session2 (1.5.10-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 18 Feb 2002 22:31:35 +0100 + +gnome-session2 (1.5.9-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 15 Feb 2002 00:40:12 +0100 + +gnome-core2 (1.5.7-1) experimental; urgency=low + + * New upstrema release. + + -- Christian Marillat Tue, 5 Feb 2002 14:41:01 +0100 + +gnome-core2 (1.5.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Jan 2002 16:21:40 +0100 + +gnome-core (1.4.0.4-16) unstable; urgency=low + + * Fix typo in gnome-terminal.wrapper (Closes: #127768) + * Remove gnome-hint patche (Closes: #121390, #129184) + * debian/control Replace libpng-dev by libpng2-dev in Build-Depends + (Closes: #128377) + + -- Christian Marillat Mon, 14 Jan 2002 15:04:52 +0100 + +gnome-core (1.4.0.4-15) unstable; urgency=low + + * Build against the latest gnome-libs to update the libzvt2 dependency + (Closes: #127309, #127271) + * debian/control Replace libpng2-dev by libpng-dev in Build-Depends. + * debian/control Build-depends on libzvt-dev (>= 1.4.1.2-9) + + -- Christian Marillat Tue, 1 Jan 2002 15:27:43 +0100 + +gnome-core (1.4.0.4-14) unstable; urgency=low + + * Fix typo in gnome-terminal.1 (Closes: #123073) + * Fix base page for doc-base in libpanel-applet-dev package. + * Fix typo in gnome-help documentation (Closes: #126566) + * Apply patch to allows meta functionnality in gnome-terminal (Closes: #50427) + + -- Christian Marillat Thu, 27 Dec 2001 14:47:36 +0100 + +gnome-core (1.4.0.4-13) unstable; urgency=low + + * Default font for gnome-terminal is "fixed" only (Closes: #117126) + * Patch against gnome-hint.c Don't use gettext for font descriptor + (Closes: #116606) + * Patch against gnome-about/Makefile.am to use new gdk_pixbuf include path + (Closes: #120312) + * Revert my change on logout.c Only root can shutdown/reboot from the + panel (Closes: #119316, #120127) + + -- Christian Marillat Tue, 20 Nov 2001 11:36:05 +0100 + +gnome-core (1.4.0.4-12) unstable; urgency=low + + * gnome-wm honour --default-wm (Closes: #115668) + * Build against the latest gnome-libs + + -- Christian Marillat Sun, 21 Oct 2001 14:11:19 +0200 + +gnome-core (1.4.0.4-11) unstable; urgency=low + + * debian/control lynx comeback in Recommends (Closes: #114142) + * debian/control replaces xml-i18n-tools by intltool (Closes: #115024) + * Fix automake 1.5 errors. Thanks to Denis Barbier (Closes: #114369) + * Build against the latest orbit (Closes: #115309) + + -- Christian Marillat Fri, 12 Oct 2001 10:46:49 +0200 + +gnome-core (1.4.0.4-10) unstable; urgency=low + + * Fix typo in panel/panel.hints (Closes: #113590) + * Replace lynx by w3m (Closes: #113613) + * Move gnome-terminal.desktop in gnome-terminal package (Closes: #113736) + * Move gnome-help.desktop in gnome-help package + * debian:control Add Replaces: gnome-panel-data (<= 1.4.0.4-9) for above + * Patch against gsm/logout.c Now you can reboot/halt your machine from the + panel. This only work for root, because shutdown doesn't understand the + -a option. Read README.debian in gnome-panel package. + * debian/rules Remove less files in clean target (Closes: #114020) + + -- Christian Marillat Mon, 1 Oct 2001 11:34:06 +0200 + +gnome-core (1.4.0.4-9) unstable; urgency=low + + * Add Debian menu for panel and gmenu (Closes: #112176) + * Remove /var/lib/gnome on purge (Closes: #113005) + * Remove /etc/gnome/config on purge (Closes: #112994) + * Remove /etc/gnome on purge (Closes: #112995) + * debian/control replace cygnus-stylesheets by docbook-utils + + -- Christian Marillat Mon, 24 Sep 2001 18:39:19 +0200 + +gnome-core (1.4.0.4-8) unstable; urgency=high + + * High urgency, because the current release in testing has a missing + dependency on libpanel-applet0 and the panel package doesn't work if + libpanel-applet0 isn't installed (Closes: #111517) + * debian/control for gnome-help, move lynx from depends to recommends + (Closes: #109652) + * debian/control gnome-panel suggests fortune-mod (Closes: #110865) + * debian/control gnome-help suggests gnome-users-guide not + gnome-users-guide-en (Closes: #111200) + * Don't change cursor color (Closes: #97697) + * Change default font for gnome-terminal (Closes: #111319) + + -- Christian Marillat Fri, 7 Sep 2001 15:06:07 +0200 + +gnome-core (1.4.0.4-7) unstable; urgency=low + + * Fix path in gnome-session.1 (Closes: #107724) + * debian/*.sgml Use docbook 4.1 + * debian/control gnome-help-data Replaces gnome-terminal (<= 1.0.55-2) + (CLoses: #107948) + + -- Christian Marillat Wed, 8 Aug 2001 08:07:56 +0200 + +gnome-core (1.4.0.4-6) unstable; urgency=low + + * debian/rules for dh_makeshlibs replace libcapplet0 by libpanel-applet0 + (Closes: #105772) + + -- Christian Marillat Wed, 18 Jul 2001 19:02:59 +0200 + +gnome-core (1.4.0.4-5) unstable; urgency=low + + * Patch against gnome-edit to use EDITOR if the default gnome editor is + unavailable. + * Remove gnome-wm patch, and move the patched file in debian/ + * debian/gnome-wm Try to exec $WINDOW_MANAGER before x-window-manager + (Closes: #103430 + * New patch from Michael Urman to hide task names in tasklist_applet + (Closes: #104587) + + -- Christian Marillat Sat, 14 Jul 2001 16:58:12 +0200 + +gnome-core (1.4.0.4-4) unstable; urgency=low + + * Gnome-help Provides: man-browser, www-browser, info-browser + * Switch to debhelper V3 + * Change libraries versionning to (>= 1.4.0.2-3) instead of the latest + package number. + * Build-depends on groff-base instead of groff + + -- Christian Marillat Fri, 22 Jun 2001 17:02:37 +0200 + +gnome-core (1.4.0.4-3) unstable; urgency=low + + * New patch: Allows to save/load the keyboard secure state (Closes: #83028) + * New patch: Remove a warning in configure + * gnome-help replace gnome-panel-data (Closes: #99499) + * Build-depends on xml-i18n-tools (>= 0.8.4.cvs.20010530-1) (Close: #98784) + + -- Christian Marillat Sat, 2 Jun 2001 14:41:45 +0200 + +gnome-core (1.4.0.4-2) unstable; urgency=low + + * New patch: Replace Distribution by Debian in configuration dialog box. + * New patch: Upstream patch to allow Debian menu in default configuration. + * New patch: Fix some wrong path. + * Move gnome-feedback doc from gnome-help-data to gnome-core. + + -- Christian Marillat Tue, 15 May 2001 15:36:51 +0200 + +gnome-core (1.4.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 9 May 2001 23:56:27 +0200 + +gnome-core (1.4.0.3-2) unstable; urgency=low + + * Remove debugging code (/tmp/languages file) + + -- Christian Marillat Mon, 7 May 2001 16:48:18 +0200 + +gnome-core (1.4.0.3-1) unstable; urgency=low + + * New upstream release. + * New: tooltips for long task names in tasklist_applet (Closes: #63898) + + -- Christian Marillat Thu, 3 May 2001 15:51:58 +0200 + +gnome-core (1.4.0.2-3) unstable; urgency=low + + * Fix wrong dif.gz file (Closes: #94499) + * Build against the latest lignome-dev (Closes: #95301, #95691) + * gnome-terminal should depends on gnome-bin (Closes: #95498) + * Doesn't build against gtkhtml this break fonts displaying (Closes: #92187) + + -- Christian Marillat Tue, 1 May 2001 11:03:14 +0200 + +gnome-core (1.4.0.2-2) unstable; urgency=low + + * New/old patch against manpages, never applied by upstream. + * gnome-help depends on lynx. + * Use x-terminal-emulator in gnome-download instead of xterm. + * Move gnome-convert and gnome-download from gnome-core to gnome-help. + * Move gnome-login-check from gnome-core to gnome-session. + * Move gnome-panel-add-launcher from gnome-core to gnome-panel. + * Move sesion-properties* from gnome-core to gnome-session. + * debian/control Add Replaces for the changes above. + * Write manpages (Closes: #87085) + + -- Christian Marillat Tue, 17 Apr 2001 18:54:15 +0200 + +gnome-core (1.4.0.2-1) unstable; urgency=low + + * New upstream release. + * Build-depends on latest gettext (Closes: #93198) + * Icon box in menu editor is back (Closes: #91938) + * Build-depends on latest xml-i18n-tools and libgnome-dev + + -- Christian Marillat Wed, 11 Apr 2001 15:16:20 +0200 + +gnome-core (1.4.0.1-2) unstable; urgency=low + + * Build depends on versionned gettext 0.10.35-17 (Closes: #93198) + * Write manpage for gnome-session and add docbook-to-man in build-depnds + * Write manpages for gnome-help (Closes: #87089) + + -- Christian Marillat Sat, 7 Apr 2001 15:52:40 +0200 + +gnome-core (1.4.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/gnome-terminal.wrapper change -T by -t (Closes: #90847) + * debian/gnome-session.README.debian remove references to .xsession. This + is now obsolete by the new x-session-manager scheme. + + -- Christian Marillat Sun, 1 Apr 2001 15:01:51 +0200 + +gnome-core (1.4.0-2) unstable; urgency=low + + * Build depends on libglade-gnome0-dev (>= 0.16-1) (Closes: #90416) + * debian/control Add Build-Conflicts: libgtkhtml-dev (>= 0.7-1) (Closes: #90700) + + -- Christian Marillat Thu, 22 Mar 2001 16:44:12 +0100 + +gnome-core (1.4.0-1) unstable; urgency=low + + * New upstream release. + * Gnome-core replaces gnome-control-center 1.2.3-1 (Closes: #90124) + * Remove manpages patche included by upstream. + * gnome-session don't always saves session on logout (Closes: #89630) + * Can add a launcher in the panel (Closes: #90018) + * Deskguide don't crashes on Fill with mini-images (Closes: #86952) + * Deskguide don't fail to run (Closes: #89769) + * Pager applet don't fail to run (Closes: #89025) + + -- Christian Marillat Mon, 19 Mar 2001 13:01:26 +0100 + +gnome-core (1.3.1-2) unstable; urgency=low + + * Remove taslisk-applet manpage (Closes: #88994) + * New patch against gnome-terminal.1 (Closes: #89005) + * Move /usr/lib/libtasklist_applet.so in libpanel-applet0 + (Closes: #89053, #89008, #89012, #89091, #89003) + * Gnome-terminal replace gnome-help-data (<= 1.0.55-2) (Closes: #87910) + + -- Christian Marillat Sat, 10 Mar 2001 10:45:14 +0100 + +gnome-core (1.3.1-1) unstable; urgency=low + + * New upstream release. + * Removed default.session patch + * debian/control Add Replaces: gnome-control-center (<= 1.2.2-10), because + the session-properties-capplet is now in this package. + * debian/{postinst,prerm} Call scrollkeeper + * debian/control Add scrollkeeper, xml-i18n-tools and libglade-gnome0-dev in + build-depends and scrollkeeper in depends for gnome-core + * Menu and laucnh keys works now (Closes: #86955) + * Dead keys work in gnome-terminal (Closes: #63102) + * Gnome-terminal isn't broken (Closes: #86752) + * New patch htmlurl.h (This file was broken by upstream author) + * XFMail doesn't crash the tasklist applet in this release (Closes: #88515) + * debian/gnome-core.menu New file for the session properties capplet + + -- Christian Marillat Mon, 5 Mar 2001 11:40:15 +0100 + +gnome-core (1.2.4-11) unstable; urgency=low + + * Update (again) the Build-depends field (Closes: #87419) + * Add a debian directory for the gnome-help-browser and add suggest doc-base + for gnome-help. Now we can watch debian documentation registered with doc-base. + * Add a lintian override file for libpanel-applet0 + + -- Christian Marillat Sun, 25 Feb 2001 16:14:09 +0100 + +gnome-core (1.2.4-10) unstable; urgency=low + + * Update the Build-depends field (Closes: #86441, #87419) + * Call update-alternatives only in remove (gnome-terminal, gnome-session) (Closes: #87327, #87328) + + -- Christian Marillat Sat, 24 Feb 2001 18:03:20 +0100 + +gnome-core (1.2.4-9) unstable; urgency=low + + * Remove abandonned /etc/CORBA/servers/bad-applet.goad (Closes: #84950) + * Build against the latest gnome-libs (1.2.11) (Close: #85932) + + -- Christian Marillat Wed, 14 Feb 2001 13:49:26 +0100 + +gnome-core (1.2.4-8) unstable; urgency=low + + * debian/control Add Replaces: gnome-help-data (<< 1.0.55-2) for + gnome-help (Closes: #80974) + * debian/gnome-help.mime Rewrote (Closes: #82891) + * debian/control gnome-core depends on gnome-bin (Closes: #82951) + * Wrote gnome-panel.README.Debian (Closes: #82954) + + -- Christian Marillat Mon, 22 Jan 2001 16:04:58 +0100 + +gnome-core (1.2.4-7) unstable; urgency=low + + * Added gnome-bin (>= 1.2.0) in gnome-session Depends field (Closes: #80589, #80595, #80733) + + -- Christian Marillat Wed, 27 Dec 2000 19:24:08 +0100 + +gnome-core (1.2.4-6) unstable; urgency=low + + * Apply patch to gnome-run to call x-terminal-emulator (Closes: #80219) + * debian/gnome-terminal.wrapper This is -t not -T close (Closes: #80405) + + -- Christian Marillat Sun, 24 Dec 2000 03:27:12 +0100 + +gnome-core (1.2.4-5) unstable; urgency=low + + * Install gnome-terminal.wrapper as x-terminal-emulator and remove + debian/patches/gnome-terminal.dpatch (Closes: 64326) + Thanks to Eric Gillespie, Jr. + * Add Recommends: gnome-applets on gnome-panel (Closes: #72208) + * gnome-sesion provides x-session-manager and install alternative (Closes: #60667) + * Added hints=Gnome for all menu files. + + -- Christian Marillat Wed, 20 Dec 2000 23:19:55 +0100 + +gnome-core (1.2.4-4) unstable; urgency=low + + * Call x-terminal-emulator in gnome-wm and add depends on the latest debianutils + for gnome-session. Thanks to Joseph Carter for the file + (Closes: #79776) + * Rewrote default.session patch + * Add patch form Doug Larrick for gwmthumbnail.c (Closes: #78550) + + -- Christian Marillat Sun, 17 Dec 2000 12:04:54 +0100 + +gnome-core (1.2.4-3) unstable; urgency=low + + * Change gnome-help.mime to call the right file (Closes: #77986) + Thanks Malcolm Parsons for the patch. + * Patch gsm/default.in (two entries with same id) (Closes: #78276) + Thanks to Normal User (Nice name) + * Move gnome-control-center from Depends to Suggests. + * Remove libgtkhtml-dev from Build-Depends (Closes: #79527) + + -- Christian Marillat Wed, 13 Dec 2000 18:01:34 +0100 + +gnome-core (1.2.4-2) unstable; urgency=low + + * Remove README and NEWS files (Closes: #77250) + * Disable thumbnails by default in deskguide_applet (Closes: #77205) + * debian/rules --with-window-manager is now sawfish (was x-window-manager) + and rewrote debian/patches/gnome-wm.dpatch to remove x-window-manager (Closes: #77401) + * Should close this old bug (Closes: #51198) + * Patch gnome-edit to use x-terminal-emulator instead of xterm. + + -- Christian Marillat Mon, 20 Nov 2000 11:35:55 +0100 + +gnome-core (1.2.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 16 Nov 2000 00:43:15 +0100 + +gnome-core (1.2.3.1-1) unstable; urgency=low + + * New upstream release. + * Add gnome-help example and manpage in gnome-help package (Closes: #49977) + * This release should close these old bugs (Closes: #60561, #60768, #45053) + * Gnome-panel don't use all CPU time (Closes: #75251, #60209) + * Remove gmenu patch included by upstream. + + -- Christian Marillat Wed, 8 Nov 2000 17:09:42 +0100 + +gnome-core (1.2.3-1) unstable; urgency=low + + * New upstream release. + * Debian menus aren't empty (Closes: #70470) + * Launcher can find icon (Closes: #62502) + + -- Christian Marillat Tue, 24 Oct 2000 15:51:11 +0200 + +gnome-core (1.2.2.1-3) unstable; urgency=low + + * Add gnome-terminal.prerm for update-alternatives --remove (Closes: #74451) + * Patch gnome-terminal to accept -T option (Closes: #74450) + * Move README.debian in gnome-session package (Closes: #60440) + * mesg work in gnome-terminal (Closes: #71728) + * Upstream fix these old bugs in Gnome-terminal + Problem with menubar (Closes: #57516) + Problem with console-apt Closes: #60079) + Problem with screen (Closes: #50156) + * Binaries don't should go in /usr/X11R6/bin (Closes: #24031) + Quoting Debian policy : + "Packages using the X Window System should abide by the FHS standard" + "whenever possible; they should install binaries, libraries, manual" + "pages, and other files in FHS-mandated locations wherever possible." + "This means that files must not be installed into /usr/X11R6/bin/'" + * hostname isn't harcoded (Closes: #72536) + * Error messages mention Lynx (Closes: #62216) + * Display correctly deskuse.html (Closes: #49974) + * Add patch from malcolm (Closes: #64820) + + -- Christian Marillat Sat, 14 Oct 2000 23:39:49 +0200 + +gnome-core (1.2.2.1-2) unstable; urgency=low + + * Typo in debian/gnome-terminal.postinst + * Add gnome-terminal manpage (Closes: #69188) + * Closes: #63103 already closed in 1.2.1-0.2 (typo in debian/changelog) + * Gnome-terminal write to /var/run/utmp (Closes: #59053) + * delete/backspace keys works (Closes: #57198) + * Install GnomeHelp file in /etc/gnome/config (Closes: #73012) + * Convert png icons in xpm for Debian menu. + * Rearange documentation for dhelp (Closes: #56672) + + -- Christian Marillat Thu, 5 Oct 2000 00:59:44 +0200 + +gnome-core (1.2.2.1-1) unstable; urgency=low + + * New upstream release. + * Patch all manpages (Closes: #70009) + * gnome-panel 1.0.55-2.0.1 (sparc) is now installable (Closes: #69075, #71570) + * gmenu don't jam up all translations (Closes: #46446) + * panel remember its configuration between session + (Closes: #47734, #54190) + * Icons are now centered (Closes: #63868) + * Bugs closed by previous NMU in gnome-panel (Closes: #40036, #52584, #54755, + #58278, #61083, #69428)) + * libgen_util_applet.so installed in 1.2.1-0.2 (Closes: #69463) + * debian/control remove Conflicts: asclock (Closes: #52077) + * gnome-help 1.0.55-2.0.1 (sparc) is now installable (Closes: #69356) + * Bugs closed by previous NMU in gnome-help (Closes: #49734, #56081, #58679, #58973) + * debian/control move gmc from Recommends to Suggests (Closes: #59415) + * The first search in gnome-wm search is x-window-manager + (Closes: #50940, #65969, #62143) + * Bug closed in 1.2.2-1 (README.debian in gnome-session package) (Closes: #66219) + * Bugs closed by previous NMU in gnome-terminal + (Closes: #64579, #63592, #63332, #56584, #55477, #54428) + * gnome-terminal provide x-terminal-emulator (Closes: #61805, #53994, #56225) + + -- Christian Marillat Wed, 27 Sep 2000 16:02:16 +0200 + +gnome-core (1.2.2-1) unstable; urgency=low + + * New maintainer, thanks James. + * New upstream release. + * Switch to debhelper V2 + * Move README.debian in gnome-session package (Closes: #65235) and + update this file (Closes: #71339) + * Bug closed in 1.2.1-0.2 (Install missing libraries) (Closes: #69590, #70483) + * Bugs closed in 1.2.1-0.1 (typo close instead closes) (Closes: #53764, #54050) + * Remove gtkhtml patch. + * The desk guide show thumbnail (Closes: #72359) + * Missing package under sparc (Closes: #71438) + * debian/control add Conflicts: libgnome32 (<< 1.2.0-1) for gnome-panel (Closes: #72039) + * Added icons in Debian menu. + * Eject in drivemount check if '-u' is available (Closes: #63954) + * Patch gmenu to find Debian menu. + + -- Christian Marillat Tue, 26 Sep 2000 17:34:23 +0200 + +gnome-core (1.2.1-0.2) unstable; urgency=low + + * NMU. + * Install these libraries libfish_applet.so libgen_util_applet.so + libpanel_status.so (Closes: #69428, #69590) + * Copy latest gnome aclocal in macros/ and run macros/autogen.sh + This is needed to build gnome-help-browser against libgtkhtml4. + * In debian/control + gnome-session depends on gnome-panel (>= ${Source-Version}). + gnome-help depends on gnome-core (>= 1.2.0-0.1) no Source-Version. + gnome-terminal don't depends on gnome-core. + * URL's are clickable in gnome-terminal (Closes: 63103). + * debian/gnome-panel.undocumented removed printer_applet.1 + * Cut and paste work in gnome-terminal (Closes: #63592). + + -- Christian Marillat Wed, 23 Aug 2000 21:23:36 +0200 + +gnome-core (1.2.1-0.1) unstable; urgency=low + + * New upstream release (Closes: #58806, #66467) + * NMU. + * Standards-Version to 3.1.1.1 Added Build-depends field. + * Removed patches: dialer, drivemount-floppy, modemlights, term, + help-browser, debian-menu, url-match. + * Added patches: gtkhtml. + * Build against libgtkhtml3. Closes: #58679, #36806, #49734 + * Default manpath and infopath are wrong. Closes: #56081 + * gmenu segfaults. Close: #53764, #54050 + * gnome-panel: panel no longer works. Closes: #58278 + * gnome-panel: gnomepager-applet should put braces around. Closes: #52584 + * Backspace and delete work correctly. Closes: #54428 + * TERM never select xterm-debian. Closes: #56584, #55477, #64579 + * Disable arrows option is now saved. Closes: #54755 + * No more files in /usr/share. Closes: #61083 + * Show debian menus. Closes #66214 + * New help documentation for panel. Closes: #40036 + * Gnome-terminal write to /var/run/utmp. Closes #59053 + * gnome-terminal provide x-terminal-emulator. Closes #61805, #56225 + * README.Debian is here. Closes: #65235 + + -- Christian Marillat Tue, 25 Jul 2000 19:09:21 +0200 + +gnome-core (1.0.55-2) frozen unstable; urgency=low + + * Make x-window-manager run first by gnome-wm script to conform to + debian policy (Closes: #61617) (This is an important bug) + + -- James LewisMoss Sun, 21 May 2000 19:31:19 -0400 + +gnome-core (1.0.55-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Sun, 2 Jan 2000 07:32:36 -0500 + +gnome-core (1.0.54-2) unstable; urgency=low + + * Fix the gnome-pager forgets size settings bug (was saved to wrong + section). Closes: #49839, #46845. + + -- James LewisMoss Fri, 12 Nov 1999 07:54:46 -0500 + +gnome-core (1.0.54-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Thu, 4 Nov 1999 23:20:14 -0500 + +gnome-core (1.0.53-4) unstable; urgency=low + + * New maintainer. + + -- James LewisMoss Mon, 25 Oct 1999 23:17:31 -0400 + +gnome-core (1.0.53-3) unstable; urgency=low + + * Ok, I made a mistake by setgiding gnome-terminal to + utmp. Reverted the change. Closes: #47960 + + -- Raphael Hertzog Mon, 18 Oct 1999 19:17:27 +0200 + +gnome-core (1.0.53-2) unstable; urgency=low + + * gnome-session does launch a default window-manager. It does launch + gnome-wm if no other information has been found. gnome-wm now + reads the list of window managers from /etc/X11/window-managers + once it has tried gnome compliant wm. Closes: #38347, #47370 + * Patched gnome-terminal. TERM=xterm-debian again ... actually this + closes: #47552, #44960, #41065 + * gnome-terminal is now setgid utmp and can thus register itself + in the UTMP database. Closes: #40507 + * The URL match does now accept % characters. Closes: #47281 + * libpanel-applet0.postinst check for the changelog.gz mysteriously + staying around. Closes: #45871 + * Unreproducable bugs without answer from the submitter. + Closes: #41195, #42865 + + -- Raphael Hertzog Sat, 16 Oct 1999 19:52:38 +0200 + +gnome-core (1.0.53-1) unstable; urgency=low + + * New upstream version. + * gnome-session does now depend on gnome-panel and recommends + gmc (both are needed for a full Gnome desktop). + * gnome-terminal does not have a border. Closes: #38972 + + -- Raphael Hertzog Tue, 12 Oct 1999 21:17:58 +0200 + +gnome-core (1.0.52-1) unstable; urgency=low + + * New maintainer. Steve said that he wanted to give away some of + his packages. I've asked to take gnome-core, he never replied, so + I'm taking it but I will give it back to him if he wanted to + keep it. In the meantime I can better manage bugs with my name + in the Maintainer field. + * New upstream version. + + -- Raphael Hertzog Mon, 4 Oct 1999 21:28:18 +0200 + +gnome-core (1.0.50-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Thu, 30 Sep 1999 22:10:03 +0200 + +gnome-core (1.0.41-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Mon, 27 Sep 1999 13:10:31 +0200 + +gnome-core (1.0.9-0.1) unstable; urgency=low + + * New upstream version. Closes: #43253, #44098 + * Apply patches before configuring (and relaunch automake && autoconf + because one of the patches is applied on Makefile.am). + * NMU. Thanks to Christian Marillat for his work. + * Imlib bug corrected: closes: #39085 + * X11 binaries don't have to go /usr/X11R6/bin. Closes: #24031 + * The panel does start correctly wihout complaining about a + missing name service. Closes: #39380, #39634, #40478 + * The panel doesn't consume all CPU resources. Closes: #30654 + * The panel launches apps from where it has been launched itself. + Closes: #32319 + * The panel keeps the settings. Closes: #37052, #40579, #43496 + * Old core dump corrected upstream. Closes: #39400, #40328, #42167 + Closes: #44344, #44724, #44732, #44759, #44773 + * Bug in menu-method, not in gnome-panel. Already reported against + menu. Closes: #40089 + * cdplayer_applet works again. Closes: #42192 + * gnome pager works well: Closes: #42499, #42610 + * modem_lights draws itself correctly. Closes: #43861, #45055 + * The dialer applets doesn't exit when stopping while + not yet connected. Closes: #45287 + * No more Debian menu in the panel. Closes: #41040 + * GnomeICU works with this panel. Closes: #39626, #39515 + * gnome-panel-data conflicts with asclock. + Closes: #40712, #40715, #40808, #41430 + A better solution will be needed. Maybe put asclock in his own + package or create a asclock-data package that will be shared. + * Updated the modemlights patch. Closes: #43512 + * Added a patch for gnome-wm. Closes: #38366 + * Move lib{gkb,fish}_applet.so files to libgnome-applet0 (those are + not libraries to be linked with, just simple modules). Closes: #38596 + * Asclock works well without xearth (the code still mentions xearth + however). Closes: #40530 + * New patch (help-browser) for changing the default MANPATH and INFOPATH in + gnome-help-browser.c Closes: #41452 + * Moved help-browser to the new "Help" menu section. + * Added gnome-help.mime. Closes: #42205 + * Gnome-session does launch gnome-panel ! (I suppose that it failed + to launch since panel was broken). Closes: #42937 + * gnome-sesion doesn't core dump. Closes: #36640 + * The terminal does remember the TERM var. Closes: #43067 + * The terminal keeps its size when dragging the manu bar in and out. + Closes: #44762 + * The menu section of gnome-terminal corrected. Closes: #37635 + + -- Raphael Hertzog Wed, 22 Sep 1999 13:24:34 +0200 + +gnome-core (1.0.7-1) unstable; urgency=low + + * New upstream version. + * Removed "term" patch + + -- Steve Haslam Mon, 28 Jun 1999 01:36:31 +0100 + +gnome-core (1.0.6-2) unstable; urgency=low + + * debian-menu.dpatch: created to fix guessing Debian menus + (/etc/menu-methods/gnome-panel now) and to make Debian menus the default + instead of GNOME system menus. + * gnome-help now suggests gnome-users-guide-en (closes: #35724) + * /etc/menu-methods/gnome-panel now creates .directory files and searches + /usr/X11R6/include/X11/pixmaps for menu icons + + -- Steve Haslam Sun, 13 Jun 1999 15:28:52 +0100 + +gnome-core (1.0.6-1) unstable; urgency=low + + * New upstream version. + + -- Steve Haslam Sat, 5 Jun 1999 12:57:08 +0100 + +gnome-core (1.0.5-3) unstable; urgency=low + + * debian/gnome-terminal.menu: managed to lose change mentioned in last + revision. Replaced. + * debian/gnome-core.undocumented: removed gnome-wm.1 (it was in + gnome-session.undocumented too). + + -- Steve Haslam Mon, 31 May 1999 19:15:54 +0100 + +gnome-core (1.0.5-2) unstable; urgency=low + + * debian/gnome-terminal.menu: changed section to XShells (Bug#37635) + * debian/rules: added gnome-wm and gnome-edit to dh_undocumented call + (Bug#37632) + * debian/gnome.menu-method: added patch to honour needs=text (Bug#36928) + from Decklin Foster + * Call dh_strip when making libpanel-applet-dev (Closes Bug#31244) + * Removed /usr/share/gnome/apps/Debian symlink, (closes #38100) + * Sanified build system a la gnome-libs + * debian/control: made gnome-help, gnome-help-data and gnome-panel-data + packages. + + -- Steve Haslam Sun, 23 May 1999 14:35:44 +0100 + +gnome-core (1.0.5-1) unstable; urgency=low + + * New maintainer. + + -- Steve Haslam Tue, 11 May 1999 01:01:12 +0100 + +gnome-core (1.0.5-0.2) unstable; urgency=low + + * gnome-panel.files.in: added asclock themes, libgkb_applet.a + * gnome-core.files.in: added gnome-wm, gnome-edit + * term.dpatch: gnome-terminal TERM to xterm-debian rather than xterm + * gsm/Makefile.am: put default.session, default.wm in /etc/gnome + * debian/gnome-session.conffiles.in: added above two files + * debian/gnome-session.files.in: updated this too + + -- Steve Haslam Sun, 18 Apr 1999 16:47:23 +0100 + +gnome-core (1.0.5-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version + + -- Steve Haslam Thu, 15 Apr 1999 23:22:23 +0100 + +gnome-core (1.0.1-0.3) unstable; urgency=low + + * Weehay! More broken dependencies. This one libghttp -1.1, + a bogus package that only ever existed on my machine. + + -- Jules Bean Mon, 8 Mar 1999 08:24:00 +0000 + +gnome-core (1.0.1-0.2) unstable; urgency=low + + * Another NMU, this time to fix bogus dependencies on libgtop0 + and libglib1.1 + + -- Jules Bean Sun, 7 Mar 1999 14:21:12 +0000 + +gnome-core (1.0.1-0.1) unstable; urgency=low + + * NMU for GNOME-1.0 + * Hacked to patch SIGPIPE bug + * Don't delete GIFs in rules + + -- Jules Bean Fri, 5 Mar 1999 18:36:29 +0100 + +gnome-core (0.99.99pre1.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Fri, 26 Feb 1999 23:18:10 -0800 + +gnome-core (0.99.3.2-4) unstable; urgency=low + + * Recompiled yet again - dual dependency on libglib. + Fixes: BUG#32510 + + -- Jim Pick Thu, 28 Jan 1999 00:00:22 -0800 + +gnome-core (0.99.3.2-3) unstable; urgency=low + + * Recompiled again to due to dependencies. + + -- Jim Pick Sun, 24 Jan 1999 01:10:07 -0800 + +gnome-core (0.99.3.2-2) unstable; urgency=low + + * Recompiled with libgnome 0.99.4. + + -- Jim Pick Fri, 22 Jan 1999 16:44:45 -0800 + +gnome-core (0.99.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Wed, 20 Jan 1999 11:42:46 -0800 + +gnome-core (0.30-2) frozen unstable; urgency=low + + * Recompiled with new libs. + * Fixed reference to /usr/X11R6 in README.Debian. + * Added warnings (Gnome is ALPHA). + * Patched dialer_applet to use pon/poff. + * Patched drivemount_applet to default to /floppy. + + -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800 + +gnome-core (0.30-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700 + +gnome-core (0.28.1-1) unstable; urgency=low + + * New upstream release. + * Hopefully fixes panel applet bug. + + -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700 + +gnome-core (0.28-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700 + +gnome-core (0.27-1) unstable; urgency=low + + * New upstream release. + * Added /usr/doc/gnome + + -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700 + +gnome-core (0.25-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700 + +gnome-core (0.20-2) unstable; urgency=low + + * Added Debian menu-method for gnome-panel. Fixed Bug #24025 + (Thanks to Ray Dassen for reporting the bug, and Riku Voipio + who wrote the menu method for Gnome 0.12) + + -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700 + +gnome-core (0.20-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700 + +gnome-core (0.13-1) unstable; urgency=low + + * Initial Release. + + -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800 + --- gnome-session-2.27.92.orig/debian/README.Debian +++ gnome-session-2.27.92/debian/README.Debian @@ -0,0 +1,56 @@ +gnome-session for Debian +======================== + +Applications at startup +----------------------- + +Upon startup, gnome-session starts the following applications: + - Saved session: if you have saved a session, it is located in + ~/.config/gnome-session/saved-session/. You can enable automatic + session saving or manually save it in the "Startup Applications" + configuration applet. + - Autostart applications: applications shipping a .desktop file in + /usr/share/gnome/autostart or /etc/xdg/autostart. This includes the + keyring manager, the settings daemon, nautilus and the power + manager. They can be selectively disabled in the configuration + applet. + - Required components: they are listed in the + /desktop/gnome/session/required_components_list GConf key. In + Debian, this only includes the window manager and the panel. + (Upstream also includes the file manager, but in Debian it is an + autostart application.) + The required components are always respawned if they crash or exit. + To disable them, you need to change this GConf key. If you want to + use an alternate panel or window manager, you need to change the + corresponding key in /desktop/gnome/session/required_components/. + + +Enabling the splash screen +-------------------------- + +Displaying a splash screen implies a noticeable delay in login for most users, +hence it's disabled by default. You can enable the default splash screen by +setting the /apps/gnome-session/options/show_splash_screen GConf key. + +Some theme packages might provide other splash pixmaps, notably desktop-base. + + +Changing the splash screen +-------------------------- + +Debian's gnome-session uses a Debian-related splash screen instead of +the original GNOME splash screen by default. You can change the the +splash screen that should be used using the following gconf key: + + /apps/gnome-session/options/splash_image + + +Changing the window manager +--------------------------- + +By default, gnome-session tries to start compiz, metacity or sawfish if +they are installed, then falls back to the system default. + +If you want to specify the window manager by hand, you can set the +/desktop/gnome/session/required_components/windowmanager GConf key to +the value of your preferred one. --- gnome-session-2.27.92.orig/debian/control.in +++ gnome-session-2.27.92/debian/control.in @@ -0,0 +1,69 @@ +Source: gnome-session +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.1 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-session/ubuntu +Build-Depends: cdbs (>= 0.4.41), + quilt, + debhelper (>= 5.0.13), + gnome-pkg-tools (>= 0.13), + sharutils, + intltool (>= 0.40.0), + libglib2.0-dev (>= 2.16.0), + libgtk2.0-dev (>= 2.14.0), + libdbus-glib-1-dev (>= 0.76), + libgconf2-dev (>= 2.10.1-6), + libstartup-notification0-dev, + libsm-dev, + libice-dev, + libx11-dev, + libxt-dev, + libxau-dev, + xtrans-dev, + libxext-dev, + libxtst-dev, + libxrender-dev, + xmlto, + xsltproc, + libdevkit-power-gobject-dev (>= 008) + +Package: gnome-session +Architecture: all +Depends: ${misc:Depends}, + gnome-settings-daemon (>= 2.26), + gnome-panel, + nautilus, + metacity | compiz-gnome | sawfish, + gnome-session-bin (>= ${gnome:Version}), + gnome-session-bin (<< ${gnome:NextVersion}) +Replaces: libgnomevfs2-common (<< 1:2.24.0-3) +Conflicts: bug-buddy (<< 2.20), + libgnomevfs2-common (<< 1:2.24.0-3) +Breaks: gnome-panel (<< 2.26), + xserver-xorg (<< 1:7.4) +Provides: x-session-manager +Suggests: gnome-user-guide | gnome2-user-guide, + desktop-base, + gnome-keyring +Description: The GNOME Session Manager + This package contains an X11-compliant "session manager" (similar to xsm) + with GNOME extensions. When you log out, the session manager will save the + state of all your GNOME apps. When you log back in, the session manager + will restore your session. + +Package: gnome-session-bin +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + dbus-x11, + policykit-1-gnome +Replaces: gnome-session (<< 2.26.1-5) +Breaks: consolekit (<< 0.3.0-2ubuntu5), gnome-session (<< 2.26.1-5) +Description: The GNOME Session Manager - Minimal runtime + This package contains the binaries for the GNOME Session Manager, but + no startup scripts. It is meant for those willing to start + gnome-session by hand with the components of their choice, and for + applications such as GDM that use gnome-session internally. --- gnome-session-2.27.92.orig/debian/compat +++ gnome-session-2.27.92/debian/compat @@ -0,0 +1 @@ +5 --- gnome-session-2.27.92.orig/debian/patches/98_autotools.patch +++ gnome-session-2.27.92/debian/patches/98_autotools.patch @@ -0,0 +1,18807 @@ +diff -Nur gnome-session-2.27.92/aclocal.m4 gnome-session-2.27.92.ubuntu/aclocal.m4 +--- gnome-session-2.27.92/aclocal.m4 2009-09-09 02:15:01.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/aclocal.m4 2009-09-09 22:09:18.000000000 +0200 +@@ -13,1866 +13,1866 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +-[m4_warning([this file was generated for autoconf 2.63. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, ++[m4_warning([this file was generated for autoconf 2.64. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.11' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) ++ AC_ARG_WITH([gconf-source], ++ AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ [Config database for installing schema files.]), ++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ AC_ARG_WITH([gconf-schema-file-dir], ++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ [Directory for installing schema files.]), ++ [GCONF_SCHEMA_FILE_DIR="$withval"],) + +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ AC_HELP_STRING([--disable-schemas-install], ++ [Disable the schemas installation]), ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) ++ ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +-# Free Software Foundation, Inc. ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 ++# ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 ++# ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) + +-# serial 9 ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl + +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-m4_define([_AM_COND_VALUE_$1], [$2])dnl +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) ++ ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) + else +- $1_TRUE='#' +- $1_FALSE= ++ AC_MSG_RESULT(no) + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_SUBST($1)dnl ++]) + +-# serial 10 ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ gt_cv_have_gettext=no + ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +- +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- am__universal=false +- m4_case([$1], [CC], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac], +- [CXX], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac]) +- +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" +- case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) + fi +- ;; +- msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; +- none) break ;; +- esac +- if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) + fi +- fi +- done + +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" + ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-]) ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi + +-#serial 5 ++ # We need to process the po/ directory. ++ POSUB=po + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +- done +-} +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +-# Do all the work for Automake. -*- Autoconf -*- ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi + +-# serial 16 ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.62])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi +-fi ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` + fi +-AC_SUBST([CYGPATH_W]) +- +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +- +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +- +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +-AC_CONFIG_COMMANDS_PRE(dnl +-[m4_provide_if([_AM_COMPILER_EXEEXT], +- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) + ]) + +-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +-dnl mangled by Autoconf and run in a shell conditional statement. +-m4_define([_AC_COMPILER_EXEEXT], +-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. + +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++# gnome-common.m4 ++# + +-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl GNOME_COMMON_INIT + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi +-AC_SUBST(install_sh)]) ++AC_DEFUN([GNOME_COMMON_INIT], ++[ ++ dnl this macro should come after AC_CONFIG_MACRO_DIR ++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ dnl ensure that when the Automake generated makefile calls aclocal, ++ dnl it honours the $ACLOCAL_FLAGS environment variable ++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" ++ if test -n "$ac_macro_dir"; then ++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" ++ fi + +-# serial 2 ++ AC_SUBST([ACLOCAL_AMFLAGS]) ++]) + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) ++AC_DEFUN([GNOME_DEBUG_CHECK], ++[ ++ AC_ARG_ENABLE([debug], ++ AC_HELP_STRING([--enable-debug], ++ [turn on debugging]),, ++ [enable_debug=no]) ++ ++ if test x$enable_debug = xyes ; then ++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1, ++ [Enable additional debugging at the expense of performance and size]) ++ fi ++]) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++dnl GNOME_MAINTAINER_MODE_DEFINES () ++dnl define DISABLE_DEPRECATED ++dnl ++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], ++[ ++ AC_REQUIRE([AM_MAINTAINER_MODE]) + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ if test $USE_MAINTAINER_MODE = yes; then ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" ++ fi ++ AC_SUBST(DISABLE_DEPRECATED) ++]) + +-# serial 5 ++dnl GNOME_COMPILE_WARNINGS ++dnl Turn on many useful compiler warnings ++dnl For now, only works on GCC ++AC_DEFUN([GNOME_COMPILE_WARNINGS],[ ++ dnl ****************************** ++ dnl More compiler warnings ++ dnl ****************************** + +-# AM_MAINTAINER_MODE([DEFAULT-MODE]) +-# ---------------------------------- +-# Control maintainer-specific portions of Makefiles. +-# Default is to disable them, unless `enable' is passed literally. +-# For symmetry, `disable' may be passed as well. Anyway, the user +-# can override the default with the --enable/--disable switch. +-AC_DEFUN([AM_MAINTAINER_MODE], +-[m4_case(m4_default([$1], [disable]), +- [enable], [m4_define([am_maintainer_other], [disable])], +- [disable], [m4_define([am_maintainer_other], [enable])], +- [m4_define([am_maintainer_other], [enable]) +- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +- dnl maintainer-mode's default is 'disable' unless 'enable' is passed +- AC_ARG_ENABLE([maintainer-mode], +-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- [USE_MAINTAINER_MODE=$enableval], +- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST([MAINT])dnl +-] +-) ++ AC_ARG_ENABLE(compile-warnings, ++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], ++ [Turn on compiler warnings]),, ++ [enable_compile_warnings="m4_default([$1],[yes])"]) + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" + +-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ case "$enable_compile_warnings" in ++ no) ++ warning_flags= ++ ;; ++ minimum) ++ warning_flags="-Wall" ++ ;; ++ yes) ++ warning_flags="-Wall -Wmissing-prototypes" ++ ;; ++ maximum|error) ++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" ++ CFLAGS="$warning_flags $CFLAGS" ++ for option in -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ AC_MSG_CHECKING([whether gcc understands $option]) ++ AC_TRY_COMPILE([], [], ++ has_option=yes, ++ has_option=no,) ++ CFLAGS="$SAVE_CFLAGS" ++ AC_MSG_RESULT($has_option) ++ if test $has_option = yes; then ++ warning_flags="$warning_flags $option" ++ fi ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++ if test "$enable_compile_warnings" = "error" ; then ++ warning_flags="$warning_flags -Werror" ++ fi ++ ;; ++ *) ++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) ++ ;; ++ esac ++ CFLAGS="$realsave_CFLAGS" ++ AC_MSG_CHECKING(what warning flags to pass to the C compiler) ++ AC_MSG_RESULT($warning_flags) + +-# serial 4 ++ AC_ARG_ENABLE(iso-c, ++ AC_HELP_STRING([--enable-iso-c], ++ [Try to warn if code is not ISO C ]),, ++ [enable_iso_c=no]) + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo this is the am__doit target +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf ++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) ++ complCFLAGS= ++ if test "x$enable_iso_c" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -ansi" ;; ++ esac ++ case " $CFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCFLAGS) ++ ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) + ]) + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++dnl For C++, do basically the same thing. + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_DEFUN([GNOME_CXX_WARNINGS],[ ++ AC_ARG_ENABLE(cxx-warnings, ++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] ++ [Turn on compiler warnings.]),, ++ [enable_cxx_warnings="m4_default([$1],[minimum])"]) + +-# serial 6 ++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) ++ warnCXXFLAGS= ++ if test "x$GXX" != xyes; then ++ enable_cxx_warnings=no ++ fi ++ if test "x$enable_cxx_warnings" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ esac + +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++ ## -W is not all that useful. And it cannot be controlled ++ ## with individual -Wno-xxx flags, unlike -Wall ++ if test "x$enable_cxx_warnings" = "xyes"; then ++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" ++ fi ++ fi ++ fi ++ AC_MSG_RESULT($warnCXXFLAGS) + ++ AC_ARG_ENABLE(iso-cxx, ++ AC_HELP_STRING([--enable-iso-cxx], ++ [Try to warn if code is not ISO C++ ]),, ++ [enable_iso_cxx=no]) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi ++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) ++ complCXXFLAGS= ++ if test "x$enable_iso_cxx" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; ++ esac ++ ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCXXFLAGS) ++ ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) + ]) + +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# nls.m4 serial 3 (gettext-0.15) ++dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are *not* in the public domain. + +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +-]) ++dnl Authors: ++dnl Ulrich Drepper , 1995-2000. ++dnl Bruno Haible , 2000-2003. + +-# Helper functions for option handling. -*- Autoconf -*- ++AC_PREREQ(2.50) + +-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++AC_DEFUN([AM_NLS], ++[ ++ AC_MSG_CHECKING([whether NLS is requested]) ++ dnl Default is enabled NLS ++ AC_ARG_ENABLE(nls, ++ [ --disable-nls do not use Native Language Support], ++ USE_NLS=$enableval, USE_NLS=yes) ++ AC_MSG_RESULT($USE_NLS) ++ AC_SUBST(USE_NLS) ++]) ++ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# This program 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 program 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 program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + +-# serial 4 ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG + +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) + +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG + +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +-# Free Software Foundation, Inc. ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +-# serial 5 ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[[\\\"\#\$\&\'\`$am_lf]]*) +- AC_MSG_ERROR([unsafe absolute working directory name]);; +-esac +-case $srcdir in +- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +-esac ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + +-# Copyright (C) 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++$$1_PKG_ERRORS + +-# serial 1 ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +-# AM_SILENT_RULES([DEFAULT]) +-# -------------------------- +-# Enable less verbose build rules; with the default set to DEFAULT +-# (`yes' being less verbose, `no' or empty being verbose). +-AC_DEFUN([AM_SILENT_RULES], +-[AC_ARG_ENABLE([silent-rules], +-[ --enable-silent-rules less verbose build output (undo: `make V=1') +- --disable-silent-rules verbose build output (undo: `make V=0')]) +-case $enable_silent_rules in +-yes) AM_DEFAULT_VERBOSITY=0;; +-no) AM_DEFAULT_VERBOSITY=1;; +-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +-esac +-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +-AM_BACKSLASH='\' +-AC_SUBST([AM_BACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +-]) ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++_PKG_TEXT + +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES + +-# Copyright (C) 2006, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.11' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.11], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) + +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + +-# AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Public sister of _AM_SUBST_NOTMAKE. +-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.11])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +-# Check how to create a tarball. -*- Autoconf -*- ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. + # +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. + # +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. + +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) + +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir ++# AM_CONDITIONAL -*- Autoconf -*- + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl AM_GCONF_SOURCE_2 +-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +-dnl (i.e. pass to gconftool-2 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +-dnl you should install foo.schemas files +-dnl ++# serial 9 + +-AC_DEFUN([AM_GCONF_SOURCE_2], +-[ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` +- else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE +- fi ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) + +- AC_ARG_WITH([gconf-source], +- AC_HELP_STRING([--with-gconf-source=sourceaddress], +- [Config database for installing schema files.]), +- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++# serial 10 + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + +- AC_ARG_WITH([gconf-schema-file-dir], +- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], +- [Directory for installing schema files.]), +- [GCONF_SCHEMA_FILE_DIR="$withval"],) + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl + +- AC_ARG_ENABLE(schemas-install, +- [ --disable-schemas-install Disable the schemas installation], +- [case ${enableval} in +- yes|no) ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; +- esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +-]) ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) + +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. +-# +-# This file is free software, distributed under the terms of the GNU +-# General Public License. As a special exception to the GNU General +-# Public License, this file may be distributed as part of a program +-# that contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License +-# but which still want to provide support for the GNU gettext functionality. +-# +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 +-# +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 +-# +-# We need this here as well, since someone might use autoconf-2.5x +-# to configure GLib then an older version to configure a package +-# using AM_GLIB_GNU_GETTEXT +-AC_PREREQ(2.53) ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +-dnl +-dnl We go to great lengths to make sure that aclocal won't +-dnl try to pull in the installed version of these macros +-dnl when running aclocal in the glib directory. +-dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) +-dnl +-dnl At the end, if we're not within glib, we'll define the public +-dnl definitions in terms of our private definitions. +-dnl ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) + +-# GLIB_LC_MESSAGES +-#-------------------- +-glib_DEFUN([GLIB_LC_MESSAGES], +- [AC_CHECK_HEADERS([locale.h]) +- if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, +- [Define if your file defines LC_MESSAGES.]) +- fi +- fi]) ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +-# GLIB_PATH_PROG_WITH_TEST +-#---------------------------- +-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else + break + fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +- AC_MSG_RESULT([$]$1) ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir + else +- AC_MSG_RESULT(no) ++ am_cv_$1_dependencies_compiler_type=none + fi +-AC_SUBST($1)dnl ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) + ]) + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [USE_NLS=yes +- AC_SUBST(USE_NLS) +- +- gt_cv_have_gettext=no +- +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= +- +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" +- +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !ngettext ("","", 1)], +- gt_cv_func_ngettext_libc=yes, +- gt_cv_func_ngettext_libc=no) +- ]) +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !dgettext ("","")], +- gt_cv_func_dgettext_libc=yes, +- gt_cv_func_dgettext_libc=no) +- ]) +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- fi + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dgettext, +- gt_cv_func_dgettext_libintl=yes)])]) ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- AC_MSG_CHECKING([if -liconv is needed to use gettext]) +- AC_MSG_RESULT([]) +- AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dcgettext, +- [gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv], +- :,-liconv)], +- :,-liconv) +- fi + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- LIBS="$glib_save_LIBS" ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- MSGFMT_OPTS= +- AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +- AC_SUBST(MSGFMT_OPTS) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- ]) ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++#serial 5 + +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is not GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext program is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue + fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++ done ++} ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +- # We need to process the po/ directory. +- POSUB=po + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +- dnl These rules are solely for the distribution goal. While doing this +- dnl we only have to keep exactly one list of the available catalogs +- dnl in configure.in. +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done ++# Do all the work for Automake. -*- Autoconf -*- + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# AM_GLIB_GNU_GETTEXT +-# ------------------- +-# Do checks necessary for use of gettext. If a suitable implementation +-# of gettext is found in either in libintl or in the C library, +-# it will set INTLLIBS to the libraries needed for use of gettext +-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +-# on various variables needed by the Makefile.in.in installed by +-# glib-gettextize. +-dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- +- GLIB_LC_MESSAGES +- GLIB_WITH_NLS ++# serial 16 + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. + +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.62])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi ++fi + +- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly +- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). +- dnl Try to locate is. +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- AC_SUBST(MKINSTALLDIRS) ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) + +- dnl Generate list of files to be processed by xgettext which will +- dnl be included in po/Makefile. +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` +-else +- localedir=`eval echo "${datadir}/locale"` +-fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + +-dnl +-dnl Now the definitions that aclocal will find +-dnl +-ifdef(glib_configure_in,[],[ +-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +-])dnl ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +-# +-# Create a temporary file with TEST-FILE as its contents and pass the +-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +-# 0 and perform ACTION-IF-FAIL for any other exit status. +-AC_DEFUN([GLIB_RUN_PROG], +-[cat >conftest.foo <<_ACEOF +-$2 +-_ACEOF +-if AC_RUN_LOG([$1 conftest.foo]); then +- m4_ifval([$3], [$3], [:]) +-m4_ifvaln([$4], [else $4])dnl +-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +-fi]) + ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. + +-# gnome-common.m4 +-# ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-dnl GNOME_COMMON_INIT ++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([GNOME_COMMON_INIT], +-[ +- dnl this macro should come after AC_CONFIG_MACRO_DIR +- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++AC_SUBST(install_sh)]) + +- dnl ensure that when the Automake generated makefile calls aclocal, +- dnl it honours the $ACLOCAL_FLAGS environment variable +- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" +- if test -n "$ac_macro_dir"; then +- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" +- fi ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_SUBST([ACLOCAL_AMFLAGS]) +-]) ++# serial 2 + +-AC_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=no]) ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) + +- if test x$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi +-]) ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering + +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- DISABLE_DEPRECATED="" +- if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done +- fi ++# serial 5 + +- AC_SUBST(DISABLE_DEPRECATED) +-]) ++# AM_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. ++AC_DEFUN([AM_MAINTAINER_MODE], ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST([MAINT])dnl ++] ++) + +-dnl GNOME_COMPILE_WARNINGS +-dnl Turn on many useful compiler warnings +-dnl For now, only works on GCC +-AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +- dnl ****************************** +- dnl More compiler warnings +- dnl ****************************** ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- warning_flags= +- realsave_CFLAGS="$CFLAGS" ++# serial 4 + +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- AC_MSG_CHECKING([whether gcc understands $option]) +- AC_TRY_COMPILE([], [], +- has_option=yes, +- has_option=no,) +- CFLAGS="$SAVE_CFLAGS" +- AC_MSG_RESULT($has_option) +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- AC_MSG_CHECKING(what warning flags to pass to the C compiler) +- AC_MSG_RESULT($warning_flags) ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo this is the am__doit target ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) ++ ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_ARG_ENABLE(iso-c, +- AC_HELP_STRING([--enable-iso-c], +- [Try to warn if code is not ISO C ]),, +- [enable_iso_c=no]) ++# serial 6 + +- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCFLAGS) ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) + +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi + ]) + +-dnl For C++, do basically the same thing. ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac ++# Helper functions for option handling. -*- Autoconf -*- + +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" +- fi +- fi +- fi +- AC_MSG_RESULT($warnCXXFLAGS) ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) ++# serial 4 + +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +-# nls.m4 serial 3 (gettext-0.15) +-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +-dnl This file is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +-dnl +-dnl This file can can be used in projects which are not available under +-dnl the GNU General Public License or the GNU Library General Public +-dnl License but which still want to provide support for the GNU gettext +-dnl functionality. +-dnl Please note that the actual code of the GNU gettext library is covered +-dnl by the GNU Library General Public License, and the rest of the GNU +-dnl gettext package package is covered by the GNU General Public License. +-dnl They are *not* in the public domain. ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +-dnl Authors: +-dnl Ulrich Drepper , 1995-2000. +-dnl Bruno Haible , 2000-2003. ++# Check to make sure that the build environment is sane. -*- Autoconf -*- + +-AC_PREREQ(2.50) ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([AM_NLS], +-[ +- AC_MSG_CHECKING([whether NLS is requested]) +- dnl Default is enabled NLS +- AC_ARG_ENABLE(nls, +- [ --disable-nls do not use Native Language Support], +- USE_NLS=$enableval, USE_NLS=yes) +- AC_MSG_RESULT($USE_NLS) +- AC_SUBST(USE_NLS) +-]) ++# serial 5 + +-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +-# +-# Copyright © 2004 Scott James Remnant . +-# +-# This program 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 program 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 program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac + +-# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +-# ---------------------------------- +-AC_DEFUN([PKG_PROG_PKG_CONFIG], +-[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +-m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t "$srcdir/configure" conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) + fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_default([$1], [0.9.0]) +- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- PKG_CONFIG="" +- fi +- +-fi[]dnl +-])# PKG_PROG_PKG_CONFIG ++AC_MSG_RESULT(yes)]) + +-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# +-# Check to see whether a particular set of modules exists. Similar +-# to PKG_CHECK_MODULES(), but does not set variables or print errors. +-# ++# Copyright (C) 2009 Free Software Foundation, Inc. + # +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_EXISTS], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-if test -n "$PKG_CONFIG" && \ +- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) +-m4_ifvaln([$3], [else +- $3])dnl +-fi]) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# serial 1 + +-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +-# --------------------------------------------- +-m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried +-fi[]dnl +-])# _PKG_CONFIG ++# AM_SILENT_RULES([DEFAULT]) ++# -------------------------- ++# Enable less verbose build rules; with the default set to DEFAULT ++# (`yes' being less verbose, `no' or empty being verbose). ++AC_DEFUN([AM_SILENT_RULES], ++[AC_ARG_ENABLE([silent-rules], ++[ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0')]) ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) + +-# _PKG_SHORT_ERRORS_SUPPORTED +-# ----------------------------- +-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi[]dnl +-])# _PKG_SHORT_ERRORS_SUPPORTED ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +-# ++# Copyright (C) 2006, 2008 Free Software Foundation, Inc. + # +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++# serial 2 + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +-and $1[]_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details.]) ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +-if test $pkg_failed = yes; then +- _PKG_SHORT_ERRORS_SUPPORTED +- if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` +- else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++# Check how to create a tarball. -*- Autoconf -*- + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-$$1_PKG_ERRORS ++# serial 2 + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +-_PKG_TEXT +-])], +- [AC_MSG_RESULT([no]) +- $4]) +-elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl +-[The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break + +-_PKG_TEXT ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir + +-To get pkg-config, see .])], +- [$4]) +-else +- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +- AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) +-fi[]dnl +-])# PKG_CHECK_MODULES ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + + m4_include([m4/intltool.m4]) + m4_include([m4/libtool.m4]) +diff -Nur gnome-session-2.27.92/capplet/Makefile.in gnome-session-2.27.92.ubuntu/capplet/Makefile.in +--- gnome-session-2.27.92/capplet/Makefile.in 2009-09-09 02:15:07.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/capplet/Makefile.in 2009-09-09 22:09:24.000000000 +0200 +@@ -208,6 +208,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/compat/Makefile.in gnome-session-2.27.92.ubuntu/compat/Makefile.in +--- gnome-session-2.27.92/compat/Makefile.in 2009-09-09 02:15:08.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/compat/Makefile.in 2009-09-09 22:09:24.000000000 +0200 +@@ -229,6 +229,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/config.h.in gnome-session-2.27.92.ubuntu/config.h.in +--- gnome-session-2.27.92/config.h.in 2009-09-09 02:15:06.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/config.h.in 2009-09-09 22:09:23.000000000 +0200 +@@ -100,6 +100,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +diff -Nur gnome-session-2.27.92/configure gnome-session-2.27.92.ubuntu/configure +--- gnome-session-2.27.92/configure 2009-09-09 02:15:05.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/configure 2009-09-09 22:09:22.000000000 +0200 +@@ -1,20 +1,22 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for gnome-session 2.27.92. ++# Generated by GNU Autoconf 2.64 for gnome-session 2.27.92. + # + # Report bugs to . + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ++# Foundation, Inc. ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -22,23 +24,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -46,7 +40,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -57,7 +57,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -80,13 +80,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -96,15 +89,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -116,12 +109,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -133,330 +130,301 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +- +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- + # CDPATH. +-$as_unset CDPATH +- ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST + else +- as_have_required=no ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +- +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } + + exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_have_required=no + fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : + else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- case $as_dir in ++ as_found=: ++ case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi + done;; + esac ++ as_found=false + done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } + IFS=$as_save_IFS + + +- for as_shell in $as_candidate_shells $SHELL; do +- # 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 +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and ++$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 + fi +- +- + fi +- + fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ + ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append + +-exitcode=0 +-if as_func_success; then +- : ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' + else +- exitcode=1 +- echo as_func_success failed. +-fi ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi + +-if as_func_ret_success; then +- : ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_expr=false + fi + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_dirname=false + fi + +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. +-} ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= +@@ -473,8 +441,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +@@ -484,29 +451,18 @@ + exit + } + +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -536,7 +492,7 @@ + rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -555,10 +511,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -573,7 +529,6 @@ + + + +- + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +@@ -740,7 +695,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='gnome-session' +@@ -748,6 +702,7 @@ + PACKAGE_VERSION='2.27.92' + PACKAGE_STRING='gnome-session 2.27.92' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session' ++PACKAGE_URL='' + + ac_unique_file="gnome-session" + # Factoring default headers for most tests. +@@ -989,6 +944,7 @@ + program_transform_name + prefix + exec_prefix ++PACKAGE_URL + PACKAGE_BUGREPORT + PACKAGE_STRING + PACKAGE_VERSION +@@ -1164,8 +1120,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1191,8 +1146,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1396,8 +1350,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1413,8 +1366,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1444,17 +1396,17 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information." + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + +@@ -1471,15 +1423,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1502,8 +1452,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1533,11 +1482,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1576,13 +1523,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1708,7 +1653,8 @@ + --enable-iso-c Try to warn if code is not ISO C + --enable-deprecations warn about deprecated usages [default=no] + --enable-splash enable splash screen [default=no] +- --disable-schemas-install Disable the schemas installation ++ --disable-schemas-install ++ Disable the schemas installation + --enable-docbook-docs build documentation (requires xmlto) + --enable-ipv6 enable IPv6 extensions + --disable-rebuilds disable all source autogeneration rules +@@ -1842,21 +1788,378 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-session configure 2.27.92 +-generated by GNU Autoconf 2.63 ++generated by GNU Autoconf 2.64 + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit + fi ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_link ++ ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_func ++ ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_cpp ++ ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_run ++ ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_compile ++ ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++( cat <<\_ASBOX ++## ---------------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ## ++## ---------------------------------------------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_mongrel + cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-session $as_me 2.27.92, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ + +@@ -1892,8 +2195,8 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +-done ++ $as_echo "PATH: $as_dir" ++ done + IFS=$as_save_IFS + + } >&5 +@@ -1930,9 +2233,9 @@ + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else +@@ -1948,13 +2251,13 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args '$ac_arg'" ++ as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done + done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there +@@ -1979,13 +2282,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -2057,39 +2360,41 @@ + exit $exit_status + ' 0 + for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -f -r conftest* confdefs.h + ++$as_echo "/* confdefs.h */" > confdefs.h ++ + # Predefined preprocessor variables. + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ + + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. +@@ -2108,7 +2413,7 @@ + do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" +@@ -2119,7 +2424,7 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; +@@ -2127,7 +2432,7 @@ + esac + fi + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 + $as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -2142,11 +2447,11 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; +@@ -2156,17 +2461,17 @@ + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 + $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 + $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 + $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac +@@ -2178,43 +2483,20 @@ + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi + done + if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -2231,24 +2513,16 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2274,10 +2548,10 @@ + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then ++if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2285,11 +2559,11 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -2326,7 +2600,7 @@ + ;; + esac + +-done ++ done + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +@@ -2342,7 +2616,7 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 + $as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2353,7 +2627,7 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 +@@ -2364,15 +2638,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2394,11 +2664,8 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -2407,13 +2674,10 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +@@ -2441,7 +2705,7 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +@@ -2462,9 +2726,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2475,24 +2739,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2502,9 +2766,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2515,24 +2779,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2541,7 +2805,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2554,10 +2818,10 @@ + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2565,7 +2829,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do ++ for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +@@ -2577,7 +2841,7 @@ + esac + done + done +-done ++ done + IFS=$as_save_IFS + + fi +@@ -2593,7 +2857,7 @@ + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" +@@ -2606,9 +2870,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then ++if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2619,24 +2883,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2644,11 +2908,11 @@ + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2666,11 +2930,11 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2690,9 +2954,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2749,7 +3011,7 @@ + + + # Check whether --enable-silent-rules was given. +-if test "${enable_silent_rules+set}" = set; then ++if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; + fi + +@@ -2763,16 +3025,16 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +-if test "${enable_maintainer_mode+set}" = set; then ++if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + $as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= +@@ -2798,7 +3060,7 @@ + + + # Check whether --enable-debug was given. +-if test "${enable_debug+set}" = set; then ++if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; + else + enable_debug=no +@@ -2807,24 +3069,22 @@ + + if test x$enable_debug = xyes ; then + +-cat >>confdefs.h <<\_ACEOF +-#define GNOME_ENABLE_DEBUG 1 +-_ACEOF ++$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h + + fi + + + +- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +-if test "${enable_nls+set}" = set; then ++if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval + else + USE_NLS=yes + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 + $as_echo "$USE_NLS" >&6; } + + +@@ -2840,7 +3100,7 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= +@@ -2868,12 +3128,12 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -2898,9 +3158,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2911,24 +3171,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2938,9 +3198,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -2951,24 +3211,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2977,7 +3237,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2991,9 +3251,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3004,24 +3264,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3031,9 +3291,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3045,18 +3305,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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 + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -3075,10 +3335,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3090,9 +3350,9 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3103,24 +3363,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3134,9 +3394,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3147,24 +3407,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3177,7 +3437,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3188,73 +3448,55 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include + int + main () + { ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 + $as_echo_n "checking for C compiler default output file name... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +@@ -3271,17 +3513,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -3298,7 +3540,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -3317,84 +3559,75 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 + $as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then ++if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } + fi +- + ac_exeext=$ac_cv_exeext + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 + $as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (case "(($ac_try" in ++ { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. ++as_fn_error "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + $as_echo "$cross_compiling" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -3409,32 +3642,24 @@ + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3446,17 +3671,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -3469,31 +3694,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3507,37 +3724,16 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -3546,20 +3742,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3570,35 +3762,11 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3609,36 +3777,12 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3649,42 +3793,17 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -3701,18 +3820,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -3769,32 +3884,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3805,17 +3897,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -3825,9 +3919,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -3935,7 +4029,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -3955,35 +4049,31 @@ + + case "$am__api_version" in + 1.01234) +- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + ;; + *) + ;; + esac + + if test -n "0.40.0"; then +- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 + $as_echo_n "checking for intltool >= 0.40.0... " >&6; } + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 + $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || +- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5 +-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 + fi + + # Extract the first word of "intltool-update", so it can be a program name with args. + set dummy intltool-update; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_UPDATE in +@@ -3996,14 +4086,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_UPDATE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4011,19 +4101,19 @@ + fi + INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE + if test -n "$INTLTOOL_UPDATE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 + $as_echo "$INTLTOOL_UPDATE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "intltool-merge", so it can be a program name with args. + set dummy intltool-merge; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_MERGE in +@@ -4036,14 +4126,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_MERGE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4051,19 +4141,19 @@ + fi + INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE + if test -n "$INTLTOOL_MERGE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 + $as_echo "$INTLTOOL_MERGE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "intltool-extract", so it can be a program name with args. + set dummy intltool-extract; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_EXTRACT in +@@ -4076,14 +4166,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_EXTRACT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4091,18 +4181,16 @@ + fi + INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT + if test -n "$INTLTOOL_EXTRACT"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 + $as_echo "$INTLTOOL_EXTRACT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then +- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +@@ -4148,9 +4236,9 @@ + # Check the gettext tools to make sure they are GNU + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $XGETTEXT in +@@ -4163,14 +4251,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4178,19 +4266,19 @@ + fi + XGETTEXT=$ac_cv_path_XGETTEXT + if test -n "$XGETTEXT"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "msgmerge", so it can be a program name with args. + set dummy msgmerge; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGMERGE+set}" = set; then ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGMERGE in +@@ -4203,14 +4291,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4218,19 +4306,19 @@ + fi + MSGMERGE=$ac_cv_path_MSGMERGE + if test -n "$MSGMERGE"; then +- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 + $as_echo "$MSGMERGE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGFMT in +@@ -4243,14 +4331,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4258,19 +4346,19 @@ + fi + MSGFMT=$ac_cv_path_MSGFMT + if test -n "$MSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -4283,14 +4371,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -4299,33 +4387,29 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + fi + xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" + mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" + mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" + if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then +- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + fi + + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_PERL in +@@ -4338,14 +4422,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4353,34 +4437,28 @@ + fi + INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL + if test -n "$INTLTOOL_PERL"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 + $as_echo "$INTLTOOL_PERL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$INTLTOOL_PERL"; then +- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 +-$as_echo "$as_me: error: perl not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "perl not found; required for intltool" "$LINENO" 5 + fi + if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then +- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 +-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "perl 5.x required for intltool" "$LINENO" 5 + fi + if test "x" != "xno-xml"; then +- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 + $as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + fi + fi + +@@ -4390,11 +4468,7 @@ + # Set DATADIRNAME correctly if it is not set yet + # (copied from glib-gettext.m4) + if test -z "$DATADIRNAME"; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4406,120 +4480,13 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in ++ case $host in + *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef bind_textdomain_codeset +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif +- +-int +-main () +-{ +-return bind_textdomain_codeset (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + DATADIRNAME=share + else + DATADIRNAME=lib +@@ -4531,10 +4498,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + +@@ -4542,17 +4507,13 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 + $as_echo_n "checking for library containing strerror... " >&6; } +-if test "${ac_cv_search_strerror+set}" = set; then ++if test "${ac_cv_search_strerror+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -4577,54 +4538,27 @@ + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_strerror=$ac_res +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_strerror+set}" = set; then ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then : + break + fi + done +-if test "${ac_cv_search_strerror+set}" = set; then +- : ++if test "${ac_cv_search_strerror+set}" = set; then : ++ + else + ac_cv_search_strerror=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 + $as_echo "$ac_cv_search_strerror" >&6; } + ac_res=$ac_cv_search_strerror +-if test "$ac_res" != no; then ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi +@@ -4637,9 +4571,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4650,24 +4584,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4677,9 +4611,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -4690,24 +4624,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4716,7 +4650,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -4730,9 +4664,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4743,24 +4677,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4770,9 +4704,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4784,18 +4718,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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 + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -4814,10 +4748,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4829,9 +4763,9 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4842,24 +4776,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4873,9 +4807,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -4886,24 +4820,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4916,7 +4850,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -4927,62 +4861,42 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4996,37 +4910,16 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -5035,20 +4928,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5059,35 +4948,11 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5098,36 +4963,12 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5138,42 +4979,17 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -5190,18 +5006,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -5258,32 +5070,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -5294,17 +5083,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -5314,9 +5105,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -5424,7 +5215,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -5444,14 +5235,14 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 + $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -5466,11 +5257,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -5479,78 +5266,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -5562,7 +5305,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -5573,11 +5316,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -5586,87 +5325,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -5676,9 +5368,9 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -5689,7 +5381,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ 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_test_x "$ac_path_GREP"; } || continue +@@ -5709,7 +5401,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -5724,26 +5416,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -5757,7 +5447,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ 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_test_x "$ac_path_EGREP"; } || continue +@@ -5777,7 +5467,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -5792,12 +5482,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -5805,21 +5493,17 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -5834,48 +5518,23 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -5885,18 +5544,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -5906,14 +5561,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -5940,57 +5591,28 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + case `pwd` in + *\ * | *\ *) +- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + +@@ -6015,35 +5637,27 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then ++if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -6059,28 +5673,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then ++if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -6096,9 +5706,9 @@ + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then ++if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -6106,7 +5716,7 @@ + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= ++ { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST +@@ -6115,7 +5725,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do ++ for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +@@ -6135,7 +5745,7 @@ + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" +@@ -6150,19 +5760,17 @@ + $ac_path_SED_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 + $as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +@@ -6180,9 +5788,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then ++if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -6196,7 +5804,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do ++ for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +@@ -6216,7 +5824,7 @@ + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" +@@ -6231,12 +5839,10 @@ + $ac_path_FGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -6244,7 +5850,7 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 + $as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + +@@ -6270,7 +5876,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -6279,7 +5885,7 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +@@ -6309,13 +5915,13 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -6346,18 +5952,16 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 + $as_echo "$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -6370,7 +5974,7 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 + $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + +@@ -6382,9 +5986,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if test "${lt_cv_path_NM+set}" = set; then ++if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -6431,7 +6035,7 @@ + : ${lt_cv_path_NM=no} + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +@@ -6442,9 +6046,9 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -6455,24 +6059,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 + $as_echo "$DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6486,9 +6090,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -6499,24 +6103,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_DUMPBIN="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 + $as_echo "$ac_ct_DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6529,7 +6133,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6549,44 +6153,44 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then ++if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6559: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6163: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6562: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6166: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6565: output\"" >&5) ++ (eval echo "\"\$as_me:6169: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 + $as_echo "no, using $LN_S" >&6; } + fi + + # find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -6704,10 +6308,10 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 + $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 + $as_echo "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len +@@ -6721,7 +6325,7 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 + $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } + # Try some XSI features + xsi_shell=no +@@ -6731,17 +6335,17 @@ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 + $as_echo "$xsi_shell" >&6; } + + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 + $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 + $as_echo "$lt_shell_append" >&6; } + + +@@ -6776,14 +6380,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then ++if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 + $as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in +@@ -6812,9 +6416,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -6825,24 +6429,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6852,9 +6456,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -6865,24 +6469,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6891,7 +6495,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6911,9 +6515,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then ++if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -7107,7 +6711,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method +@@ -7127,9 +6731,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -7140,24 +6744,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 + $as_echo "$AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7167,9 +6771,9 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then +@@ -7180,24 +6784,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 + $as_echo "$ac_ct_AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7206,7 +6810,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7232,9 +6836,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -7245,24 +6849,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7272,9 +6876,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -7285,24 +6889,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7311,7 +6915,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7331,9 +6935,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -7344,24 +6948,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 + $as_echo "$RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7371,9 +6975,9 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -7384,24 +6988,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 + $as_echo "$ac_ct_RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7410,7 +7014,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7488,9 +7092,9 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7606,18 +7210,18 @@ + int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -7670,11 +7274,11 @@ + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" +@@ -7708,10 +7312,10 @@ + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- { $as_echo "$as_me:$LINENO: result: failed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + fi + +@@ -7737,7 +7341,7 @@ + + + # Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then ++if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; + fi + +@@ -7749,11 +7353,11 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" +@@ -7767,12 +7371,12 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7770 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ echo '#line 7374 "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -7806,11 +7410,11 @@ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +@@ -7859,9 +7463,9 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then ++if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -7870,11 +7474,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7885,38 +7485,13 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -7924,7 +7499,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 + $as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +@@ -7934,11 +7509,11 @@ + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +@@ -7964,9 +7539,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -7977,24 +7552,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 + $as_echo "$DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8004,9 +7579,9 @@ + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -8017,24 +7592,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_DSYMUTIL="dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 + $as_echo "$ac_ct_DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8043,7 +7618,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8056,9 +7631,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -8069,24 +7644,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 + $as_echo "$NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8096,9 +7671,9 @@ + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -8109,24 +7684,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_NMEDIT="nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 + $as_echo "$ac_ct_NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8135,7 +7710,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8148,9 +7723,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LIPO+set}" = set; then ++if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -8161,24 +7736,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 + $as_echo "$LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8188,9 +7763,9 @@ + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -8201,24 +7776,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_LIPO="lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 + $as_echo "$ac_ct_LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8227,7 +7802,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8240,9 +7815,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL+set}" = set; then ++if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -8253,24 +7828,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 + $as_echo "$OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8280,9 +7855,9 @@ + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -8293,24 +7868,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_OTOOL="otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 + $as_echo "$ac_ct_OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8319,7 +7894,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8332,9 +7907,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -8345,24 +7920,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 + $as_echo "$OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8372,9 +7947,9 @@ + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -8385,24 +7960,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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_OTOOL64="otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 + $as_echo "$ac_ct_OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8411,7 +7986,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8447,9 +8022,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -8474,22 +8049,18 @@ + rm -f conftest.* + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8500,42 +8071,17 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no ++ lt_cv_ld_exported_symbols_list=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) +@@ -8573,69 +8119,14 @@ + esac + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -8645,62 +8136,13 @@ + done + + +- + for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_DLFCN_H 1 + _ACEOF + + fi +@@ -8720,7 +8162,7 @@ + + + # Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then ++if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +@@ -8751,7 +8193,7 @@ + + + # Check whether --enable-static was given. +-if test "${enable_static+set}" = set; then ++if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +@@ -8783,7 +8225,7 @@ + + + # Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then ++if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" + else + pic_mode=default +@@ -8799,7 +8241,7 @@ + + + # Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then ++if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +@@ -8880,9 +8322,9 @@ + setopt NO_GLOB_SUBST + fi + +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then ++if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -8895,7 +8337,7 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 + $as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + +@@ -8988,9 +8430,9 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -9041,10 +8483,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9054,9 +8496,9 @@ + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { $as_echo "$as_me:$LINENO: checking for file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -9107,10 +8549,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9191,9 +8633,9 @@ + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -9209,11 +8651,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:9212: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8654: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9216: \$? = $ac_status" >&5 ++ echo "$as_me:8658: \$? = $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. +@@ -9226,7 +8668,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +@@ -9246,7 +8688,7 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 + $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then +@@ -9518,7 +8960,7 @@ + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 + $as_echo "$lt_prog_compiler_pic" >&6; } + + +@@ -9530,9 +8972,9 @@ + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -9548,11 +8990,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:9551: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8993: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9555: \$? = $ac_status" >&5 ++ echo "$as_me:8997: \$? = $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. +@@ -9565,7 +9007,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +@@ -9589,9 +9031,9 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -9617,7 +9059,7 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 + $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then +@@ -9632,9 +9074,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -9653,11 +9095,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:9656: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9098: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9660: \$? = $ac_status" >&5 ++ echo "$as_me:9102: \$? = $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 +@@ -9679,7 +9121,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -9687,9 +9129,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -9708,11 +9150,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:9711: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9153: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9715: \$? = $ac_status" >&5 ++ echo "$as_me:9157: \$? = $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 +@@ -9734,7 +9176,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -9743,7 +9185,7 @@ + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* +@@ -9751,10 +9193,10 @@ + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +@@ -9767,7 +9209,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= +@@ -10209,11 +9651,7 @@ + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10224,27 +9662,7 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -10258,16 +9676,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -10280,11 +9691,7 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10295,27 +9702,7 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -10329,16 +9716,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -10550,42 +9930,16 @@ + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat >conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + int foo(void) {} + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +@@ -10841,7 +10195,7 @@ + fi + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 + $as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + +@@ -10878,16 +10232,16 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -10901,11 +10255,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc=no + else +@@ -10916,7 +10270,7 @@ + cat conftest.err 1>&5 + fi + $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 + $as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac +@@ -11080,7 +10434,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + + if test "$GCC" = yes; then +@@ -11502,11 +10856,7 @@ + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -11517,41 +10867,13 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes + fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +@@ -11763,7 +11085,7 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +@@ -11865,7 +11187,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || +@@ -11890,7 +11212,7 @@ + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 + $as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink || +@@ -11935,18 +11257,14 @@ + + darwin*) + # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -11964,43 +11282,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + +@@ -12013,33 +11306,19 @@ + ;; + + *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } +-if test "${ac_cv_func_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -12048,13 +11327,6 @@ + extern "C" + #endif + char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shl_load || defined __stub___shl_load +-choke me +-#endif +- + int + main () + { +@@ -12063,56 +11335,32 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shl_load=no ++ ac_cv_lib_dld_shl_load=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-$as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12121,81 +11369,38 @@ + #ifdef __cplusplus + extern "C" + #endif +-char shl_load (); ++char dlopen (); + int + main () + { +-return shl_load (); ++return dlopen (); + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dld_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } +-if test "${ac_cv_func_dlopen+set}" = set; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -12204,13 +11409,6 @@ + extern "C" + #endif + char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_dlopen || defined __stub___dlopen +-choke me +-#endif +- + int + main () + { +@@ -12219,192 +11417,28 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-$as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_svld_dlopen=no ++ ac_cv_lib_svld_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12422,43 +11456,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_dld_link=no ++ ac_cv_lib_dld_dld_link=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -12497,9 +11506,9 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then ++if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12508,7 +11517,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12511 "configure" ++#line 11520 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12567,11 +11576,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -12588,14 +11597,14 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 + $as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then ++if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12604,7 +11613,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12607 "configure" ++#line 11616 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12663,11 +11672,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -12684,7 +11693,7 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 + $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + +@@ -12723,12 +11732,12 @@ + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } + if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough +@@ -12737,15 +11746,15 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + ;; + esac +@@ -12763,12 +11772,12 @@ + + + # Report which library types will actually be built +- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 + $as_echo "$can_build_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + +@@ -12789,14 +11798,14 @@ + fi + ;; + esac +- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 + $as_echo "$enable_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 + $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 + $as_echo "$enable_static" >&6; } + + +@@ -12833,9 +11842,9 @@ + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. + set dummy glib-genmarshal; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then ++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GLIB_GENMARSHAL in +@@ -12848,14 +11857,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -12863,10 +11872,10 @@ + fi + GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL + if test -n "$GLIB_GENMARSHAL"; then +- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 + $as_echo "$GLIB_GENMARSHAL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -12878,21 +11887,18 @@ + + + +- DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" + fi + + + + + +- + # Check whether --enable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then ++if test "${enable_compile_warnings+set}" = set; then : + enableval=$enable_compile_warnings; + else + enable_compile_warnings="maximum" +@@ -12923,13 +11929,9 @@ + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 + $as_echo_n "checking whether gcc understands $option... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -12940,35 +11942,14 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + has_option=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- has_option=no ++ has_option=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" +- { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 + $as_echo "$has_option" >&6; } + if test $has_option = yes; then + warning_flags="$warning_flags $option" +@@ -12982,26 +11963,24 @@ + fi + ;; + *) +- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 + ;; + esac + CFLAGS="$realsave_CFLAGS" +- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 + $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 + $as_echo "$warning_flags" >&6; } + + # Check whether --enable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then ++if test "${enable_iso_c+set}" = set; then : + enableval=$enable_iso_c; + else + enable_iso_c=no + fi + + +- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 + $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then +@@ -13016,7 +11995,7 @@ + esac + fi + fi +- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 + $as_echo "$complCFLAGS" >&6; } + + WARN_CFLAGS="$warning_flags $complCFLAGS" +@@ -13024,7 +12003,7 @@ + + + # Check whether --enable-deprecations was given. +-if test "${enable_deprecations+set}" = set; then ++if test "${enable_deprecations+set}" = set; then : + enableval=$enable_deprecations; + else + enable_deprecations=no +@@ -13048,9 +12027,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -13063,14 +12042,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -13078,10 +12057,10 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 + $as_echo "$PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -13091,9 +12070,9 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -13106,14 +12085,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -13121,10 +12100,10 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 + $as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -13133,7 +12112,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -13146,13 +12125,13 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + PKG_CONFIG="" + fi +@@ -13161,19 +12140,20 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GNOME_SESSION" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_SESSION" >&5 + $as_echo_n "checking for GNOME_SESSION... " >&6; } + +-if test -n "$GNOME_SESSION_CFLAGS"; then +- pkg_cv_GNOME_SESSION_CFLAGS="$GNOME_SESSION_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GNOME_SESSION_CFLAGS"; then ++ pkg_cv_GNOME_SESSION_CFLAGS="$GNOME_SESSION_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED + gio-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED +-\"") >&5 ++\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED +@@ -13181,8 +12161,8 @@ + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED + ") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GNOME_SESSION_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED +@@ -13192,19 +12172,21 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GNOME_SESSION_LIBS"; then +- pkg_cv_GNOME_SESSION_LIBS="$GNOME_SESSION_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GNOME_SESSION_LIBS"; then ++ pkg_cv_GNOME_SESSION_LIBS="$GNOME_SESSION_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED + gio-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED +-\"") >&5 ++\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED +@@ -13212,8 +12194,8 @@ + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED + ") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GNOME_SESSION_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED +@@ -13223,8 +12205,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13237,24 +12220,24 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED ++ GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED +-" 2>&1` ++"` + else +- GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED ++ GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED +-" 2>&1` ++"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOME_SESSION_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED ++ as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED +@@ -13269,38 +12252,11 @@ + Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS + and GNOME_SESSION_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED +- gio-2.0 >= $GLIB_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED +- dbus-glib-1 >= $DBUS_GLIB_REQUIRED +- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED +-) were not met: +- +-$GNOME_SESSION_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS +-and GNOME_SESSION_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS +-and GNOME_SESSION_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -13309,64 +12265,73 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + GNOME_SESSION_CFLAGS=$pkg_cv_GNOME_SESSION_CFLAGS + GNOME_SESSION_LIBS=$pkg_cv_GNOME_SESSION_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for SESSION_PROPERTIES" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SESSION_PROPERTIES" >&5 + $as_echo_n "checking for SESSION_PROPERTIES... " >&6; } + +-if test -n "$SESSION_PROPERTIES_CFLAGS"; then +- pkg_cv_SESSION_PROPERTIES_CFLAGS="$SESSION_PROPERTIES_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SESSION_PROPERTIES_CFLAGS"; then ++ pkg_cv_SESSION_PROPERTIES_CFLAGS="$SESSION_PROPERTIES_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED +-\"") >&5 ++ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED ++\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED + ") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SESSION_PROPERTIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED + " 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SESSION_PROPERTIES_LIBS"; then +- pkg_cv_SESSION_PROPERTIES_LIBS="$SESSION_PROPERTIES_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SESSION_PROPERTIES_LIBS"; then ++ pkg_cv_SESSION_PROPERTIES_LIBS="$SESSION_PROPERTIES_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED +-\"") >&5 ++ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED ++\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED + ") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SESSION_PROPERTIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED + " 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13379,32 +12344,22 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SESSION_PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED ++ SESSION_PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED +-" 2>&1` ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++"` + else +- SESSION_PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED ++ SESSION_PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED +-" 2>&1` ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SESSION_PROPERTIES_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED +-) were not met: +- +-$SESSION_PROPERTIES_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS +-and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED ++ as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED + ) were not met: + + $SESSION_PROPERTIES_PKG_ERRORS +@@ -13415,22 +12370,11 @@ + Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS + and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS +-and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -13439,38 +12383,38 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + SESSION_PROPERTIES_CFLAGS=$pkg_cv_SESSION_PROPERTIES_CFLAGS + SESSION_PROPERTIES_LIBS=$pkg_cv_SESSION_PROPERTIES_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for SPLASH" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPLASH" >&5 + $as_echo_n "checking for SPLASH... " >&6; } + +-if test -n "$SPLASH_CFLAGS"; then +- pkg_cv_SPLASH_CFLAGS="$SPLASH_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SPLASH_CFLAGS"; then ++ pkg_cv_SPLASH_CFLAGS="$SPLASH_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + libstartup-notification-1.0 +- gconf-2.0\"") >&5 ++ gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + libstartup-notification-1.0 + gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SPLASH_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED +@@ -13479,26 +12423,28 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SPLASH_LIBS"; then +- pkg_cv_SPLASH_LIBS="$SPLASH_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SPLASH_LIBS"; then ++ pkg_cv_SPLASH_LIBS="$SPLASH_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + libstartup-notification-1.0 +- gconf-2.0\"") >&5 ++ gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + libstartup-notification-1.0 + gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SPLASH_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED +@@ -13507,8 +12453,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13521,37 +12468,22 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SPLASH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED ++ SPLASH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + libstartup-notification-1.0 +- gconf-2.0" 2>&1` ++ gconf-2.0"` + else +- SPLASH_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED ++ SPLASH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + libstartup-notification-1.0 +- gconf-2.0" 2>&1` ++ gconf-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SPLASH_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED +- dbus-glib-1 >= $DBUS_GLIB_REQUIRED +- libstartup-notification-1.0 +- gconf-2.0) were not met: +- +-$SPLASH_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables SPLASH_CFLAGS +-and SPLASH_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED ++ as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + libstartup-notification-1.0 +@@ -13565,22 +12497,11 @@ + Alternatively, you may set the environment variables SPLASH_CFLAGS + and SPLASH_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables SPLASH_CFLAGS +-and SPLASH_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -13589,58 +12510,61 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + SPLASH_CFLAGS=$pkg_cv_SPLASH_CFLAGS + SPLASH_LIBS=$pkg_cv_SPLASH_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for COMPAT" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMPAT" >&5 + $as_echo_n "checking for COMPAT... " >&6; } + +-if test -n "$COMPAT_CFLAGS"; then +- pkg_cv_COMPAT_CFLAGS="$COMPAT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED +- dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$COMPAT_CFLAGS"; then ++ pkg_cv_COMPAT_CFLAGS="$COMPAT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED ++ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_COMPAT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$COMPAT_LIBS"; then +- pkg_cv_COMPAT_LIBS="$COMPAT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED +- dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$COMPAT_LIBS"; then ++ pkg_cv_COMPAT_LIBS="$COMPAT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED ++ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_COMPAT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13653,28 +12577,16 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- COMPAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED +- dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` ++ COMPAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + else +- COMPAT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED +- dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` ++ COMPAT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$COMPAT_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED +- dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: +- +-$COMPAT_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables COMPAT_CFLAGS +-and COMPAT_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED ++ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: + + $COMPAT_PKG_ERRORS +@@ -13685,12 +12597,11 @@ + Alternatively, you may set the environment variables COMPAT_CFLAGS + and COMPAT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -13699,62 +12610,55 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables COMPAT_CFLAGS +-and COMPAT_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + COMPAT_CFLAGS=$pkg_cv_COMPAT_CFLAGS + COMPAT_LIBS=$pkg_cv_COMPAT_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for SM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SM" >&5 + $as_echo_n "checking for SM... " >&6; } + +-if test -n "$SM_CFLAGS"; then +- pkg_cv_SM_CFLAGS="$SM_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sm\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SM_CFLAGS"; then ++ pkg_cv_SM_CFLAGS="$SM_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sm\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sm") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SM_CFLAGS=`$PKG_CONFIG --cflags "sm" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SM_LIBS"; then +- pkg_cv_SM_LIBS="$SM_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sm\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SM_LIBS"; then ++ pkg_cv_SM_LIBS="$SM_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sm\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sm") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_SM_LIBS=`$PKG_CONFIG --libs "sm" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13767,25 +12671,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sm" 2>&1` ++ SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sm"` + else +- SM_PKG_ERRORS=`$PKG_CONFIG --print-errors "sm" 2>&1` ++ SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sm"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SM_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (sm) were not met: +- +-$SM_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables SM_CFLAGS +-and SM_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (sm) were not met: ++ as_fn_error "Package requirements (sm) were not met: + + $SM_PKG_ERRORS + +@@ -13795,22 +12688,11 @@ + Alternatively, you may set the environment variables SM_CFLAGS + and SM_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables SM_CFLAGS +-and SM_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -13819,51 +12701,54 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + SM_CFLAGS=$pkg_cv_SM_CFLAGS + SM_LIBS=$pkg_cv_SM_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for ICE" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICE" >&5 + $as_echo_n "checking for ICE... " >&6; } + +-if test -n "$ICE_CFLAGS"; then +- pkg_cv_ICE_CFLAGS="$ICE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$ICE_CFLAGS"; then ++ pkg_cv_ICE_CFLAGS="$ICE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ice\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ice") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_ICE_CFLAGS=`$PKG_CONFIG --cflags "ice" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$ICE_LIBS"; then +- pkg_cv_ICE_LIBS="$ICE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$ICE_LIBS"; then ++ pkg_cv_ICE_LIBS="$ICE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ice\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ice") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_ICE_LIBS=`$PKG_CONFIG --libs "ice" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13876,25 +12761,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ice" 2>&1` ++ ICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ice"` + else +- ICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "ice" 2>&1` ++ ICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ice"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ICE_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (ice) were not met: +- +-$ICE_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables ICE_CFLAGS +-and ICE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (ice) were not met: ++ as_fn_error "Package requirements (ice) were not met: + + $ICE_PKG_ERRORS + +@@ -13904,22 +12778,11 @@ + Alternatively, you may set the environment variables ICE_CFLAGS + and ICE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables ICE_CFLAGS +-and ICE_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -13928,52 +12791,55 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + ICE_CFLAGS=$pkg_cv_ICE_CFLAGS + ICE_LIBS=$pkg_cv_ICE_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for DBUS_GLIB" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB" >&5 + $as_echo_n "checking for DBUS_GLIB... " >&6; } + +-if test -n "$DBUS_GLIB_CFLAGS"; then +- pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_GLIB_CFLAGS"; then ++ pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DBUS_GLIB_LIBS"; then +- pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_GLIB_LIBS"; then ++ pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13986,25 +12852,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` ++ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + else +- DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` ++ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_GLIB_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: +- +-$DBUS_GLIB_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS +-and DBUS_GLIB_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: ++ as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: + + $DBUS_GLIB_PKG_ERRORS + +@@ -14014,22 +12869,11 @@ + Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS + and DBUS_GLIB_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS +-and DBUS_GLIB_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -14038,51 +12882,54 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS + DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GCONF" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5 + $as_echo_n "checking for GCONF... " >&6; } + +-if test -n "$GCONF_CFLAGS"; then +- pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GCONF_CFLAGS"; then ++ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GCONF_LIBS"; then +- pkg_cv_GCONF_LIBS="$GCONF_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GCONF_LIBS"; then ++ pkg_cv_GCONF_LIBS="$GCONF_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14095,25 +12942,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1` ++ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0"` + else +- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1` ++ GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GCONF_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gconf-2.0) were not met: +- +-$GCONF_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables GCONF_CFLAGS +-and GCONF_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (gconf-2.0) were not met: ++ as_fn_error "Package requirements (gconf-2.0) were not met: + + $GCONF_PKG_ERRORS + +@@ -14123,22 +12959,11 @@ + Alternatively, you may set the environment variables GCONF_CFLAGS + and GCONF_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables GCONF_CFLAGS +-and GCONF_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -14147,52 +12972,55 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS + GCONF_LIBS=$pkg_cv_GCONF_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for EGG_SMCLIENT" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG_SMCLIENT" >&5 + $as_echo_n "checking for EGG_SMCLIENT... " >&6; } + +-if test -n "$EGG_SMCLIENT_CFLAGS"; then +- pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EGG_SMCLIENT_CFLAGS"; then ++ pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_EGG_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$EGG_SMCLIENT_LIBS"; then +- pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EGG_SMCLIENT_LIBS"; then ++ pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_EGG_SMCLIENT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14205,25 +13033,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1` ++ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"` + else +- EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1` ++ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EGG_SMCLIENT_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met: +- +-$EGG_SMCLIENT_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS +-and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (gtk+-2.0) were not met: ++ as_fn_error "Package requirements (gtk+-2.0) were not met: + + $EGG_SMCLIENT_PKG_ERRORS + +@@ -14233,22 +13050,11 @@ + Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS + and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS +-and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -14257,12 +13063,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS + EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -14270,7 +13075,7 @@ + + + # Check whether --with-default-wm was given. +-if test "${with_default_wm+set}" = set; then ++if test "${with_default_wm+set}" = set; then : + withval=$with_default_wm; + else + with_default_wm="metacity" +@@ -14289,7 +13094,7 @@ + + + # Check whether --enable-splash was given. +-if test "${enable_splash+set}" = set; then ++if test "${enable_splash+set}" = set; then : + enableval=$enable_splash; + else + enable_splash=no +@@ -14307,9 +13112,9 @@ + + # Extract the first word of "gconftool-2", so it can be a program name with args. + set dummy gconftool-2; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GCONFTOOL+set}" = set; then ++if test "${ac_cv_path_GCONFTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GCONFTOOL in +@@ -14322,14 +13127,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no" +@@ -14338,18 +13143,16 @@ + fi + GCONFTOOL=$ac_cv_path_GCONFTOOL + if test -n "$GCONFTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 + $as_echo "$GCONFTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test x"$GCONFTOOL" = xno; then +- { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5 +-$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 + fi + + +@@ -14361,13 +13164,13 @@ + + + # Check whether --with-gconf-source was given. +-if test "${with_gconf_source+set}" = set; then ++if test "${with_gconf_source+set}" = set; then : + withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" + fi + + + +- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 + $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } + + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +@@ -14376,22 +13179,20 @@ + + + # Check whether --with-gconf-schema-file-dir was given. +-if test "${with_gconf_schema_file_dir+set}" = set; then ++if test "${with_gconf_schema_file_dir+set}" = set; then : + withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" + fi + + + +- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 + $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } + + # Check whether --enable-schemas-install was given. +-if test "${enable_schemas_install+set}" = set; then ++if test "${enable_schemas_install+set}" = set; then : + enableval=$enable_schemas_install; case ${enableval} in + yes|no) ;; +- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 +-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + esac + fi + +@@ -14413,9 +13214,9 @@ + + # Extract the first word of "gconf-sanity-check-2", so it can be a program name with args. + set dummy gconf-sanity-check-2; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GCONF_SANITY_CHECK+set}" = set; then ++if test "${ac_cv_path_GCONF_SANITY_CHECK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GCONF_SANITY_CHECK in +@@ -14428,14 +13229,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GCONF_SANITY_CHECK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GCONF_SANITY_CHECK" && ac_cv_path_GCONF_SANITY_CHECK="no" +@@ -14444,18 +13245,16 @@ + fi + GCONF_SANITY_CHECK=$ac_cv_path_GCONF_SANITY_CHECK + if test -n "$GCONF_SANITY_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GCONF_SANITY_CHECK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_SANITY_CHECK" >&5 + $as_echo "$GCONF_SANITY_CHECK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test x"$GCONF_SANITY_CHECK" = xno; then +- { { $as_echo "$as_me:$LINENO: error: gconf-sanity-check-2 executable not found in your path - should be installed with GConf" >&5 +-$as_echo "$as_me: error: gconf-sanity-check-2 executable not found in your path - should be installed with GConf" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "gconf-sanity-check-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 + fi + + +@@ -14480,12 +13279,12 @@ + esac + + if test $pango_omitted_x_deps = yes ; then +- { $as_echo "$as_me:$LINENO: checking for X" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 + $as_echo_n "checking for X... " >&6; } + + + # Check whether --with-x was given. +-if test "${with_x+set}" = set; then ++if test "${with_x+set}" = set; then : + withval=$with_x; + fi + +@@ -14495,10 +13294,8 @@ + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} +- { (exit 1); exit 1; }; };; #( +- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then ++ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # One or both of the vars are not set, and there is no cached value. +@@ -14546,21 +13343,25 @@ + # Check X11 before X11Rn because it is often a symlink to the current release. + ac_x_header_dirs=' + /usr/X11/include ++/usr/X11R7/include + /usr/X11R6/include + /usr/X11R5/include + /usr/X11R4/include + + /usr/include/X11 ++/usr/include/X11R7 + /usr/include/X11R6 + /usr/include/X11R5 + /usr/include/X11R4 + + /usr/local/X11/include ++/usr/local/X11R7/include + /usr/local/X11R6/include + /usr/local/X11R5/include + /usr/local/X11R4/include + + /usr/local/include/X11 ++/usr/local/include/X11R7 + /usr/local/include/X11R6 + /usr/local/include/X11R5 + /usr/local/include/X11R4 +@@ -14582,37 +13383,14 @@ + if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir +@@ -14620,7 +13398,6 @@ + fi + done + fi +- + rm -f conftest.err conftest.$ac_ext + fi # $ac_x_includes = no + +@@ -14630,11 +13407,7 @@ + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -14645,35 +13418,12 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- LIBS=$ac_save_LIBS ++ LIBS=$ac_save_LIBS + for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + do + # Don't even attempt the hair of trying to link an X program! +@@ -14685,10 +13435,8 @@ + done + done + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no + + case $ac_x_includes,$ac_x_libraries in #( +@@ -14709,7 +13457,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 + $as_echo "$have_x" >&6; } + no_x=yes + else +@@ -14720,16 +13468,14 @@ + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" +- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 + $as_echo "libraries $x_libraries, headers $x_includes" >&6; } + fi + + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +-cat >>confdefs.h <<\_ACEOF +-#define X_DISPLAY_MISSING 1 +-_ACEOF ++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= + else +@@ -14742,16 +13488,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 . . . . +- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 + $as_echo_n "checking whether -R must be followed by a space... " >&6; } + 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 +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -14762,40 +13504,13 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ LIBS="$ac_xsave_LIBS -R $x_libraries" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -14806,46 +13521,19 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { $as_echo "$as_me:$LINENO: result: neither works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 + $as_echo "neither works" >&6; } + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LIBS=$ac_xsave_LIBS + fi +@@ -14861,11 +13549,7 @@ + # libraries were built with DECnet support. And Karl Berry says + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14883,44 +13567,17 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_link "$LINENO"; then : + +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -14938,59 +13595,30 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dnet_dnet_ntoa=no ++ ac_cv_lib_dnet_dnet_ntoa=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then ++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15008,52 +13636,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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dnet_stub_dnet_ntoa=no ++ ac_cv_lib_dnet_stub_dnet_ntoa=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then ++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi + + fi + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, +@@ -15064,105 +13665,20 @@ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-$as_echo_n "checking for gethostbyname... " >&6; } +-if test "${ac_cv_func_gethostbyname+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : ++ ++fi ++ ++ if test $ac_cv_func_gethostbyname = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 ++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. +- For example, HP-UX 11i declares gettimeofday. */ +-#define gethostbyname innocuous_gethostbyname +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char gethostbyname (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef gethostbyname +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gethostbyname (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_gethostbyname || defined __stub___gethostbyname +-choke me +-#endif +- +-int +-main () +-{ +-return gethostbyname (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_gethostbyname=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_gethostbyname=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +-$as_echo "$ac_cv_func_gethostbyname" >&6; } +- +- if test $ac_cv_func_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lnsl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15180,59 +13696,30 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_nsl_gethostbyname=no ++ ac_cv_lib_nsl_gethostbyname=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 + $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15250,43 +13737,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_bsd_gethostbyname=no ++ ac_cv_lib_bsd_gethostbyname=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 + $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then ++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -15300,105 +13762,20 @@ + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- { $as_echo "$as_me:$LINENO: checking for connect" >&5 +-$as_echo_n "checking for connect... " >&6; } +-if test "${ac_cv_func_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define connect to an innocuous variant, in case declares connect. +- For example, HP-UX 11i declares gettimeofday. */ +-#define connect innocuous_connect +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char connect (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef connect +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char connect (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_connect || defined __stub___connect +-choke me +-#endif +- +-int +-main () +-{ +-return connect (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_connect=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_connect=no +-fi ++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" ++if test "x$ac_cv_func_connect" = x""yes; then : + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-$as_echo "$ac_cv_func_connect" >&6; } + + if test $ac_cv_func_connect = no; then +- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 + $as_echo_n "checking for connect in -lsocket... " >&6; } +-if test "${ac_cv_lib_socket_connect+set}" = set; then ++if test "${ac_cv_lib_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15416,148 +13793,38 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_connect=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_socket_connect=no ++ ac_cv_lib_socket_connect=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 + $as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = x""yes; then ++if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- { $as_echo "$as_me:$LINENO: checking for remove" >&5 +-$as_echo_n "checking for remove... " >&6; } +-if test "${ac_cv_func_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define remove to an innocuous variant, in case declares remove. +- For example, HP-UX 11i declares gettimeofday. */ +-#define remove innocuous_remove +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char remove (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef remove +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char remove (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_remove || defined __stub___remove +-choke me +-#endif +- +-int +-main () +-{ +-return remove (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_remove=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_remove=no +-fi ++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" ++if test "x$ac_cv_func_remove" = x""yes; then : + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +-$as_echo "$ac_cv_func_remove" >&6; } + + if test $ac_cv_func_remove = no; then +- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 + $as_echo_n "checking for remove in -lposix... " >&6; } +-if test "${ac_cv_lib_posix_remove+set}" = set; then ++if test "${ac_cv_lib_posix_remove+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15575,76 +13842,39 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_posix_remove=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_posix_remove=no ++ ac_cv_lib_posix_remove=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 + $as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = x""yes; then ++if test "x$ac_cv_lib_posix_remove" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +-$as_echo_n "checking for shmat... " >&6; } +-if test "${ac_cv_func_shmat+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" ++if test "x$ac_cv_func_shmat" = x""yes; then : ++ ++fi ++ ++ if test $ac_cv_func_shmat = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 ++$as_echo_n "checking for shmat in -lipc... " >&6; } ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lipc $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define shmat to an innocuous variant, in case declares shmat. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shmat innocuous_shmat +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shmat (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shmat + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -15653,13 +13883,6 @@ + extern "C" + #endif + char shmat (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shmat || defined __stub___shmat +-choke me +-#endif +- + int + main () + { +@@ -15668,109 +13891,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shmat=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shmat=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +-$as_echo "$ac_cv_func_shmat" >&6; } +- +- if test $ac_cv_func_shmat = no; then +- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +-$as_echo_n "checking for shmat in -lipc... " >&6; } +-if test "${ac_cv_lib_ipc_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lipc $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shmat (); +-int +-main () +-{ +-return shmat (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ipc_shmat=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ipc_shmat=no ++ ac_cv_lib_ipc_shmat=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 + $as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then ++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -15786,18 +13918,14 @@ + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 + $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15815,43 +13943,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ICE_IceConnectionNumber=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ICE_IceConnectionNumber=no ++ ac_cv_lib_ICE_IceConnectionNumber=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then ++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -15861,26 +13964,20 @@ + + + if test x$no_x = xyes ; then +- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 +-$as_echo "$as_me: error: X development libraries not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "X development libraries not found" "$LINENO" 5 + else + X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + fi + fi + +-{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauFileName in -lXau" >&5 + $as_echo_n "checking for XauFileName in -lXau... " >&6; } +-if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then ++if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXau $X_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15898,50 +13995,22 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xau_XauFileName=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_Xau_XauFileName=no ++ ac_cv_lib_Xau_XauFileName=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauFileName" >&5 + $as_echo "$ac_cv_lib_Xau_XauFileName" >&6; } +-if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then ++if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then : + X_LIBS="$X_LIBS -lXau" + else +- { { $as_echo "$as_me:$LINENO: error: +-*** Can't find the Xauth library. It is needed to compile gnome-session." >&5 +-$as_echo "$as_me: error: +-*** Can't find the Xauth library. It is needed to compile gnome-session." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error " ++*** Can't find the Xauth library. It is needed to compile gnome-session." "$LINENO" 5 + fi + + +@@ -15949,61 +14018,16 @@ + + + have_xsync=no +-{ $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 +-$as_echo_n "checking for X11/extensions/sync.h... " >&6; } +-if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- +-#include +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_header_X11_extensions_sync_h=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_X11_extensions_sync_h=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then ++ac_fn_c_check_header_compile "$LINENO" "X11/extensions/sync.h" "ac_cv_header_X11_extensions_sync_h" "#include ++" ++if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then : + have_xsync=yes + fi + + + if test "$have_xsync" = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XSYNC 1 +-_ACEOF ++$as_echo "#define HAVE_XSYNC 1" >>confdefs.h + + fi + +@@ -16011,40 +14035,44 @@ + have_xtest=no + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for XTEST" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTEST" >&5 + $as_echo_n "checking for XTEST... " >&6; } + +-if test -n "$XTEST_CFLAGS"; then +- pkg_cv_XTEST_CFLAGS="$XTEST_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XTEST_CFLAGS"; then ++ pkg_cv_XTEST_CFLAGS="$XTEST_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_XTEST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$XTEST_LIBS"; then +- pkg_cv_XTEST_LIBS="$XTEST_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XTEST_LIBS"; then ++ pkg_cv_XTEST_LIBS="$XTEST_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_XTEST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -16057,14 +14085,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XTEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1` ++ XTEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xtst"` + else +- XTEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1` ++ XTEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xtst"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XTEST_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + have_xtest=no + elif test $pkg_failed = untried; then +@@ -16072,15 +14100,13 @@ + else + XTEST_CFLAGS=$pkg_cv_XTEST_CFLAGS + XTEST_LIBS=$pkg_cv_XTEST_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + have_xtest=yes + fi + if test "$have_xtest" = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XTEST 1 +-_ACEOF ++$as_echo "#define HAVE_XTEST 1" >>confdefs.h + + fi + +@@ -16090,40 +14116,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for XRENDER" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5 + $as_echo_n "checking for XRENDER... " >&6; } + +-if test -n "$XRENDER_CFLAGS"; then +- pkg_cv_XRENDER_CFLAGS="$XRENDER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrender\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XRENDER_CFLAGS"; then ++ pkg_cv_XRENDER_CFLAGS="$XRENDER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrender") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "xrender" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$XRENDER_LIBS"; then +- pkg_cv_XRENDER_LIBS="$XRENDER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrender\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XRENDER_LIBS"; then ++ pkg_cv_XRENDER_LIBS="$XRENDER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrender") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_XRENDER_LIBS=`$PKG_CONFIG --libs "xrender" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -16136,14 +14166,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XRENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrender" 2>&1` ++ XRENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrender"` + else +- XRENDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrender" 2>&1` ++ XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrender"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XRENDER_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + have_xrender=no + elif test $pkg_failed = untried; then +@@ -16151,7 +14181,7 @@ + else + XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS + XRENDER_LIBS=$pkg_cv_XRENDER_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + have_xrender=yes + fi +@@ -16165,9 +14195,7 @@ + + if test $have_xrender=yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XRENDER 1 +-_ACEOF ++$as_echo "#define HAVE_XRENDER 1" >>confdefs.h + + fi + +@@ -16176,7 +14204,7 @@ + + + # Check whether --enable-docbook-docs was given. +-if test "${enable_docbook_docs+set}" = set; then ++if test "${enable_docbook_docs+set}" = set; then : + enableval=$enable_docbook_docs; enable_docbook_docs=$enableval + else + enable_docbook_docs=auto +@@ -16184,9 +14212,9 @@ + + # Extract the first word of "xmlto", so it can be a program name with args. + set dummy xmlto; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XMLTO+set}" = set; then ++if test "${ac_cv_path_XMLTO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $XMLTO in +@@ -16199,14 +14227,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_XMLTO" && ac_cv_path_XMLTO="no" +@@ -16215,15 +14243,15 @@ + fi + XMLTO=$ac_cv_path_XMLTO + if test -n "$XMLTO"; then +- { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 + $as_echo "$XMLTO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + +-{ $as_echo "$as_me:$LINENO: checking whether to build DocBook documentation" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build DocBook documentation" >&5 + $as_echo_n "checking whether to build DocBook documentation... " >&6; } + if test x$XMLTO = xno ; then + have_docbook=no +@@ -16239,9 +14267,7 @@ + fi + if test x$enable_docbook_docs = xyes; then + if test x$have_docbook = xno; then +- { { $as_echo "$as_me:$LINENO: error: Building DocBook docs explicitly required, but DocBook not found" >&5 +-$as_echo "$as_me: error: Building DocBook docs explicitly required, but DocBook not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Building DocBook docs explicitly required, but DocBook not found" "$LINENO" 5 + fi + fi + if test x$enable_docbook_docs = xyes; then +@@ -16252,14 +14278,14 @@ + DOCBOOK_DOCS_ENABLED_FALSE= + fi + +-{ $as_echo "$as_me:$LINENO: result: $enable_docbook_docs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_docbook_docs" >&5 + $as_echo "$enable_docbook_docs" >&6; } + + # Extract the first word of "xsltproc", so it can be a program name with args. + set dummy xsltproc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XSLTPROC+set}" = set; then ++if test "${ac_cv_path_XSLTPROC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $XSLTPROC in +@@ -16272,14 +14298,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -16287,10 +14313,10 @@ + fi + XSLTPROC=$ac_cv_path_XSLTPROC + if test -n "$XSLTPROC"; then +- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 + $as_echo "$XSLTPROC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -16305,151 +14331,12 @@ + + + +- +-for ac_header in locale.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ## +-## ---------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_header in locale.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_LOCALE_H 1 + _ACEOF + + fi +@@ -16457,16 +14344,12 @@ + done + + if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 + $as_echo_n "checking for LC_MESSAGES... " >&6; } +-if test "${am_cv_val_LC_MESSAGES+set}" = set; then ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -16477,46 +14360,19 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- am_cv_val_LC_MESSAGES=no ++ am_cv_val_LC_MESSAGES=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 + $as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LC_MESSAGES 1 +-_ACEOF ++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + + fi + fi +@@ -16529,215 +14385,51 @@ + XGETTEXT=: + INTLLIBS= + +- if test "${ac_cv_header_libintl_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then ++ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" ++if test "x$ac_cv_header_libintl_h" = x""yes; then : ++ gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" ++ ++ # ++ # First check in libc ++ # ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 ++$as_echo_n "checking for ngettext in libc... " >&6; } ++if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-$as_echo_n "checking libintl.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default ++ + #include ++ ++int ++main () ++{ ++return !ngettext ("","", 1) ++ ; ++ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ gt_cv_func_ngettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no ++ gt_cv_func_ngettext_libc=no + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-$as_echo_n "checking libintl.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ## +-## ---------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_libintl_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +- +-fi +-if test "x$ac_cv_header_libintl_h" = x""yes; then +- gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" +- +- # +- # First check in libc +- # +- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +-$as_echo_n "checking for ngettext in libc... " >&6; } +-if test "${gt_cv_func_ngettext_libc+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +- +-int +-main () +-{ +-return !ngettext ("","", 1) +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gt_cv_func_ngettext_libc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_ngettext_libc=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 + $as_echo "$gt_cv_func_ngettext_libc" >&6; } + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 + $as_echo_n "checking for dgettext in libc... " >&6; } +-if test "${gt_cv_func_dgettext_libc+set}" = set; then ++if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -16750,141 +14442,26 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_dgettext_libc=no ++ gt_cv_func_dgettext_libc=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 + $as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF + + fi +@@ -16899,18 +14476,14 @@ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 + $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16928,55 +14501,26 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_bindtextdomain=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_bindtextdomain=no ++ ac_cv_lib_intl_bindtextdomain=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 + $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16994,55 +14538,26 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 + $as_echo_n "checking for dgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dgettext+set}" = set; then ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17060,43 +14575,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dgettext=no ++ ac_cv_lib_intl_dgettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 + $as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then ++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + fi + +@@ -17106,22 +14596,18 @@ + + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 + $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:$LINENO: result: " >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + $as_echo "" >&6; } +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17139,55 +14625,26 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 + $as_echo_n "checking for dcgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17205,43 +14662,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dcgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dcgettext=no ++ ac_cv_lib_intl_dcgettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 + $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then ++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv + else +@@ -17263,108 +14695,18 @@ + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++fi ++done + +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +- LIBS="$glib_save_LIBS" ++ LIBS="$glib_save_LIBS" + + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no +@@ -17388,15 +14730,13 @@ + + if test "$gt_cv_have_gettext" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GETTEXT 1 +-_ACEOF ++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in +@@ -17421,118 +14761,28 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" +- +-for ac_func in dcgettext +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in dcgettext ++do : ++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" ++if test "x$ac_cv_func_dcgettext" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_DCGETTEXT 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 + $as_echo_n "checking if msgfmt accepts -c... " >&6; } + cat >conftest.foo <<_ACEOF + +@@ -17547,14 +14797,14 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +-else { $as_echo "$as_me:$LINENO: result: no" >&5 ++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 +@@ -17562,9 +14812,9 @@ + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -17577,14 +14827,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -17593,19 +14843,19 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in +@@ -17630,18 +14880,14 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -17653,121 +14899,14 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in ++ case $host in + *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef bind_textdomain_codeset +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif +- +-int +-main () +-{ +-return bind_textdomain_codeset (); +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -17782,10 +14921,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else +@@ -17799,9 +14936,7 @@ + + if test "$gt_cv_have_gettext" = "yes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_NLS 1 +-_ACEOF ++$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + fi + +@@ -17809,7 +14944,7 @@ + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else +- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 + $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi +@@ -17842,7 +14977,7 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 + $as_echo_n "checking for catalogs to be installed... " >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do +@@ -17867,7 +15002,7 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 + $as_echo "$LINGUAS" >&6; } + fi + +@@ -17900,16 +15035,12 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -17924,48 +15055,23 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -17975,18 +15081,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -17996,14 +15098,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -18030,199 +15128,31 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + +- +- +- + for ac_header in syslog.h tcpd.h sys/param.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ## +-## ---------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -18233,169 +15163,26 @@ + + + +- + for ac_header in execinfo.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ## +-## ---------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" ++if test "x$ac_cv_header_execinfo_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_EXECINFO_H 1 + _ACEOF + + fi + + done + +-{ $as_echo "$as_me:$LINENO: checking for backtrace in -lexecinfo" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lexecinfo" >&5 + $as_echo_n "checking for backtrace in -lexecinfo... " >&6; } +-if test "${ac_cv_lib_execinfo_backtrace+set}" = set; then ++if test "${ac_cv_lib_execinfo_backtrace+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lexecinfo $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -18413,43 +15200,18 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_execinfo_backtrace=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_execinfo_backtrace=no ++ ac_cv_lib_execinfo_backtrace=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_execinfo_backtrace" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5 + $as_echo "$ac_cv_lib_execinfo_backtrace" >&6; } +-if test "x$ac_cv_lib_execinfo_backtrace" = x""yes; then ++if test "x$ac_cv_lib_execinfo_backtrace" = x""yes; then : + EXECINFO_LIBS="-lexecinfo" + else + EXECINFO_LIBS="" +@@ -18459,151 +15221,12 @@ + + oCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $X_CFLAGS" +- + for ac_header in X11/Xtrans/Xtrans.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ## +-## ---------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "X11/Xtrans/Xtrans.h" "ac_cv_header_X11_Xtrans_Xtrans_h" "$ac_includes_default" ++if test "x$ac_cv_header_X11_Xtrans_Xtrans_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_X11_XTRANS_XTRANS_H 1 + _ACEOF + + fi +@@ -18612,10 +15235,10 @@ + + CFLAGS="$oCFLAGS" + +-{ $as_echo "$as_me:$LINENO: checking whether to enable ipv6" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ipv6" >&5 + $as_echo_n "checking whether to enable ipv6... " >&6; } + # Check whether --enable-ipv6 was given. +-if test "${enable_ipv6+set}" = set; then ++if test "${enable_ipv6+set}" = set; then : + enableval=$enable_ipv6; + else + enable_ipv6=yes +@@ -18623,11 +15246,7 @@ + + if test $enable_ipv6 = yes; then + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -18635,132 +15254,27 @@ + int + main () + { +- +- socket(AF_INET6, SOCK_STREAM, 0) +- +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- have_ipv6=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- have_ipv6=no +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $have_ipv6" >&5 +-$as_echo "$have_ipv6" >&6; } +- +- have_getaddrinfo=no +- if test $have_ipv6=yes; then +- { $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5 +-$as_echo_n "checking for getaddrinfo... " >&6; } +-if test "${ac_cv_func_getaddrinfo+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define getaddrinfo to an innocuous variant, in case declares getaddrinfo. +- For example, HP-UX 11i declares gettimeofday. */ +-#define getaddrinfo innocuous_getaddrinfo +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char getaddrinfo (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef getaddrinfo +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char getaddrinfo (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_getaddrinfo || defined __stub___getaddrinfo +-choke me +-#endif +- +-int +-main () +-{ +-return getaddrinfo (); ++ ++ socket(AF_INET6, SOCK_STREAM, 0) ++ + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_getaddrinfo=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ have_ipv6=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ have_ipv6=no + +- ac_cv_func_getaddrinfo=no + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ipv6" >&5 ++$as_echo "$have_ipv6" >&6; } + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 +-$as_echo "$ac_cv_func_getaddrinfo" >&6; } +-if test "x$ac_cv_func_getaddrinfo" = x""yes; then ++ have_getaddrinfo=no ++ if test $have_ipv6=yes; then ++ ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" ++if test "x$ac_cv_func_getaddrinfo" = x""yes; then : + have_getaddrinfo=yes + fi + +@@ -18768,18 +15282,14 @@ + # getaddrinfo is not in the default libraries. See if it's in some other. + for lib in bsd socket inet; do + as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_getaddrinfo" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for getaddrinfo in -l$lib" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -l$lib" >&5 + $as_echo_n "checking for getaddrinfo in -l$lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$lib $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -18797,47 +15307,20 @@ + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++eval as_val=\$$as_ac_Lib ++ if test "x$as_val" = x""yes; then : + LIBS="$LIBS -l$lib";have_getaddrinfo=yes; break + fi + +@@ -18845,9 +15328,7 @@ + fi + if test $have_getaddrinfo=yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_IPV6 1 +-_ACEOF ++$as_echo "#define ENABLE_IPV6 1" >>confdefs.h + + fi + fi +@@ -18858,9 +15339,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_AWK+set}" = set; then ++if test "${ac_cv_path_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $AWK in +@@ -18873,14 +15354,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -18888,10 +15369,10 @@ + fi + AWK=$ac_cv_path_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -18903,9 +15384,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PERL+set}" = set; then ++if test "${ac_cv_path_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PERL in +@@ -18918,14 +15399,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -18933,10 +15414,10 @@ + fi + PERL=$ac_cv_path_PERL + if test -n "$PERL"; then +- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 + $as_echo "$PERL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -18948,7 +15429,7 @@ + # define a MAINT-like variable REBUILD which is set if Perl + # and awk are found, so autogenerated sources can be rebuilt + # Check whether --enable-rebuilds was given. +-if test "${enable_rebuilds+set}" = set; then ++if test "${enable_rebuilds+set}" = set; then : + enableval=$enable_rebuilds; + else + enable_rebuilds=yes +@@ -18992,13 +15473,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -19006,8 +15487,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -19030,11 +15511,11 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi +@@ -19054,8 +15535,8 @@ + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -19071,80 +15552,54 @@ + fi + + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + ac_config_commands="$ac_config_commands po/stamp-it" + + + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${USE_GNOME_WM_TRUE}" && test -z "${USE_GNOME_WM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_GNOME_WM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_GNOME_WM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"USE_GNOME_WM\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_SPLASH_TRUE}" && test -z "${ENABLE_SPLASH_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SPLASH\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_SPLASH\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_SPLASH\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_XRENDER_TRUE}" && test -z "${HAVE_XRENDER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XRENDER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_XRENDER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_XRENDER\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + : ${CONFIG_STATUS=./config.status} + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 + $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -19154,17 +15609,18 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -19172,23 +15628,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -19196,7 +15644,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -19207,7 +15661,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -19230,13 +15684,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -19246,15 +15693,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -19266,12 +15713,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -19283,7 +15734,89 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -19297,8 +15830,12 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +@@ -19318,76 +15855,25 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -19416,8 +15902,56 @@ + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -19436,10 +15970,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -19454,13 +15988,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by gnome-session $as_me 2.27.92, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -19492,10 +16032,11 @@ + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +@@ -19517,16 +16058,16 @@ + Configuration commands: + $config_commands + +-Report bugs to ." ++Report bugs to ." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ + gnome-session config.status 2.27.92 +-configured by $0, generated by GNU Autoconf 2.63, ++configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -19569,20 +16110,19 @@ + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +@@ -19590,11 +16130,10 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -19931,9 +16470,7 @@ + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -19960,7 +16497,7 @@ + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + +@@ -19971,11 +16508,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} ++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -19983,10 +16516,16 @@ + if test -n "$CONFIG_FILES"; then + + +-ac_cr=' ' ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' ++ ac_cs_awk_cr='\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -20000,24 +16539,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -20106,9 +16639,7 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 + _ACEOF + + # VPATH may cause trouble with some makes, so we remove $(srcdir), +@@ -20149,9 +16680,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -20236,9 +16765,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -20251,9 +16778,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -20281,12 +16806,10 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't +@@ -20297,7 +16820,7 @@ + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + $as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. +@@ -20310,9 +16833,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -20340,47 +16861,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in +@@ -20437,7 +16918,6 @@ + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- + ac_sed_dataroot=' + /datarootdir/ { + p +@@ -20447,12 +16927,11 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' ++/@mandir@/p' + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +@@ -20462,7 +16941,7 @@ + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + +@@ -20491,14 +16970,12 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&2;} +@@ -20508,9 +16985,7 @@ + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -20521,25 +16996,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -20577,7 +17046,7 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac +@@ -20672,47 +17141,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +@@ -21359,9 +17788,7 @@ + esac ;; + "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then +- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + fi + rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" + >"po/stamp-it.tmp" +@@ -21384,15 +17811,12 @@ + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -21413,10 +17837,10 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit $? + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + +diff -Nur gnome-session-2.27.92/data/icons/16x16/Makefile.in gnome-session-2.27.92.ubuntu/data/icons/16x16/Makefile.in +--- gnome-session-2.27.92/data/icons/16x16/Makefile.in 2009-09-09 02:15:08.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/icons/16x16/Makefile.in 2009-09-09 22:09:24.000000000 +0200 +@@ -191,6 +191,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/data/icons/22x22/Makefile.in gnome-session-2.27.92.ubuntu/data/icons/22x22/Makefile.in +--- gnome-session-2.27.92/data/icons/22x22/Makefile.in 2009-09-09 02:15:08.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/icons/22x22/Makefile.in 2009-09-09 22:09:24.000000000 +0200 +@@ -191,6 +191,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/data/icons/24x24/Makefile.in gnome-session-2.27.92.ubuntu/data/icons/24x24/Makefile.in +--- gnome-session-2.27.92/data/icons/24x24/Makefile.in 2009-09-09 02:15:08.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/icons/24x24/Makefile.in 2009-09-09 22:09:24.000000000 +0200 +@@ -191,6 +191,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/data/icons/32x32/Makefile.in gnome-session-2.27.92.ubuntu/data/icons/32x32/Makefile.in +--- gnome-session-2.27.92/data/icons/32x32/Makefile.in 2009-09-09 02:15:08.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/icons/32x32/Makefile.in 2009-09-09 22:09:24.000000000 +0200 +@@ -191,6 +191,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/data/icons/48x48/Makefile.in gnome-session-2.27.92.ubuntu/data/icons/48x48/Makefile.in +--- gnome-session-2.27.92/data/icons/48x48/Makefile.in 2009-09-09 02:15:08.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/icons/48x48/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -191,6 +191,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/data/icons/Makefile.in gnome-session-2.27.92.ubuntu/data/icons/Makefile.in +--- gnome-session-2.27.92/data/icons/Makefile.in 2009-09-09 02:15:09.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/icons/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -207,6 +207,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/data/icons/scalable/Makefile.in gnome-session-2.27.92.ubuntu/data/icons/scalable/Makefile.in +--- gnome-session-2.27.92/data/icons/scalable/Makefile.in 2009-09-09 02:15:09.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/icons/scalable/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -191,6 +191,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/data/Makefile.in gnome-session-2.27.92.ubuntu/data/Makefile.in +--- gnome-session-2.27.92/data/Makefile.in 2009-09-09 02:15:08.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/data/Makefile.in 2009-09-09 22:09:24.000000000 +0200 +@@ -239,6 +239,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/doc/dbus/Makefile.in gnome-session-2.27.92.ubuntu/doc/dbus/Makefile.in +--- gnome-session-2.27.92/doc/dbus/Makefile.in 2009-09-09 02:15:09.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/doc/dbus/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -192,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/doc/Makefile.in gnome-session-2.27.92.ubuntu/doc/Makefile.in +--- gnome-session-2.27.92/doc/Makefile.in 2009-09-09 02:15:09.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/doc/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -207,6 +207,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/doc/man/Makefile.in gnome-session-2.27.92.ubuntu/doc/man/Makefile.in +--- gnome-session-2.27.92/doc/man/Makefile.in 2009-09-09 02:15:09.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/doc/man/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -192,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/egg/Makefile.in gnome-session-2.27.92.ubuntu/egg/Makefile.in +--- gnome-session-2.27.92/egg/Makefile.in 2009-09-09 02:15:09.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/egg/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -216,6 +216,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/gnome-session/Makefile.in gnome-session-2.27.92.ubuntu/gnome-session/Makefile.in +--- gnome-session-2.27.92/gnome-session/Makefile.in 2009-09-09 02:15:09.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/gnome-session/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -235,6 +235,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -336,6 +337,7 @@ + -DDATA_DIR=\""$(datadir)/gnome-session"\" \ + -DDBUS_LAUNCH=\"dbus-launch\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ ++ -DDATADIR=\""$(datadir)"\" \ + -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ + -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ + -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ +diff -Nur gnome-session-2.27.92/Makefile.in gnome-session-2.27.92.ubuntu/Makefile.in +--- gnome-session-2.27.92/Makefile.in 2009-09-09 02:15:10.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -225,6 +225,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/splash/Makefile.in gnome-session-2.27.92.ubuntu/splash/Makefile.in +--- gnome-session-2.27.92/splash/Makefile.in 2009-09-09 02:15:10.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/splash/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -229,6 +229,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +diff -Nur gnome-session-2.27.92/tools/Makefile.in gnome-session-2.27.92.ubuntu/tools/Makefile.in +--- gnome-session-2.27.92/tools/Makefile.in 2009-09-09 02:15:10.000000000 +0200 ++++ gnome-session-2.27.92.ubuntu/tools/Makefile.in 2009-09-09 22:09:25.000000000 +0200 +@@ -202,6 +202,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ --- gnome-session-2.27.92.orig/debian/patches/01_gnome-wm.patch +++ gnome-session-2.27.92/debian/patches/01_gnome-wm.patch @@ -0,0 +1,106 @@ +Index: gnome-session-2.27.5/data/gnome-wm +=================================================================== +--- gnome-session-2.27.5.orig/data/gnome-wm 2009-07-29 01:36:07.000000000 +0100 ++++ gnome-session-2.27.5/data/gnome-wm 2009-07-29 19:02:35.000000000 +0100 +@@ -40,11 +40,6 @@ + esac + done + +-# WINDOW_MANAGER overrides all +-if [ -z "$WINDOW_MANAGER" ] ; then +- WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required_components/windowmanager 2> /dev/null` +-fi +- + # Migrate compiz to compiz-manager if possible and needed + if [ "x$WINDOW_MANAGER" = "xcompiz" -o "x$DEFWM" = "xcompiz" ]; then + which compiz-manager > /dev/null 2>&1 +@@ -64,45 +59,30 @@ + WINDOW_MANAGER="" + fi + +-if [ -z "$WINDOW_MANAGER" ] ; then +- # Create a list of window manager we can handle, trying to only use the +- # compositing ones when it makes sense +- +- xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null +- IS_X_COMPOSITED=$? ++# If compiz-gtk is installed, we always use it; it will fall back to ++# metacity if it cannot find decent hardware. + +- KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" +- if [ $IS_X_COMPOSITED -eq 0 ] ; then +- KNOWN_WM="mutter compiz-manager compiz beryl $KNOWN_WM" +- fi +- # metacity is still the default wm in GNOME +- KNOWN_WM="metacity $KNOWN_WM" ++if [ -z "$WINDOW_MANAGER" ] && [ -x /usr/bin/gtk-window-decorator ] ; then ++ WINDOW_MANAGER=compiz ++fi + +- OLDIFS=$IFS +- if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then ++# If compiz is not installed (which is the default), use metacity instead. + +- for wm in $KNOWN_WM ; do +- IFS=":" +- for dir in $PATH ; do +- if [ -x "$dir/$wm" ] ; then +- WINDOW_MANAGER="$dir/$wm" +- break 2 +- fi +- done +- IFS=$OLDIFS +- done ++if [ -z "$WINDOW_MANAGER" ]; then ++ KNOWN_WM="metacity sawfish mutter" + +- else +- WINDOW_MANAGER=$DEFWM +- fi +- IFS=$OLDIFS ++ for wm in $KNOWN_WM; do ++ if [ -x /usr/bin/"$wm" ]; then ++ WINDOW_MANAGER=/usr/bin/"$wm" ++ break ++ fi ++ done + fi + +-# If no window manager can be found, we default to xterm ++# Look for the default window manager on the system + + if [ -z "$WINDOW_MANAGER" ] ; then +- echo "WARNING: No window manager can be found." +- WINDOW_MANAGER=xterm ++ WINDOW_MANAGER=$(readlink /etc/alternatives/x-window-manager 2>/dev/null) + fi + + # Now create options OPT1, OPT2 and OPT3 based on the windowmanager used +@@ -127,7 +107,7 @@ + OPT1=-s + OPT2=$SMID + ;; +- fvwm) ++ fvwm|fvwm2) + OPT1=-i + OPT2=$SMID + ;; +@@ -145,9 +125,8 @@ + + case `basename $WINDOW_MANAGER` in + compiz) +- export LIBGL_ALWAYS_INDIRECT=1 + gtk-window-decorator & +- OPT3=glib ++ #OPT3=glib + OPT4=gconf + ;; + beryl) +@@ -155,6 +134,6 @@ + ;; + esac + +-exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4 ++exec "$WINDOW_MANAGER" $OPT1 $OPT2 $OPT3 $OPT4 + + echo "ERROR: No window manager could run!" --- gnome-session-2.27.92.orig/debian/patches/95_dbus_request_shutdown.patch +++ gnome-session-2.27.92/debian/patches/95_dbus_request_shutdown.patch @@ -0,0 +1,97 @@ +Index: gnome-session-2.27.5/gnome-session/gsm-manager.c +=================================================================== +--- gnome-session-2.27.5.orig/gnome-session/gsm-manager.c 2009-07-29 20:13:42.000000000 +0100 ++++ gnome-session-2.27.5/gnome-session/gsm-manager.c 2009-07-29 20:13:42.000000000 +0100 +@@ -2984,6 +2984,48 @@ + } + + gboolean ++gsm_manager_request_shutdown (GsmManager *manager, ++ GError **error) ++{ ++ g_debug ("GsmManager: RequestShutdown called"); ++ ++ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); ++ ++ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { ++ g_set_error (error, ++ GSM_MANAGER_ERROR, ++ GSM_MANAGER_ERROR_NOT_IN_RUNNING, ++ "RequestShutdown interface is only available during the Running phase"); ++ return FALSE; ++ } ++ ++ request_shutdown (manager); ++ ++ return TRUE; ++} ++ ++gboolean ++gsm_manager_request_reboot (GsmManager *manager, ++ GError **error) ++{ ++ g_debug ("GsmManager: RequestReboot called"); ++ ++ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); ++ ++ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { ++ g_set_error (error, ++ GSM_MANAGER_ERROR, ++ GSM_MANAGER_ERROR_NOT_IN_RUNNING, ++ "RequestReboot interface is only available during the Running phase"); ++ return FALSE; ++ } ++ ++ request_reboot (manager); ++ ++ return TRUE; ++} ++ ++gboolean + gsm_manager_shutdown (GsmManager *manager, + GError **error) + { +Index: gnome-session-2.27.5/gnome-session/gsm-manager.h +=================================================================== +--- gnome-session-2.27.5.orig/gnome-session/gsm-manager.h 2009-07-29 20:13:41.000000000 +0100 ++++ gnome-session-2.27.5/gnome-session/gsm-manager.h 2009-07-29 20:13:42.000000000 +0100 +@@ -148,7 +148,10 @@ + guint flags, + gboolean *is_inhibited, + GError *error); +- ++gboolean gsm_manager_request_shutdown (GsmManager *manager, ++ GError **error); ++gboolean gsm_manager_request_reboot (GsmManager *manager, ++ GError **error); + gboolean gsm_manager_shutdown (GsmManager *manager, + GError **error); + +Index: gnome-session-2.27.5/gnome-session/org.gnome.SessionManager.xml +=================================================================== +--- gnome-session-2.27.5.orig/gnome-session/org.gnome.SessionManager.xml 2009-07-29 20:13:41.000000000 +0100 ++++ gnome-session-2.27.5/gnome-session/org.gnome.SessionManager.xml 2009-07-29 20:13:42.000000000 +0100 +@@ -309,6 +309,23 @@ + + + ++ ++ ++ ++ Request a shutdown with no dialog ++ ++ ++ ++ ++ ++ ++ ++ Request a reboot with no dialog ++ ++ ++ ++ ++ + + + --- gnome-session-2.27.92.orig/debian/patches/80_new_upstream_session_dialog.patch +++ gnome-session-2.27.92/debian/patches/80_new_upstream_session_dialog.patch @@ -0,0 +1,864 @@ +Index: gnome-session-2.27.91/gnome-session/gsm-manager.c +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-manager.c 2009-08-27 11:04:15.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-manager.c 2009-08-27 11:11:04.000000000 +1000 +@@ -2859,7 +2859,8 @@ + { + g_debug ("GsmManager: Logout dialog response: %d", response_id); + +- gtk_widget_destroy (GTK_WIDGET (logout_dialog)); ++ if (response_id != GTK_RESPONSE_HELP) ++ gtk_widget_destroy (GTK_WIDGET (logout_dialog)); + + /* In case of dialog cancel, switch user, hibernate and + * suspend, we just perform the respective action and return, +@@ -2869,6 +2870,10 @@ + case GTK_RESPONSE_NONE: + case GTK_RESPONSE_DELETE_EVENT: + break; ++ case GTK_RESPONSE_HELP: ++ gsm_util_help_display (GTK_WINDOW (logout_dialog), ++ "gosgetstarted-73"); ++ break; + case GSM_LOGOUT_RESPONSE_SWITCH_USER: + request_switch_user (manager); + break; +Index: gnome-session-2.27.91/gnome-session/gsm-util.c +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-util.c 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-util.c 2009-08-27 11:11:04.000000000 +1000 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -503,3 +504,75 @@ + g_error_free (bus_error); + } + } ++ ++void ++gsm_util_help_display (GtkWindow *parent, ++ const char *link_id) ++{ ++ GError *error = NULL; ++ char *command; ++ const char *lang; ++ char *uri = NULL; ++ GdkScreen *gscreen; ++ gboolean found; ++ ++ int i; ++ ++ const char * const * langs = g_get_language_names (); ++ ++ uri = NULL; ++ found = FALSE; ++ ++ for (i = 0; langs[i]; i++) { ++ lang = langs[i]; ++ if (strchr (lang, '.')) { ++ continue; ++ } ++ ++ uri = g_build_filename (DATADIR, ++ "/gnome/help/user-guide/", ++ lang, ++ "/user-guide.xml", ++ NULL); ++ ++ if (g_file_test (uri, G_FILE_TEST_EXISTS)) { ++ found = TRUE; ++ break; ++ } ++ } ++ ++ if (found) { ++ if (link_id) { ++ command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL); ++ } else { ++ command = g_strconcat ("gnome-open ghelp://", uri, NULL); ++ } ++ ++ gscreen = gdk_screen_get_default (); ++ gdk_spawn_command_line_on_screen (gscreen, command, &error); ++ } else ++ command = NULL; ++ ++ if (!found || error != NULL) { ++ GtkWidget *d; ++ const char *errmsg; ++ ++ if (!found) ++ errmsg = _("Cannot find help."); ++ else { ++ errmsg = error->message; ++ g_error_free (error); ++ } ++ ++ d = gtk_message_dialog_new (parent, ++ GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, ++ "%s", errmsg); ++ gtk_widget_show (GTK_WIDGET (d)); ++ g_signal_connect (d, "response", ++ G_CALLBACK (gtk_widget_destroy), NULL); ++ } ++ ++ g_free (command); ++ g_free (uri); ++} +Index: gnome-session-2.27.91/gnome-session/gsm-util.h +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-util.h 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-util.h 2009-08-27 11:11:04.000000000 +1000 +@@ -21,6 +21,7 @@ + #define __GSM_UTIL_H__ + + #include ++#include + + G_BEGIN_DECLS + +@@ -47,6 +48,9 @@ + void gsm_util_setenv (const char *variable, + const char *value); + ++void gsm_util_help_display (GtkWindow *parent, ++ const char * link_id); ++ + G_END_DECLS + + #endif /* __GSM_UTIL_H__ */ +Index: gnome-session-2.27.91/gnome-session/test-logout.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-session-2.27.91/gnome-session/test-logout.c 2009-08-27 11:11:04.000000000 +1000 +@@ -0,0 +1,117 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2008 Novell, Inc. ++ * ++ * This program 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 program 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 program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ * ++ */ ++ ++#include "config.h" ++ ++#include ++ ++#include ++ ++#include "gsm-logout-dialog.h" ++ ++static void ++logout_dialog_response (GsmLogoutDialog *logout_dialog, ++ guint response_id, ++ gpointer data) ++{ ++ /* In case of dialog cancel, switch user, hibernate and ++ * suspend, we just perform the respective action and return, ++ * without shutting down the session. */ ++ switch (response_id) { ++ case GTK_RESPONSE_CANCEL: ++ case GTK_RESPONSE_NONE: ++ case GTK_RESPONSE_DELETE_EVENT: ++ g_print ("Cancel\n"); ++ break; ++ case GTK_RESPONSE_HELP: ++ g_print ("Help\n"); ++ break; ++ case GSM_LOGOUT_RESPONSE_SWITCH_USER: ++ g_print ("Switch user\n"); ++ break; ++ case GSM_LOGOUT_RESPONSE_HIBERNATE: ++ g_print ("Hibernate\n"); ++ break; ++ case GSM_LOGOUT_RESPONSE_SLEEP: ++ g_print ("Suspend\n"); ++ break; ++ case GSM_LOGOUT_RESPONSE_SHUTDOWN: ++ g_print ("Shutdown\n"); ++ break; ++ case GSM_LOGOUT_RESPONSE_REBOOT: ++ g_print ("Reboot\n"); ++ break; ++ case GSM_LOGOUT_RESPONSE_LOGOUT: ++ g_print ("Logout\n"); ++ break; ++ default: ++ g_assert_not_reached (); ++ break; ++ } ++ ++ gtk_main_quit (); ++} ++ ++ ++int ++main (int argc, ++ char *argv[]) ++{ ++ GtkWidget *dialog; ++ GError *error; ++ ++ static gboolean logout; ++ static gboolean shutdown; ++ ++ static GOptionEntry entries[] = { ++ { "logout", 'l', 0, G_OPTION_ARG_NONE, &logout, "Test logout dialog", NULL }, ++ { "shutdown", 's', 0, G_OPTION_ARG_NONE, &shutdown, "Test shutdown dialog", NULL }, ++ { NULL, 0, 0, 0, NULL, NULL, NULL } ++ }; ++ ++ logout = shutdown = FALSE; ++ error = NULL; ++ ++ gtk_init_with_args (&argc, &argv, ++ (char *) " - test logout/shutdown dialogs", ++ entries, NULL, ++ &error); ++ if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ exit (1); ++ } ++ ++ if (!shutdown) ++ dialog = gsm_get_logout_dialog (gdk_screen_get_default (), ++ GDK_CURRENT_TIME); ++ else ++ dialog = gsm_get_shutdown_dialog (gdk_screen_get_default (), ++ GDK_CURRENT_TIME); ++ ++ g_signal_connect (dialog, "response", ++ G_CALLBACK (logout_dialog_response), NULL); ++ gtk_widget_show (dialog); ++ ++ gtk_main (); ++ ++ return 0; ++} +Index: gnome-session-2.27.91/gnome-session/gsm-logout-dialog.c +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-logout-dialog.c 2009-08-27 11:06:08.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-logout-dialog.c 2009-08-27 11:11:04.000000000 +1000 +@@ -38,8 +38,13 @@ + + #define AUTOMATIC_ACTION_TIMEOUT 60 + +-#define GSM_ICON_LOGOUT "system-log-out" +-#define GSM_ICON_SHUTDOWN "system-shutdown" ++#define GSM_ICON_LOGOUT "system-log-out" ++#define GSM_ICON_SWITCH "system-users" ++#define GSM_ICON_SHUTDOWN "system-shutdown" ++#define GSM_ICON_REBOOT "view-refresh" ++/* TODO: use gpm icons? */ ++#define GSM_ICON_HIBERNATE "drive-harddisk" ++#define GSM_ICON_SLEEP "sleep" + + typedef enum { + GSM_DIALOG_LOGOUT_TYPE_LOGOUT, +@@ -53,6 +58,9 @@ + DkpClient *dkp_client; + GsmConsolekit *consolekit; + ++ GtkWidget *info_label; ++ GtkWidget *cancel_button; ++ + int timeout; + unsigned int timeout_id; + +@@ -61,7 +69,8 @@ + + static GsmLogoutDialog *current_dialog = NULL; + +-static void gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog); ++static void gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog, ++ int seconds); + + static void gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog, + gpointer data); +@@ -69,43 +78,10 @@ + static void gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, + gpointer data); + +-enum { +- PROP_0, +- PROP_MESSAGE_TYPE +-}; +- +-G_DEFINE_TYPE (GsmLogoutDialog, gsm_logout_dialog, GTK_TYPE_MESSAGE_DIALOG); ++static void gsm_logout_set_info_text (GsmLogoutDialog *logout_dialog, ++ int seconds); + +-static void +-gsm_logout_dialog_set_property (GObject *object, +- guint prop_id, +- const GValue *value, +- GParamSpec *pspec) +-{ +- switch (prop_id) { +- case PROP_MESSAGE_TYPE: +- break; +- default: +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +- break; +- } +-} +- +-static void +-gsm_logout_dialog_get_property (GObject *object, +- guint prop_id, +- GValue *value, +- GParamSpec *pspec) +-{ +- switch (prop_id) { +- case PROP_MESSAGE_TYPE: +- g_value_set_enum (value, GTK_MESSAGE_WARNING); +- break; +- default: +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +- break; +- } +-} ++G_DEFINE_TYPE (GsmLogoutDialog, gsm_logout_dialog, GTK_TYPE_DIALOG); + + static void + gsm_logout_dialog_class_init (GsmLogoutDialogClass *klass) +@@ -114,18 +90,6 @@ + + gobject_class = G_OBJECT_CLASS (klass); + +- /* This is a workaround to avoid a stupid crash: libgnomeui +- * listens for the "show" signal on all GtkMessageDialog and +- * gets the "message-type" of the dialogs. We will crash when +- * it accesses this property if we don't override it since we +- * didn't define it. */ +- gobject_class->set_property = gsm_logout_dialog_set_property; +- gobject_class->get_property = gsm_logout_dialog_get_property; +- +- g_object_class_override_property (gobject_class, +- PROP_MESSAGE_TYPE, +- "message-type"); +- + g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate)); + } + +@@ -137,11 +101,23 @@ + logout_dialog->priv->timeout_id = 0; + logout_dialog->priv->timeout = 0; + logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; ++ logout_dialog->priv->info_label = NULL; + +- gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); ++ gtk_window_set_resizable (GTK_WINDOW (logout_dialog), FALSE); ++ gtk_dialog_set_has_separator (GTK_DIALOG (logout_dialog), FALSE); + gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); + gtk_window_stick (GTK_WINDOW (logout_dialog)); + ++ /* use HIG spacings */ ++ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), 12); ++ gtk_container_set_border_width (GTK_CONTAINER (logout_dialog), 6); ++ ++ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_HELP, ++ GTK_RESPONSE_HELP); ++ logout_dialog->priv->cancel_button = ++ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), ++ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); ++ + logout_dialog->priv->dkp_client = dkp_client_new (); + + logout_dialog->priv->consolekit = gsm_get_consolekit (); +@@ -237,19 +213,98 @@ + } + + static void +-gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, gpointer user_data) ++gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, ++ gpointer user_data) + { +- gsm_logout_dialog_set_timeout (logout_dialog); ++ gsm_logout_set_info_text (logout_dialog, AUTOMATIC_ACTION_TIMEOUT); ++ ++ if (logout_dialog->priv->default_response != GTK_RESPONSE_CANCEL) ++ gsm_logout_dialog_set_timeout (logout_dialog, ++ AUTOMATIC_ACTION_TIMEOUT); ++} ++ ++static void ++gsm_logout_set_info_text (GsmLogoutDialog *logout_dialog, ++ int seconds) ++{ ++ const char *info_text; ++ char *markup = NULL; ++ static char *session_type = NULL; ++ ++ switch (logout_dialog->priv->default_response) { ++ case GSM_LOGOUT_RESPONSE_LOGOUT: ++ info_text = ngettext ("You will be automatically logged " ++ "out in %d second.", ++ "You will be automatically logged " ++ "out in %d seconds.", ++ seconds); ++ break; ++ ++ case GSM_LOGOUT_RESPONSE_SHUTDOWN: ++ info_text = ngettext ("This system will be automatically " ++ "shut down in %d second.", ++ "This system will be automatically " ++ "shut down in %d seconds.", ++ seconds); ++ break; ++ ++ case GTK_RESPONSE_CANCEL: ++ info_text = NULL; ++ break; ++ ++ default: ++ g_assert_not_reached (); ++ } ++ ++ if (session_type == NULL) { ++ GsmConsolekit *consolekit; ++ ++ consolekit = gsm_get_consolekit (); ++ session_type = gsm_consolekit_get_current_session_type (consolekit); ++ g_object_unref (consolekit); ++ } ++ ++ if (g_strcmp0 (session_type, GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW) != 0) { ++ char *name, *buf, *buf2; ++ name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL); ++ ++ if (!name || name[0] == '\0' || strcmp (name, "Unknown") == 0) { ++ name = g_locale_to_utf8 (g_get_user_name (), -1 , NULL, NULL, NULL); ++ } ++ ++ if (!name) { ++ name = g_strdup (g_get_user_name ()); ++ } ++ ++ buf = g_strdup_printf (_("You are currently logged in as \"%s\"."), name); ++ if (info_text != NULL) { ++ buf2 = g_strdup_printf (info_text, seconds); ++ markup = g_markup_printf_escaped ("%s", g_strconcat (buf, "\n", buf2, NULL)); ++ g_free (buf2); ++ } else { ++ markup = g_markup_printf_escaped ("%s", buf); ++ } ++ g_free (buf); ++ g_free (name); ++ } else if (info_text != NULL) { ++ char *buf2; ++ buf2 = g_strdup_printf (info_text, seconds); ++ markup = g_markup_printf_escaped ("%s", buf2); ++ g_free (buf2); ++ } ++ ++ gtk_label_set_markup (GTK_LABEL (logout_dialog->priv->info_label), ++ markup ? markup : ""); ++ ++ if (markup != NULL) ++ g_free (markup); + } + + static gboolean + gsm_logout_dialog_timeout (gpointer data) + { + GsmLogoutDialog *logout_dialog; +- char *seconds_warning; +- char *secondary_text; + int seconds_to_show; +- static char *session_type = NULL; + + logout_dialog = (GsmLogoutDialog *) data; + +@@ -269,84 +324,129 @@ + seconds_to_show += 10; + } + +- switch (logout_dialog->priv->type) { +- case GSM_DIALOG_LOGOUT_TYPE_LOGOUT: +- seconds_warning = ngettext ("You will be automatically logged " +- "out in %d second.", +- "You will be automatically logged " +- "out in %d seconds.", +- seconds_to_show); +- break; ++ gsm_logout_set_info_text (logout_dialog, seconds_to_show); + +- case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN: +- seconds_warning = ngettext ("This system will be automatically " +- "shut down in %d second.", +- "This system will be automatically " +- "shut down in %d seconds.", +- seconds_to_show); +- break; ++ logout_dialog->priv->timeout--; ++ ++ return TRUE; ++} + +- default: +- g_assert_not_reached (); ++static void ++gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog, ++ int seconds) ++{ ++ logout_dialog->priv->timeout = seconds; ++ ++ if (logout_dialog->priv->timeout_id != 0) { ++ g_source_remove (logout_dialog->priv->timeout_id); + } + +- if (session_type == NULL) { +- GsmConsolekit *consolekit; ++ logout_dialog->priv->timeout_id = g_timeout_add (1000, ++ gsm_logout_dialog_timeout, ++ logout_dialog); ++} + +- consolekit = gsm_get_consolekit (); +- session_type = gsm_consolekit_get_current_session_type (consolekit); +- g_object_unref (consolekit); ++static GtkWidget * ++gsm_logout_tile_new (const char *icon_name, ++ const char *title, ++ const char *description) ++{ ++ GtkWidget *button; ++ GtkWidget *alignment; ++ GtkWidget *hbox; ++ GtkWidget *vbox; ++ GtkWidget *image; ++ GtkWidget *label; ++ char *markup; ++ ++ g_assert (title != NULL); ++ ++ button = GTK_WIDGET (gtk_button_new ()); ++ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); ++ ++ alignment = gtk_alignment_new (0, 0.5, 0, 0); ++ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 6); ++ gtk_container_add (GTK_CONTAINER (button), alignment); ++ ++ hbox = gtk_hbox_new (FALSE, 12); ++ gtk_container_add (GTK_CONTAINER (alignment), hbox); ++ if (icon_name != NULL) { ++ image = gtk_image_new_from_icon_name (icon_name, ++ GTK_ICON_SIZE_DIALOG); ++ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + } + +- if (g_strcmp0 (session_type, GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW) != 0) { +- char *name, *tmp; ++ vbox = gtk_vbox_new (FALSE, 2); + +- name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL); ++ markup = g_markup_printf_escaped ("%s", ++ title); ++ label = gtk_label_new (markup); ++ g_free (markup); + +- if (!name || name[0] == '\0' || strcmp (name, "Unknown") == 0) { +- name = g_locale_to_utf8 (g_get_user_name (), -1 , NULL, NULL, NULL); +- } ++ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); ++ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); ++ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); + +- if (!name) { +- name = g_strdup (g_get_user_name ()); +- } ++ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); + +- tmp = g_strdup_printf (_("You are currently logged in as \"%s\"."), name); +- secondary_text = g_strconcat (tmp, "\n", seconds_warning, NULL); +- g_free (tmp); ++ if (description != NULL) { ++ gchar *markup; ++ GdkColor *color; ++ GtkWidget *label; + +- g_free (name); +- } else { +- secondary_text = g_strdup (seconds_warning); +- } ++ color = >K_WIDGET (button)->style->fg[GTK_STATE_INSENSITIVE]; ++ markup = g_markup_printf_escaped ("%s", ++ color->red, ++ color->green, ++ color->blue, ++ description); ++ label = gtk_label_new (markup); ++ g_free (markup); + +- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog), +- secondary_text, +- seconds_to_show, +- NULL); ++ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); ++ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); ++ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); ++ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + +- logout_dialog->priv->timeout--; ++ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); ++ } + +- g_free (secondary_text); ++ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); + +- return TRUE; ++ return button; + } + + static void +-gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog) ++gsm_logout_tile_clicked (GtkWidget *tile, ++ gpointer response_p) + { +- logout_dialog->priv->timeout = AUTOMATIC_ACTION_TIMEOUT; ++ GtkWidget *dialog; + +- /* Sets the secondary text */ +- gsm_logout_dialog_timeout (logout_dialog); ++ dialog = gtk_widget_get_toplevel (tile); ++ g_assert (GTK_IS_DIALOG (dialog)); ++ gtk_dialog_response (GTK_DIALOG (dialog), ++ GPOINTER_TO_UINT (response_p)); ++} + +- if (logout_dialog->priv->timeout_id != 0) { +- g_source_remove (logout_dialog->priv->timeout_id); +- } ++static GtkWidget * ++gsm_logout_append_tile (GtkWidget *vbox, ++ unsigned int response, ++ const char *icon_name, ++ const char *title, ++ const char *description) ++{ ++ GtkWidget *tile; ++ ++ tile = gsm_logout_tile_new (icon_name, title, description); ++ gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0); ++ gtk_widget_show_all (tile); ++ ++ g_signal_connect (tile, ++ "clicked", ++ G_CALLBACK (gsm_logout_tile_clicked), ++ GUINT_TO_POINTER (response)); + +- logout_dialog->priv->timeout_id = g_timeout_add (1000, +- gsm_logout_dialog_timeout, +- logout_dialog); ++ return tile; + } + + static GtkWidget * +@@ -356,8 +456,10 @@ + { + GsmLogoutDialog *logout_dialog; + GtkWidget *dialog_image; +- const char *primary_text; ++ GtkWidget *vbox; ++ GtkWidget *tile; + const char *icon_name; ++ const char *title; + + if (current_dialog != NULL) { + gtk_widget_destroy (GTK_WIDGET (current_dialog)); +@@ -367,84 +469,118 @@ + + current_dialog = logout_dialog; + +- gtk_window_set_title (GTK_WINDOW (logout_dialog), ""); +- +- logout_dialog->priv->type = type; ++ vbox = gtk_vbox_new (FALSE, 12); ++ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), vbox, ++ FALSE, FALSE, 0); ++ gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); ++ gtk_widget_show (vbox); + + icon_name = NULL; +- primary_text = NULL; ++ title = NULL; + + switch (type) { + case GSM_DIALOG_LOGOUT_TYPE_LOGOUT: + icon_name = GSM_ICON_LOGOUT; +- primary_text = _("Log out of this system now?"); ++ title = _("Log Out of the Session"); + + logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_LOGOUT; + +- if (gsm_logout_supports_switch_user (logout_dialog)) { +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), ++ ++ gsm_logout_append_tile (vbox, GSM_LOGOUT_RESPONSE_LOGOUT, ++ GSM_ICON_LOGOUT, _("_Log Out"), ++ _("Ends your session and logs you " ++ "out.")); ++ ++ tile = gsm_logout_append_tile (vbox, ++ GSM_LOGOUT_RESPONSE_SWITCH_USER, ++ GSM_ICON_SWITCH, + _("_Switch User"), +- GSM_LOGOUT_RESPONSE_SWITCH_USER); ++ _("Suspends your session, " ++ "allowing another user to " ++ "log in and use the " ++ "computer.")); ++ if (!gsm_logout_supports_switch_user (logout_dialog)) { ++ gtk_widget_set_sensitive (tile, FALSE); + } + +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- GTK_STOCK_CANCEL, +- GTK_RESPONSE_CANCEL); +- +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- _("_Log Out"), +- GSM_LOGOUT_RESPONSE_LOGOUT); +- + break; + case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN: + icon_name = GSM_ICON_SHUTDOWN; +- primary_text = _("Shut down this system now?"); ++ title = _("Shut Down the Computer"); + + logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_SHUTDOWN; + +- if (gsm_logout_supports_system_suspend (logout_dialog)) { +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- _("S_uspend"), +- GSM_LOGOUT_RESPONSE_SLEEP); ++ tile = gsm_logout_append_tile (vbox, ++ GSM_LOGOUT_RESPONSE_SHUTDOWN, ++ GSM_ICON_SHUTDOWN, ++ _("_Shut Down"), ++ _("Ends your session and turns " ++ "off the computer.")); ++ if (!gsm_logout_supports_shutdown (logout_dialog)) { ++ gtk_widget_set_sensitive (tile, FALSE); ++ /* If shutdown is not available, let's just fallback ++ * on cancel as the default action. We could fallback ++ * on reboot first, then suspend and then hibernate ++ * but it's not that useful, really */ ++ logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; + } + +- if (gsm_logout_supports_system_hibernate (logout_dialog)) { +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- _("_Hibernate"), +- GSM_LOGOUT_RESPONSE_HIBERNATE); ++ tile = gsm_logout_append_tile (vbox, ++ GSM_LOGOUT_RESPONSE_REBOOT, ++ GSM_ICON_REBOOT, _("_Restart"), ++ _("Ends your session and " ++ "restarts the computer.")); ++ if (!gsm_logout_supports_reboot (logout_dialog)) { ++ gtk_widget_set_sensitive (tile, FALSE); + } + +- if (gsm_logout_supports_reboot (logout_dialog)) { +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- _("_Restart"), +- GSM_LOGOUT_RESPONSE_REBOOT); ++ /* We don't set those options insensitive if they are no ++ * supported (like we do for shutdown/restart) since some ++ * hardware just don't support suspend/hibernate. So we ++ * don't show those options in this case. */ ++ if (gsm_logout_supports_system_suspend (logout_dialog)) { ++ gsm_logout_append_tile (vbox, ++ GSM_LOGOUT_RESPONSE_SLEEP, ++ GSM_ICON_SLEEP, _("S_uspend"), ++ _("Suspends your session " ++ "quickly, using minimal " ++ "power while the computer " ++ "stands by.")); + } + +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- GTK_STOCK_CANCEL, +- GTK_RESPONSE_CANCEL); +- +- if (gsm_logout_supports_shutdown (logout_dialog)) { +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- _("_Shut Down"), +- GSM_LOGOUT_RESPONSE_SHUTDOWN); ++ if (gsm_logout_supports_system_hibernate (logout_dialog)) { ++ gsm_logout_append_tile (vbox, ++ GSM_LOGOUT_RESPONSE_HIBERNATE, ++ GSM_ICON_HIBERNATE, ++ _("Hiber_nate"), ++ _("Suspends your session, " ++ "using no power until the " ++ "computer is restarted.")); + } ++ + break; + default: + g_assert_not_reached (); + } + +- dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog)); +- +- gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image), +- icon_name, GTK_ICON_SIZE_DIALOG); ++ logout_dialog->priv->info_label = gtk_label_new (""); ++ gtk_label_set_line_wrap (GTK_LABEL (logout_dialog->priv->info_label), ++ TRUE); ++ gtk_box_pack_start (GTK_BOX (vbox), logout_dialog->priv->info_label, ++ TRUE, TRUE, 0); ++ gtk_widget_show (logout_dialog->priv->info_label); + gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); +- gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS); +- gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (logout_dialog)->label), +- primary_text); ++ gtk_window_set_title (GTK_WINDOW (logout_dialog), title); ++ gtk_window_set_position (GTK_WINDOW (logout_dialog), ++ GTK_WIN_POS_CENTER_ALWAYS); + + gtk_dialog_set_default_response (GTK_DIALOG (logout_dialog), + logout_dialog->priv->default_response); ++ /* Note that focus is on the widget for the default response by default ++ * (since they're the first widget, except when it's Cancel */ ++ if (logout_dialog->priv->default_response == GTK_RESPONSE_CANCEL) ++ gtk_window_set_focus (GTK_WINDOW (logout_dialog), ++ logout_dialog->priv->cancel_button); + + gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen); + +Index: gnome-session-2.27.91/gnome-session/Makefile.am +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/Makefile.am 2009-08-26 00:07:24.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/Makefile.am 2009-08-27 11:11:04.000000000 +1000 +@@ -21,6 +21,7 @@ + -DDATA_DIR=\""$(datadir)/gnome-session"\" \ + -DDBUS_LAUNCH=\"dbus-launch\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ ++ -DDATADIR=\""$(datadir)"\" \ + -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ + -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ + -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ --- gnome-session-2.27.92.orig/debian/patches/series +++ gnome-session-2.27.92/debian/patches/series @@ -0,0 +1,7 @@ +01_gnome-wm.patch +10_session_save.patch +19_gnome-wm-tweaking.patch +80_new_upstream_session_dialog.patch +95_dbus_request_shutdown.patch +96_no_catch_sigsegv.patch +98_autotools.patch --- gnome-session-2.27.92.orig/debian/patches/19_gnome-wm-tweaking.patch +++ gnome-session-2.27.92/debian/patches/19_gnome-wm-tweaking.patch @@ -0,0 +1,120 @@ +Index: gnome-session-2.27.5/data/gnome-wm +=================================================================== +--- gnome-session-2.27.5.orig/data/gnome-wm 2009-07-29 19:12:35.000000000 +0100 ++++ gnome-session-2.27.5/data/gnome-wm 2009-07-29 19:12:38.000000000 +0100 +@@ -1,7 +1,8 @@ + #!/bin/sh + + # The user can specify his prefered WM by setting the WINDOW_MANAGER +-# environment variable. ++# environment variable or setting the ++# /desktop/gnome/applications/window_manager/default gconf key. + # + # If this is not set, we search a list of known windowmanagers and use + # the first one that is found in the users's PATH +@@ -53,30 +54,71 @@ + fi + fi + ++# Get previously set window manager in gconf ++if [ ! "$DEFWM" ]; then ++ DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null` ++fi ++ ++# special case handling for dapper upgrades (this runs only once after the upgrade) ++if [ -z "$DEFWM" ] && [ -f /var/lib/gnome-session/dapper-upgrade ]; then ++ gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string ++ DEFWM=/usr/bin/metacity ++fi ++ ++# If not exist, set to compiz (if available) ++if [ ! -x "$DEFWM" ]; then ++ if [ -x "/usr/bin/compiz" ]; then ++ gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/compiz --type string ++ DEFWM=/usr/bin/compiz ++ elif [ -x "/usr/bin/metacity" ]; then ++ gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string ++ DEFWM=/usr/bin/metacity ++ else ++ unset DEFWM ++ fi ++fi ++ ++# WINDOW_MANAGER overrides all ++if [ -z "$WINDOW_MANAGER" ] ; then ++ WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required_components/windowmanager 2> /dev/null` ++fi ++ + # Avoid looping if the session configuration tells us to use gnome-wm or if + # the user forces gnome-wm via WINDOW_MANAGER + if [ "x$WINDOW_MANAGER" = "xgnome-wm" ]; then + WINDOW_MANAGER="" + fi + +-# If compiz-gtk is installed, we always use it; it will fall back to +-# metacity if it cannot find decent hardware. +- +-if [ -z "$WINDOW_MANAGER" ] && [ -x /usr/bin/gtk-window-decorator ] ; then +- WINDOW_MANAGER=compiz +-fi ++if [ -z "$WINDOW_MANAGER" ] ; then ++ # Create a list of window manager we can handle, trying to only use the ++ # compositing ones when it makes sense + +-# If compiz is not installed (which is the default), use metacity instead. ++ xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null ++ IS_X_COMPOSITED=$? + +-if [ -z "$WINDOW_MANAGER" ]; then +- KNOWN_WM="metacity sawfish mutter" ++ KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" ++ if [ $IS_X_COMPOSITED -eq 0 ] ; then ++ KNOWN_WM="compiz beryl $KNOWN_WM" ++ fi ++ # metacity is still the default wm in GNOME ++ KNOWN_WM="metacity $KNOWN_WM" + +- for wm in $KNOWN_WM; do +- if [ -x /usr/bin/"$wm" ]; then +- WINDOW_MANAGER=/usr/bin/"$wm" +- break +- fi +- done ++ OLDIFS=$IFS ++ if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then ++ for wm in $KNOWN_WM ; do ++ IFS=":" ++ for dir in $PATH ; do ++ if [ -x "$dir/$wm" ] ; then ++ WINDOW_MANAGER="$dir/$wm" ++ break 2 ++ fi ++ done ++ IFS=$OLDIFS ++ done ++ else ++ WINDOW_MANAGER=$DEFWM ++ fi ++ IFS=$OLDIFS + fi + + # Look for the default window manager on the system +@@ -125,7 +167,7 @@ + + case `basename $WINDOW_MANAGER` in + compiz) +- gtk-window-decorator & ++ #gtk-window-decorator & + #OPT3=glib + OPT4=gconf + ;; +@@ -134,6 +176,9 @@ + ;; + esac + ++# Store the selected WM with gconf ++gconftool-2 -t string -s /desktop/gnome/applications/window_manager/current "$WINDOW_MANAGER" ++ + exec "$WINDOW_MANAGER" $OPT1 $OPT2 $OPT3 $OPT4 + + echo "ERROR: No window manager could run!" --- gnome-session-2.27.92.orig/debian/patches/90_no_debug_flood_by_default.patch +++ gnome-session-2.27.92/debian/patches/90_no_debug_flood_by_default.patch @@ -0,0 +1,13 @@ +Index: gnome-session-2.25.92/gnome-session/main.c +=================================================================== +--- gnome-session-2.25.92.orig/gnome-session/main.c 2009-03-10 17:43:12.000000000 +0100 ++++ gnome-session-2.25.92/gnome-session/main.c 2009-03-10 17:43:15.000000000 +0100 +@@ -57,7 +57,7 @@ + + static gboolean failsafe = FALSE; + static gboolean show_version = FALSE; +-static gboolean debug = TRUE; ++static gboolean debug = FALSE; + + static void + on_bus_name_lost (DBusGProxy *bus_proxy, --- gnome-session-2.27.92.orig/debian/patches/02_no_warning_crash.patch +++ gnome-session-2.27.92/debian/patches/02_no_warning_crash.patch @@ -0,0 +1,20 @@ +diff -Nur -x '*.orig' -x '*~' gnome-session-2.20.1/gnome-session/main.c gnome-session-2.20.1.new/gnome-session/main.c +--- gnome-session-2.20.1/gnome-session/main.c 2007-11-21 15:48:32.000000000 +0100 ++++ gnome-session-2.20.1.new/gnome-session/main.c 2007-11-21 15:49:01.000000000 +0100 +@@ -593,6 +593,7 @@ + gsm_set_verbose (TRUE); + + /* Help eradicate the critical warnings in unstable releases of GNOME */ ++ /* + versions = g_strsplit (VERSION, ".", 3); + if (versions && versions [0] && versions [1]) + { +@@ -605,7 +606,7 @@ + } + } + g_strfreev (versions); +- ++ */ + set_gtk1_theme_rcfile (); + + /* Initialize the i18n stuff */ --- gnome-session-2.27.92.orig/debian/patches/96_no_catch_sigsegv.patch +++ gnome-session-2.27.92/debian/patches/96_no_catch_sigsegv.patch @@ -0,0 +1,13 @@ +Index: gnome-session-2.27.4/gnome-session/gdm-signal-handler.c +=================================================================== +--- gnome-session-2.27.4.orig/gnome-session/gdm-signal-handler.c 2009-07-24 20:14:23.000000000 +0100 ++++ gnome-session-2.27.4/gnome-session/gdm-signal-handler.c 2009-07-24 20:17:41.000000000 +0100 +@@ -348,7 +348,7 @@ + + gdm_signal_handler_add (handler, SIGILL, NULL, NULL); + gdm_signal_handler_add (handler, SIGBUS, NULL, NULL); +- gdm_signal_handler_add (handler, SIGSEGV, NULL, NULL); ++ /* gdm_signal_handler_add (handler, SIGSEGV, NULL, NULL); */ + gdm_signal_handler_add (handler, SIGABRT, NULL, NULL); + gdm_signal_handler_add (handler, SIGTRAP, NULL, NULL); + } --- gnome-session-2.27.92.orig/debian/patches/10_session_save.patch +++ gnome-session-2.27.92/debian/patches/10_session_save.patch @@ -0,0 +1,537 @@ +Based on the patch in GNOME #575544 + +Index: gnome-session-2.27.91/gnome-session/gsm-manager.c +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-manager.c 2009-07-29 11:51:22.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-manager.c 2009-08-27 11:04:15.000000000 +1000 +@@ -68,6 +68,7 @@ + #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager" + + #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */ ++#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 + + #define GDM_FLEXISERVER_COMMAND "gdmflexiserver" + #define GDM_FLEXISERVER_ARGS "--startnew Standard" +@@ -1097,6 +1098,69 @@ + + } + ++static gboolean ++_client_request_save (GsmClient *client, ++ ClientEndSessionData *data) ++{ ++ gboolean ret; ++ GError *error; ++ ++ error = NULL; ++ ret = gsm_client_request_save (client, data->flags, &error); ++ if (ret) { ++ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client)); ++ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients, ++ client); ++ } else if (error) { ++ g_debug ("GsmManager: unable to query client: %s", error->message); ++ g_error_free (error); ++ } ++ ++ return FALSE; ++} ++ ++static gboolean ++_client_request_save_helper (const char *id, ++ GsmClient *client, ++ ClientEndSessionData *data) ++{ ++ return _client_request_save (client, data); ++} ++ ++static void ++query_save_session_complete (GsmManager *manager) ++{ ++ GError *error = NULL; ++ ++ if (g_slist_length (manager->priv->next_query_clients) > 0) { ++ ClientEndSessionData data; ++ ++ data.manager = manager; ++ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST; ++ ++ g_slist_foreach (manager->priv->next_query_clients, ++ (GFunc)_client_request_save, ++ &data); ++ ++ g_slist_free (manager->priv->next_query_clients); ++ manager->priv->next_query_clients = NULL; ++ ++ return; ++ } ++ ++ if (manager->priv->query_timeout_id > 0) { ++ g_source_remove (manager->priv->query_timeout_id); ++ manager->priv->query_timeout_id = 0; ++ } ++ ++ gsm_session_save (manager->priv->clients, &error); ++ ++ if (error) { ++ g_warning ("Error saving session: %s", error->message); ++ g_error_free (error); ++ } ++} ++ + static guint32 + generate_cookie (void) + { +@@ -1171,6 +1235,21 @@ + return FALSE; + } + ++static gboolean ++_on_query_save_session_timeout (GsmManager *manager) ++{ ++ manager->priv->query_timeout_id = 0; ++ ++ g_debug ("GsmManager: query to save session timed out"); ++ ++ g_slist_free (manager->priv->query_clients); ++ manager->priv->query_clients = NULL; ++ ++ query_save_session_complete (manager); ++ ++ return FALSE; ++} ++ + static void + do_phase_query_end_session (GsmManager *manager) + { +@@ -1807,13 +1886,32 @@ + const char *reason, + GsmManager *manager) + { +- /* just ignore if received outside of shutdown */ +- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) { ++ /* just ignore if we are not yet running */ ++ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { + return; + } + + g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :""); + ++ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) { ++ /* Ignore responses when no requests were sent */ ++ if (manager->priv->query_clients == NULL) { ++ return; ++ } ++ ++ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client); ++ ++ if (do_last) { ++ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients, ++ client); ++ } ++ ++ if (manager->priv->query_clients == NULL) { ++ query_save_session_complete (manager); ++ } ++ return; ++ } ++ + if (cancel) { + cancel_end_session (manager); + return; +@@ -1912,6 +2010,15 @@ + } + + static void ++on_xsmp_client_save_request (GsmXSMPClient *client, ++ gboolean show_dialog, ++ GsmManager *manager) ++{ ++ g_debug ("GsmManager: save_request"); ++ gsm_manager_save_session (manager, NULL); ++} ++ ++static void + on_store_client_added (GsmStore *store, + const char *id, + GsmManager *manager) +@@ -1932,6 +2039,10 @@ + "logout-request", + G_CALLBACK (on_xsmp_client_logout_request), + manager); ++ g_signal_connect (client, ++ "save-request", ++ G_CALLBACK (on_xsmp_client_save_request), ++ manager); + } + + g_signal_connect (client, +@@ -2889,6 +3000,41 @@ + } + + gboolean ++gsm_manager_save_session (GsmManager *manager, ++ GError **error) ++{ ++ ClientEndSessionData data; ++ ++ g_debug ("GsmManager: SaveSession called"); ++ ++ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); ++ ++ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { ++ g_set_error (error, ++ GSM_MANAGER_ERROR, ++ GSM_MANAGER_ERROR_NOT_IN_RUNNING, ++ "SaveSession interface is only available during the Running phase"); ++ return FALSE; ++ } ++ ++ data.manager = manager; ++ data.flags = 0; ++ gsm_store_foreach (manager->priv->clients, ++ (GsmStoreFunc)_client_request_save_helper, ++ &data); ++ ++ if (manager->priv->query_clients) { ++ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, ++ (GSourceFunc)_on_query_save_session_timeout, ++ manager); ++ return TRUE; ++ } else { ++ g_debug ("GsmManager: Nothing to save"); ++ return FALSE; ++ } ++} ++ ++gboolean + gsm_manager_can_shutdown (GsmManager *manager, + gboolean *shutdown_available, + GError **error) +Index: gnome-session-2.27.91/gnome-session/gsm-manager.h +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-manager.h 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-manager.h 2009-08-27 11:04:15.000000000 +1000 +@@ -152,6 +152,9 @@ + gboolean gsm_manager_shutdown (GsmManager *manager, + GError **error); + ++gboolean gsm_manager_save_session (GsmManager *manager, ++ GError **error); ++ + gboolean gsm_manager_can_shutdown (GsmManager *manager, + gboolean *shutdown_available, + GError **error); +Index: gnome-session-2.27.91/gnome-session/gsm-xsmp-client.c +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-xsmp-client.c 2009-07-29 10:36:08.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-xsmp-client.c 2009-08-27 11:04:15.000000000 +1000 +@@ -70,6 +70,7 @@ + enum { + REGISTER_REQUEST, + LOGOUT_REQUEST, ++ SAVE_REQUEST, + LAST_SIGNAL + }; + +@@ -523,6 +524,30 @@ + return TRUE; + } + ++static gboolean ++xsmp_request_save (GsmClient *client, ++ guint flags, ++ GError **error) ++{ ++ GsmXSMPClient *xsmp = (GsmXSMPClient *) client; ++ ++ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description); ++ ++ if (xsmp->priv->conn == NULL) { ++ g_set_error (error, ++ GSM_CLIENT_ERROR, ++ GSM_CLIENT_ERROR_NOT_REGISTERED, ++ "Client is not registered"); ++ return FALSE; ++ } ++ ++ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) ++ xsmp_save_yourself_phase2 (client); ++ else ++ do_save_yourself (xsmp, SmSaveLocal, FALSE); ++ ++ return TRUE; ++} + static char * + get_desktop_file_path (GsmXSMPClient *client) + { +@@ -993,6 +1018,7 @@ + object_class->get_property = gsm_xsmp_client_get_property; + object_class->set_property = gsm_xsmp_client_set_property; + ++ client_class->impl_request_save = xsmp_request_save; + client_class->impl_save = xsmp_save; + client_class->impl_stop = xsmp_stop; + client_class->impl_query_end_session = xsmp_query_end_session; +@@ -1023,6 +1049,17 @@ + G_TYPE_NONE, + 1, G_TYPE_BOOLEAN); + ++ signals[SAVE_REQUEST] = ++ g_signal_new ("save-request", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request), ++ NULL, ++ NULL, ++ g_cclosure_marshal_VOID__BOOLEAN, ++ G_TYPE_NONE, ++ 1, G_TYPE_BOOLEAN); ++ + g_object_class_install_property (object_class, + PROP_ICE_CONNECTION, + g_param_spec_pointer ("ice-connection", +Index: gnome-session-2.27.91/gnome-session/gsm-xsmp-client.h +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-xsmp-client.h 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-xsmp-client.h 2009-08-27 11:04:15.000000000 +1000 +@@ -54,7 +54,8 @@ + char **client_id); + gboolean (*logout_request) (GsmXSMPClient *client, + gboolean prompt); +- ++ gboolean (*save_request) (GsmXSMPClient *client, ++ gboolean prompt); + + void (*saved_state) (GsmXSMPClient *client); + +Index: gnome-session-2.27.91/gnome-session/org.gnome.SessionManager.xml +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/org.gnome.SessionManager.xml 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/org.gnome.SessionManager.xml 2009-08-27 11:04:15.000000000 +1000 +@@ -256,6 +256,14 @@ + + + ++ ++ ++ ++ Request to save session ++ ++ ++ ++ + + + +Index: gnome-session-2.27.91/capplet/gsm-properties-dialog.c +=================================================================== +--- gnome-session-2.27.91.orig/capplet/gsm-properties-dialog.c 2009-08-25 18:03:42.000000000 +1000 ++++ gnome-session-2.27.91/capplet/gsm-properties-dialog.c 2009-08-27 11:04:15.000000000 +1000 +@@ -36,6 +36,13 @@ + #include "gsp-app.h" + #include "gsp-app-manager.h" + ++#include ++#include ++ ++#define GSM_SERVICE_DBUS "org.gnome.SessionManager" ++#define GSM_PATH_DBUS "/org/gnome/SessionManager" ++#define GSM_INTERFACE_DBUS "org.gnome.SessionManager" ++ + #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) + + #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0') +@@ -50,6 +57,7 @@ + #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" + #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" + #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" ++#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label" + #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" + + #define STARTUP_APP_ICON "system-run" +@@ -493,10 +501,64 @@ + } + + static void ++session_saved_message (GsmPropertiesDialog *dialog, ++ const char *msg, ++ gboolean is_error) ++{ ++ GtkLabel *label; ++ gchar *markup; ++ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME)); ++ if (is_error) ++ markup = g_markup_printf_escaped ("%s", msg); ++ else ++ markup = g_markup_escape_text (msg, -1); ++ gtk_label_set_markup (label, markup); ++ g_free (markup); ++} ++ ++static void ++session_saved_cb (DBusGProxy *proxy, ++ DBusGProxyCall *call_id, ++ void *user_data) ++{ ++ gboolean res; ++ GsmPropertiesDialog *dialog = user_data; ++ ++ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID); ++ if (res) ++ session_saved_message (dialog, _("Your session has been saved."), FALSE); ++ else ++ session_saved_message (dialog, _("Failed to save session"), TRUE); ++ ++ g_object_unref (proxy); ++} ++ ++static void + on_save_session_clicked (GtkWidget *widget, + GsmPropertiesDialog *dialog) + { +- g_debug ("Session saving is not implemented yet!"); ++ DBusGConnection *conn; ++ DBusGProxy *proxy; ++ DBusGProxyCall *call; ++ ++ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); ++ if (conn == NULL) { ++ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE); ++ return; ++ } ++ ++ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS); ++ if (proxy == NULL) { ++ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE); ++ return; ++ } ++ ++ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID); ++ if (call == NULL) { ++ session_saved_message (dialog, _("Failed to save session"), TRUE); ++ g_object_unref (proxy); ++ return; ++ } + } + + static void +Index: gnome-session-2.27.91/gnome-session/gsm-client.h +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-client.h 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-client.h 2009-08-27 11:04:15.000000000 +1000 +@@ -92,6 +92,9 @@ + GError **error); + gboolean (*impl_stop) (GsmClient *client, + GError **error); ++ gboolean (*impl_request_save) (GsmClient *client, ++ guint flags, ++ GError **error); + GKeyFile * (*impl_save) (GsmClient *client, + GError **error); + }; +@@ -137,6 +140,9 @@ + + void gsm_client_disconnected (GsmClient *client); + ++gboolean gsm_client_request_save (GsmClient *client, ++ guint flags, ++ GError **error); + GKeyFile *gsm_client_save (GsmClient *client, + GError **error); + /* exported to bus */ +Index: gnome-session-2.27.91/gnome-session/gsm-dbus-client.c +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-dbus-client.c 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-dbus-client.c 2009-08-27 11:04:15.000000000 +1000 +@@ -413,6 +413,19 @@ + G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object); + } + ++static gboolean ++dbus_client_request_save (GsmClient *client, ++ guint flags, ++ GError **error) ++{ ++ g_debug ("GsmDBusClient: sending save request to client with id %s", ++ gsm_client_peek_id (client)); ++ ++ /* FIXME: The protocol does not support this */ ++ ++ return FALSE; ++} ++ + static GKeyFile * + dbus_client_save (GsmClient *client, + GError **error) +@@ -665,6 +678,7 @@ + object_class->set_property = gsm_dbus_client_set_property; + object_class->dispose = gsm_dbus_client_dispose; + ++ client_class->impl_request_save = dbus_client_request_save; + client_class->impl_save = dbus_client_save; + client_class->impl_stop = dbus_client_stop; + client_class->impl_query_end_session = dbus_client_query_end_session; +Index: gnome-session-2.27.91/gnome-session/gsm-client.c +=================================================================== +--- gnome-session-2.27.91.orig/gnome-session/gsm-client.c 2009-04-20 04:26:52.000000000 +1000 ++++ gnome-session-2.27.91/gnome-session/gsm-client.c 2009-08-27 11:04:15.000000000 +1000 +@@ -510,6 +510,16 @@ + g_signal_emit (client, signals[DISCONNECTED], 0); + } + ++gboolean ++gsm_client_request_save (GsmClient *client, ++ guint flags, ++ GError **error) ++{ ++ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); ++ ++ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error); ++} ++ + GKeyFile * + gsm_client_save (GsmClient *client, + GError **error) +Index: gnome-session-2.27.91/data/session-properties.ui +=================================================================== +--- gnome-session-2.27.91.orig/data/session-properties.ui 2009-07-01 22:45:30.000000000 +1000 ++++ gnome-session-2.27.91/data/session-properties.ui 2009-08-27 11:04:15.000000000 +1000 +@@ -148,6 +148,7 @@ + True + + ++ True + True + True + +@@ -191,6 +192,17 @@ + 1 + + ++ ++ ++ True ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 +Index: gnome-session-2.27.91/configure.in +=================================================================== +--- gnome-session-2.27.91.orig/configure.in 2009-08-26 00:09:56.000000000 +1000 ++++ gnome-session-2.27.91/configure.in 2009-08-27 11:04:15.000000000 +1000 +@@ -67,6 +67,7 @@ + PKG_CHECK_MODULES(SESSION_PROPERTIES, + glib-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED ++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED + ) + + PKG_CHECK_MODULES(SPLASH, --- gnome-session-2.27.92.orig/debian/po-up/he.po +++ gnome-session-2.27.92/debian/po-up/he.po @@ -0,0 +1,36 @@ +# translation of gnome-session.HEAD.he.po to Hebrew +# translation of gnome-session.gnome-2-0.po to Hebrew +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER. +# Gil Osher , 2002, 2005. +# Gil 'Dolfin' Osher , 2002,2003. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.he\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-04-27 16:44+0300\n" +"Last-Translator: Yair Hershkovitz \n" +"Language-Team: Hebrew \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "תצורת ההפעלה שלך נשמרה." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "לא הצלחתי להתחבר למנהל תצורת ההפעלה" + --- gnome-session-2.27.92.orig/debian/po-up/fur.po +++ gnome-session-2.27.92/debian/po-up/fur.po @@ -0,0 +1,33 @@ +# Friulian traslation for gnome-session +# Copyright (C) 2007 Free Software Foundation, Inc. +# Massimo Furlani , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.20.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-12-17 15:51+0100\n" +"Last-Translator: Massimo Furlani \n" +"Language-Team: Friulian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Friulian\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "La session jè stade salvade" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Impussibil colegasi al gjestôr di session" + --- gnome-session-2.27.92.orig/debian/po-up/oc.po +++ gnome-session-2.27.92/debian/po-up/oc.po @@ -0,0 +1,35 @@ +# Translation of oc.po to Occitan +# Occitan translation of gnome-session. +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is released under the same license as the gnome-session package. +# +# Yannig Marchegay (Kokoyaya) , 2007. +msgid "" +msgstr "" +"Project-Id-Version: oc\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-26 23:10+0100\n" +"Last-Translator: Yannig Marchegay (Kokoyaya) \n" +"Language-Team: Occitan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Impossible de se connectar al gestionari de sesilhas" + --- gnome-session-2.27.92.orig/debian/po-up/pa.po +++ gnome-session-2.27.92/debian/po-up/pa.po @@ -0,0 +1,41 @@ +# translation of gnome-session.HEAD.po to Punjabi +# Copyright (C) 2004 THE gnome-session'S COPYRIGHT HOLDER +# +# +# Amanpreet Singh Alam , 2004. +# Amanpreet Singh Alam , 2005. +# A S Alam , 2006. +# A S Alam , 2007. +# ASB , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-09-13 08:17+0530\n" +"Last-Translator: ASB \n" +"Language-Team: Punjabi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +# gnome-session/save-session.c:160 +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "ਤੁਹਾਡਾ ਸ਼ੈਸ਼ਨ ਸੰਭਾਲਿਆ ਗਿਆ।" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +# gnome-session/save-session.c:112 +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" + --- gnome-session-2.27.92.orig/debian/po-up/bn.po +++ gnome-session-2.27.92/debian/po-up/bn.po @@ -0,0 +1,33 @@ +# Bangla translation of gnome-session. +# Copyright (C) 2003 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# Taneem Ahmed , 2003. +# Khandakar Mujahidul Islam , 2003-2005. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-08-08 01:29+0600\n" +"Last-Translator: Khandakar Mujahidul Islam \n" +"Language-Team: Bangla \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "সেশন ম্যানেজারের সাথে যোগাযোগ করা যায়নি" + --- gnome-session-2.27.92.orig/debian/po-up/zh_TW.po +++ gnome-session-2.27.92/debian/po-up/zh_TW.po @@ -0,0 +1,41 @@ +# Chinese (Taiwan) translation of gnome-session. +# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# gnome-core: +# Yuan-Chung Cheng , 1999. +# Jing-Jong Shyue , 2000. +# Chih-Wei Huang , 2000. +# Abel Cheung , 2001-2002. +# gnome-session: +# Abel Cheung , 2002-2003. +# Woodman Tuen , 2005-006. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.21.91\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-07 22:52+0800\n" +"Last-Translator: Woodman Tuen \n" +"Language-Team: Chinese (Taiwan) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "作業階段已經儲存。" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "無法連接作業階段總管" + --- gnome-session-2.27.92.orig/debian/po-up/uk.po +++ gnome-session-2.27.92/debian/po-up/uk.po @@ -0,0 +1,33 @@ +# Ukrainian translation of gnome-core module +# Copyright (C) 1999-2002 Free Software Foundation, Inc. +# Yuri Syrota , 1999-2002. +# Maxim Dziumanenko , 2002-2008 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-07 11:56+0300\n" +"Last-Translator: Maxim Dziumanenko \n" +"Language-Team: Ukrainian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Ваш сеанс збережено." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Не вдається з'єднатись із менеджером сеансів" + --- gnome-session-2.27.92.orig/debian/po-up/be.po +++ gnome-session-2.27.92/debian/po-up/be.po @@ -0,0 +1,34 @@ +# translation of gnome-session.gnome-2-2.be.po to belarusian +# Copyright (C) 2003 Free Software Foundation, Inc. +# Vital Khilko , 2003. +# Ales Nyakhaichyk , 2006, 2008. +# Ihar Hrachyshka , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-10 00:15+0200\n" +"Last-Translator: Alexander Nyakhaichyk \n" +"Language-Team: Belarusian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Сэсія пасьпяхова захаваная." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Немагчыма злучыцца з кіраўніком сэансаў" + --- gnome-session-2.27.92.orig/debian/po-up/el.po +++ gnome-session-2.27.92/debian/po-up/el.po @@ -0,0 +1,61 @@ +# translation of el.po to Greek +# gnome-session Greek PO file. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# +# Comment: Most of the work done by Spiros (around 600 messages). +# Comment: Simos/Sarantis did 12%. +# Comment: Simos/Sarantis did review. +# Comment: Simos did 10 new/unfuzzy 30. +# Comment: Simos did 3 new/unfuzzy 1. +# Comment: Simos did 2 new/unfuzzy 8. +# Comment: Simos did 6 new/unfuzzy 8. +# Comment: Simos did 2 new/unfuzzy 5. +# Split from gnome-core as gnome-session. +# kostas: 10Dec2002, updated translation for Gnome 2.1x +# kostas: 26Jan2003, one more update. +# kostas:03Aug2003, updated translation for Gnome2.4 +# nikos: 06Sep2003, review +# kostas:12Nov2003.fixes +# +# simos: 874 messages, 18Feb2001, (sgpbea). +# simos: 897 messages, 01Mar2001, (regmtsgpbea). +# simos: 959 messages, 04Jun2001, (micumple). +# simos: 959 messages, 06Jun2001, (fixed minor typo). +# simos: 897 messages, 28Nov2001, (feeling good to translate HEAD). +# simos: 112 messages, 20Apr2002, complete translation. +# simos: 96 messages, 19Aug2992, compelte translation. +# Spiros Papadimitriou , 1999. +# Simos Xenitellis , 1999, 2000, 2001, 2002,. +# Sarantis Paskalis , 2000. +# Kostas Papadimas , 2003. +# Nikos Charonitakis , 2003. +# Kostas Papadimas , 2003, 2005, 2006. +msgid "" +msgstr "" +"Project-Id-Version: el\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-09 19:55+0200\n" +"Last-Translator: NikosCharonitakis \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Η συνεδρία σας αποθηκεύτηκε." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Αδύνατη η σύνδεση με το διαχειριστή συνεδρίας" + --- gnome-session-2.27.92.orig/debian/po-up/ku.po +++ gnome-session-2.27.92/debian/po-up/ku.po @@ -0,0 +1,35 @@ +# translation of gnome-session.HEAD.po to Kurdish +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Erdal Ronahi , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-03-04 17:47+0100\n" +"Last-Translator: Erdal Ronahi \n" +"Language-Team: Kurdish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10\n" +"X-Rosetta-Export-Date: 2007-03-04 15:38+0000\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Danişîna te hat tomarkirin." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Pêwendî bi rêveberê danişînê re pêk nehat" + --- gnome-session-2.27.92.orig/debian/po-up/be@latin.po +++ gnome-session-2.27.92/debian/po-up/be@latin.po @@ -0,0 +1,33 @@ +# Biełaruski pierakład gnome-session +# Vital Khilko , 2003. +# Ales Nyakhaichyk , 2006. +# Ihar Hrachyshka , 2006, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-17 00:32+0200\n" +"Last-Translator: Ihar Hrachyshka \n" +"Language-Team: Belarusian Latin \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Tvaja sesija zachavanaja." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Niemahčyma spałučycca z kiraŭnikom sesij" + --- gnome-session-2.27.92.orig/debian/po-up/POTFILES.in +++ gnome-session-2.27.92/debian/po-up/POTFILES.in @@ -0,0 +1 @@ +patches/10_session_save.patch --- gnome-session-2.27.92.orig/debian/po-up/it.po +++ gnome-session-2.27.92/debian/po-up/it.po @@ -0,0 +1,33 @@ +# Italian translation for gnome-session +# Copyright (C) 1997-2007 Free Software Foundation, Inc. +# Copyright (C) 1997-2002 Christopher R. Gabriel +# Copyright (C) 2004-2008 Luca Ferretti +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.21.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-03 21:37+0100\n" +"Last-Translator: Luca Ferretti \n" +"Language-Team: Italiano \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "La sessione è stata salvata" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Impossibile collegarsi al gestore di sessione" + --- gnome-session-2.27.92.orig/debian/po-up/hi.po +++ gnome-session-2.27.92/debian/po-up/hi.po @@ -0,0 +1,40 @@ +# translation of gnome-session.HEAD.hi.po to Hindi +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Rajesh Ranjan , 2005, 2006. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.hi\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-08-30 17:08+0530\n" +"Last-Translator: Rajesh Ranjan \n" +"Language-Team: Hindi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"net>\n" +"X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" +"\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +# gnome-session/save-session.c:112 +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "सत्र मैनेजर से संपर्क स्थापित नहीं हो पा रहा है" + --- gnome-session-2.27.92.orig/debian/po-up/dz.po +++ gnome-session-2.27.92/debian/po-up/dz.po @@ -0,0 +1,36 @@ +# Dzongkha translation of gnome-session +# Copyright @ 2006 Free Software Foundation, Inc. +# Mindu Dorji +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2-14 dz\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-06-12 23:18+0530\n" +"Last-Translator: Tshewang Norbu \n" +"Language-Team: DZONGKHA \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2;plural=(n!=1);\n" +"X-Poedit-Language: Dzongkha\n" +"X-Poedit-Country: BHUTAN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "ཁྱོད་ཀྱི་ལཱ་ཡུན་དེ་ སྲུང་བཞག་འབད་ཡོད།" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "ལཱ་ཡུན་འཛིན་སྐྱོང་པ་དང་གཅིག་ཁར་ མཐུད་མ་ཚུགས།" + --- gnome-session-2.27.92.orig/debian/po-up/lv.po +++ gnome-session-2.27.92/debian/po-up/lv.po @@ -0,0 +1,38 @@ +# translation of lv.po to Latvian +# Latvian translation for Gnome Session. +# Copyright © 2006 Gnome i18n Project for Latvian. +# +# P�eris Krij�is , 2000. +# Artis Trops , 2000. +# Raivis Dejus , 2006. +msgid "" +msgstr "" +"Project-Id-Version: lv\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-12-23 15:07+0200\n" +"Last-Translator: Raivis Dejus \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Nevar savienoties ar sesiju pārvaldnieku" + --- gnome-session-2.27.92.orig/debian/po-up/kn.po +++ gnome-session-2.27.92/debian/po-up/kn.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Gnome-Session.Core-2.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2002-12-20 13:26+0530\n" +"Last-Translator: Pramod \n" +"Language-Team: Kannada \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "" + --- gnome-session-2.27.92.orig/debian/po-up/ml.po +++ gnome-session-2.27.92/debian/po-up/ml.po @@ -0,0 +1,37 @@ +# translation of gnome-session.HEAD.ml.po to Malayalam +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# FSF-India , 2003. +# Ani Peter , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.ml\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-08-07 16:26+0530\n" +"Last-Translator: Ani Peter \n" +"Language-Team: Malayalam\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "സെഷന്‍ മാനേജറുമായി ബന്ധപ്പെടാന്‍ കഴിയുന്നില്ല" + --- gnome-session-2.27.92.orig/debian/po-up/rw.po +++ gnome-session-2.27.92/debian/po-up/rw.po @@ -0,0 +1,43 @@ +# translation of gnome-session to Kinyarwanda. +# Copyright (C) 2005 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# Steve Murphy , 2005 +# Steve performed initial rough translation from compendium built from translations provided by the following translators: +# Philibert Ndandali , 2005. +# Viateur MUGENZI , 2005. +# Noëlla Mupole , 2005. +# Carole Karema , 2005. +# JEAN BAPTISTE NGENDAHAYO , 2005. +# Augustin KIBERWA , 2005. +# Donatien NSENGIYUMVA , 2005.. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.12\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2005-03-28 19:35-0700\n" +"Last-Translator: Steve Murphy \n" +"Language-Team: Kinyarwanda \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +#, fuzzy +msgid "Could not connect to the session manager" +msgstr "OYA Kwihuza Kuri Umukoro Muyobozi" + +#, fuzzy --- gnome-session-2.27.92.orig/debian/po-up/ja.po +++ gnome-session-2.27.92/debian/po-up/ja.po @@ -0,0 +1,41 @@ +# gnome-session ja.po. +# Copyright (C) 1998-2008 Free Software Foundation, Inc. +# Yukihiro Nakai , 1998 +# Yasuyuki Furukawa , 1999 +# Eiichiro ITANI , 1999 +# Takayuki KUSANO , 1999-2002 +# Yuusuke Tahara , 2000 +# Shingo Akagaki , 2000 +# Akira TAGOH , 2001 +# Ryoichi INAGAKI , 2002 +# Satoru SATOH , 2006. +# Takeshi AIHANA , 2003-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-28 23:36+0900\n" +"Last-Translator: Takeshi AIHANA \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "セッションを保存しました。" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "セッション・マネージャに接続できませんでした。" + --- gnome-session-2.27.92.orig/debian/po-up/bs.po +++ gnome-session-2.27.92/debian/po-up/bs.po @@ -0,0 +1,36 @@ +# translation of gnome-session.HEAD.bs.po to Bosnian +# Bosnian translation of gnome-session. +# Copyright (C) 2002 +# This file is distributed under the same license as the gnome-session package. +# Samir Marić , 2002. +# Kemal Sanjta , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.bs\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2004-07-28 02:50+0200\n" +"Last-Translator: Kemal Sanjta \n" +"Language-Team: Bosnian <+>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ne mogu se priključiti na menadžera sesije" + --- gnome-session-2.27.92.orig/debian/po-up/patches.pot +++ gnome-session-2.27.92/debian/po-up/patches.pot @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "" --- gnome-session-2.27.92.orig/debian/po-up/en_GB.po +++ gnome-session-2.27.92/debian/po-up/en_GB.po @@ -0,0 +1,33 @@ +# English (British) translation of gnome-core +# Copyright (C) 1999-2000 Free Software Foundation, Inc. +# Robert Brady , 1999-2000. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-core 1.1.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-02 18:16+0000\n" +"Last-Translator: David Lodge \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Your session has been saved." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Could not connect to the session manager" + --- gnome-session-2.27.92.orig/debian/po-up/mn.po +++ gnome-session-2.27.92/debian/po-up/mn.po @@ -0,0 +1,41 @@ +# translation of gnome-session.gnome-2-4.po to Mongolian +# translation of gnome-session.HEAD.po to Mongolian +# translation of mn.po to Mongolian +# translation of gnome-session.HEAD.mn.po to Mongolian +# This file is distributed under the same license as the PACKAGE package. +# SukhOchir , +# Bayarsaihan +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Sanlig Badral , 2003. +# Sanlig Badral , 2003. +# Sanlig Badral , 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.gnome-2-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2003-12-26 22:00+0100\n" +"Last-Translator: Sanlig Badral \n" +"Language-Team: Mongolian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Суулт менежерт холбогдож чадсангүй" + --- gnome-session-2.27.92.orig/debian/po-up/ka.po +++ gnome-session-2.27.92/debian/po-up/ka.po @@ -0,0 +1,33 @@ +# translation of gnome-session-2.0.po to Georgian +# Georgian translation for Gnome Session. +# Copyright © 2006 Ubuntu Georgian Translators. +# Vladimer Sichinava , 2006. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session-2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-05-20 01:17+0200\n" +"Last-Translator: Vladimer Sichinava \n" +"Language-Team: Georgian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "ვერ ვუკავშირდები სესიის მენეჯერს" + --- gnome-session-2.27.92.orig/debian/po-up/pt_BR.po +++ gnome-session-2.27.92/debian/po-up/pt_BR.po @@ -0,0 +1,41 @@ +# Brazilian Portuguese translation of gnome-session. +# Copyright (C) 1999-2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# Elvis Pfützenreuter +# Sandro Nunes Henrique +# Rodrigo Stulzer Lopes +# Ricardo Soares Guimarães +# Gustavo Maciel Dias Vieira , 2000-2001. +# Evandro Fernandes Giovanini , 2002-2005. +# Og Maciel , 2007. +# Vladimir Melo , 2007. +# Leonardo Ferreira Fontenelle , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-02 17:52-0200\n" +"Last-Translator: Leonardo Ferreira Fontenelle \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Sua sessão foi salva." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Não foi possível conectar ao gerenciador de sessão" + --- gnome-session-2.27.92.orig/debian/po-up/bg.po +++ gnome-session-2.27.92/debian/po-up/bg.po @@ -0,0 +1,40 @@ +# Bulgarian translation of gnome-session po-file. +# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Pavel Cholakov , 2001. +# Yanko Kaneti , 2002. +# Alexander Shopov , 2002, 2005, 2006, 2007. +# Vladimir Petkov , 2004 +# Peter Slavov , 2004 +# Vladimir "Kaladan" Petkov , 2005. +# Yavor Doganov , 2008. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session gnome-2-22\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-04-22 16:41+0300\n" +"Last-Translator: Yavor Doganov \n" +"Language-Team: Bulgarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Сесията ви е запазена." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Свързването с мениджъра на сесии е неуспешно" + --- gnome-session-2.27.92.orig/debian/po-up/tk.po +++ gnome-session-2.27.92/debian/po-up/tk.po @@ -0,0 +1,34 @@ +# Turkmen translation of gnome-session +# Copyright (C) 2004 Free Software Foundation +# Copyright (C) 2004 Kakilik Project +# This file is distributed under the terms of GNU General Public License (GPL) +# Gurban Mühemmet Tewekgeli , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2004-08-13 03:27+0330\n" +"Last-Translator: Gurban Mühemmet Tewekgeli \n" +"Language-Team: Turkmen \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "" + --- gnome-session-2.27.92.orig/debian/po-up/zu.po +++ gnome-session-2.27.92/debian/po-up/zu.po @@ -0,0 +1,34 @@ +# Zulu translation of gnome-session. +# Copyright (C) 2004 Zuza Software Foundation (Translate.org.za) +# This file is distributed under the same license as the gnome-session package. +# +# Zuza Software Foundation , 2004 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2004-12-02 17:02+0200\n" +"Last-Translator: Zuza Software Foundation \n" +"Language-Team: Zulu \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ihlulekile ukuxhumana kumphathi wesiqephu" + --- gnome-session-2.27.92.orig/debian/po-up/en_CA.po +++ gnome-session-2.27.92/debian/po-up/en_CA.po @@ -0,0 +1,34 @@ +# Canadian English translation of gnome-session +# Copyright (C) 2004-2006 Adam Weinberger and the GNOME Foundation +# This file is distributed under the same licence as the gnome-session package. +# Adam Weinberger , 2004, 2005, 2006. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2005-04-27 11:54-0500\n" +"Last-Translator: Adam Weinberger \n" +"Language-Team: Canadian English \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Your session has been saved." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Could not connect to the session manager" + --- gnome-session-2.27.92.orig/debian/po-up/ru.po +++ gnome-session-2.27.92/debian/po-up/ru.po @@ -0,0 +1,38 @@ +# translation of gnome-session to Russian +# Copyright (C) 1998-2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# +# Max Valianskiy , 1998-1999. +# Sergey Panov , 1999. +# Valek Filippov , 2000-2002. +# Dmitry G. Mastrukov , 2002-2003. +# Leonid Kanter , 2004, 2005, 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-08 15:06+0300\n" +"Last-Translator: Vasiliy Faronov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Ваш сеанс был сохранён." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Не удалось соединиться с менеджером сеансов" + --- gnome-session-2.27.92.orig/debian/po-up/ko.po +++ gnome-session-2.27.92/debian/po-up/ko.po @@ -0,0 +1,33 @@ +# Updated by Sung-Hyun Nam , 2000 +# Updated by Young-Ho Cha , 2000,2001,2006,2007 +# Changwoo Ryu , 1998,2002-2006, 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-26 08:46+0900\n" +"Last-Translator: Changwoo Ryu \n" +"Language-Team: GNOME Korea \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "세션을 저장했습니다." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "세션 관리자에 연결할 수 없습니다" + --- gnome-session-2.27.92.orig/debian/po-up/sr@latin.po +++ gnome-session-2.27.92/debian/po-up/sr@latin.po @@ -0,0 +1,37 @@ +# Serbian translation of gnome-session +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007. +# +# This file is distributed under the same license as the gnome-session package. +# +# Maintainer: Danilo Šegan +# Reviewed on 2005-07-10 by Danilo Šegan +# Translated on 2006-01-30 by: Slobodan D. Sredojević +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-03-12 15:01+0100\n" +"Last-Translator: Goran Rakić \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Vaša sesija je sačuvana." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ne može se povezati sa upravljačem sesije" + --- gnome-session-2.27.92.orig/debian/po-up/cs.po +++ gnome-session-2.27.92/debian/po-up/cs.po @@ -0,0 +1,42 @@ +# Translation of gnome-session to Czech. +# Copyright (C) 1999, 2003, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006 Miloslav Trmac . +# This file is distributed under the same license as the gnome-session package. +# GIS , 1999. +# David Šauer , 1999. +# George Lebl , 2000, 2001. +# Stanislav Brabec , 2000, 2001. +# Michal Bukovjan , 2002, 2003. +# Miloslav Trmac , 2004, 2005, 2006. +# Petr Tomeš , 2006. +# Petr Kovar , 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-01-25 17:51+0100\n" +"Last-Translator: Petr Kovar \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Vaše sezení bylo uloženo." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Nelze se spojit se správcem sezení" + --- gnome-session-2.27.92.orig/debian/po-up/az.po +++ gnome-session-2.27.92/debian/po-up/az.po @@ -0,0 +1,33 @@ +# Translation of gnome-session.HEAD.az.po file to Azerbaijani Turkish +# Copyright (C) 200 Free Software Foundation, Inc. +# Vasif Ismailoglu MD , 2000, 2001, 2002. +# Mətin Əmirov , 2002, 2003, 2004 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-core 1.2.99\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2003-07-10 20:39+0200\n" +"Last-Translator: Mətin Əmirov \n" +"Language-Team: Azerbaijani \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "İclas idarəçisinə bağlana bilmədi" + --- gnome-session-2.27.92.orig/debian/po-up/sk.po +++ gnome-session-2.27.92/debian/po-up/sk.po @@ -0,0 +1,37 @@ +# translation of sk.po to Slovak +# Slovak translation of sk.po +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Stanislav Visnovsky , 2002,2003. +# Stanislav Višňovský , 2002. +# Stanislav Visnovsky , 2003. +# Peter Tuharsky , 2007. +# Marcel Telka , 2005, 2006, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-09 09:07+0100\n" +"Last-Translator: Marcel Telka \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Vaša relácia bola uložená." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Nepodarilo sa pripojiť na správcu relácií" + --- gnome-session-2.27.92.orig/debian/po-up/sr.po +++ gnome-session-2.27.92/debian/po-up/sr.po @@ -0,0 +1,37 @@ +# Serbian translation of gnome-session +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007. +# +# This file is distributed under the same license as the gnome-session package. +# +# Maintainer: Данило Шеган +# Reviewed on 2005-07-10 by Данило Шеган +# Translated on 2006-01-30 by: Слободан Д. Средојевић +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-03-12 15:01+0100\n" +"Last-Translator: Горан Ракић \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Ваша сесија је сачувана." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Не може се повезати са управљачем сесије" + --- gnome-session-2.27.92.orig/debian/po-up/or.po +++ gnome-session-2.27.92/debian/po-up/or.po @@ -0,0 +1,36 @@ +# translation of or.po to Oriya +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Subhransu Behera , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: or\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-07-25 10:01+0530\n" +"Last-Translator: Subhransu Behera \n" +"Language-Team: Oriya \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "ଅଧିବେଶନ ପରିଚାଳକଙ୍କ ସହିତ ସମ୍ପର୍କ ସ୍ଥାପିତ କରିପାରିଲା ନାହିଁ" + --- gnome-session-2.27.92.orig/debian/po-up/fa.po +++ gnome-session-2.27.92/debian/po-up/fa.po @@ -0,0 +1,35 @@ +# Persian translation of gnome-session. +# Copyright (C) 2002, 2003, 2005, 2006 Sharif FarsiWeb, Inc. +# This file is distributed under the same license as gnome-session package. +# Roozbeh Pournader , 2002, 2003. +# Elnaz Sarbar , 2005, 2006. +# Meelad Zakaria , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-02-26 17:37+0330\n" +"Last-Translator: Elnaz Sarbar \n" +"Language-Team: Persian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "اتصال به مدیر نشست ممکن نیست" + --- gnome-session-2.27.92.orig/debian/po-up/mk.po +++ gnome-session-2.27.92/debian/po-up/mk.po @@ -0,0 +1,36 @@ +# translation of mk.po to Macedonian +# Copyright (C) 2002, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Ivan Stojmirov, 2002. +# Arangel Angov , 2006, 2008. +# Jovan Naumovski , 2006, 2007. +# Arangel Angov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: mk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-03 19:23+0100\n" +"Last-Translator: Arangel Angov \n" +"Language-Team: Macedonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Вашата сесија е зачувана." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Не може да се приклучи на менаџерот за сесии." + --- gnome-session-2.27.92.orig/debian/po-up/tr.po +++ gnome-session-2.27.92/debian/po-up/tr.po @@ -0,0 +1,40 @@ +# translation of gnome-session.HEAD.tr.po to Turkish +# Turkish translation of gnome-core. +# Copyright (C) 2001-2003, 2004, 2008 Free Software Foundation, Inc. +# +# Sinan İmamoğlu , 2002-2003. +# Ömer Fadıl USTA , 2002. +# Fatih Demir , 2000. +# Görkem Cetin , 2001. +# Arman Aksoy , 2003. +# Baris Cicek , 2004, 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.tr\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-02 13:22+0200\n" +"Last-Translator: Baris Cicek \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Oturumunuz kaydedildi." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Oturum yöneticisine bağlanılamadı" + --- gnome-session-2.27.92.orig/debian/po-up/wa.po +++ gnome-session-2.27.92/debian/po-up/wa.po @@ -0,0 +1,41 @@ +# Traduction into the walloon language. +# +# Si vos voloz donner on côp di spale pol ratournaedje di Gnome (ou des +# ôtes libes programes) sicrijhoz-mu a l' adresse emile +# ; nos avons co bråmint di l' ovraedje a fé. +# +# Copyright (C) 1999,2002 Free Software Foundation, Inc. +# Pablo Saratxaga 1999-2002 +# Lucyin Mahin, 2000 +# Lorint Hendschel , 1999-2000. +# Pablo Saratxaga , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 1.5.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2005-04-02 00:50+0200\n" +"Last-Translator: Pablo Saratxaga \n" +"Language-Team: Walloon \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Dji n' a nén parvnou a m' adjonde å manaedjeu des sessions" + --- gnome-session-2.27.92.orig/debian/po-up/gu.po +++ gnome-session-2.27.92/debian/po-up/gu.po @@ -0,0 +1,46 @@ +# translation of gnome-session.HEAD.gu.po to Gujarati +# MagNet , 2004. +# Ankit Patel , 2004, 2005, 2007. +# Ankit Patel , 2006. +# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.gu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-08-06 17:50+0530\n" +"Last-Translator: Ankit Patel \n" +"Language-Team: Gujarati \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" + +# gnome-session/save-session.c:160 +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "તમારા સત્રનો સંગ્રહ થઈ ગયો છે." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +# gnome-session/save-session.c:112 +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "સત્ર સંચાલક સાથે સંપર્ક થઈ શક્યો નથી" + --- gnome-session-2.27.92.orig/debian/po-up/ca.po +++ gnome-session-2.27.92/debian/po-up/ca.po @@ -0,0 +1,35 @@ +# gnome-session translation to Catalan. +# Copyright © 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Ivan Vilata i Balaguer , 2000. +# Softcatalà , 2000. +# Jordi Mallach , 2002, 2003, 2004, 2005, 2006, 2007. +# Josep Puigdemont , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.3.7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-16 01:09+0100\n" +"Last-Translator: Jordi Mallach \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "S'ha desat la sessió." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "No s'ha pogut connectar al gestor de sessions" + --- gnome-session-2.27.92.orig/debian/po-up/gl.po +++ gnome-session-2.27.92/debian/po-up/gl.po @@ -0,0 +1,43 @@ +# translation of gl.po to Galego +# Galician translation of gnome-session. +# Copyright (C) 1999-2004 Jesús Bravo Álvarez +# +# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas +# colaborar connosco, podes atopar máis información en http://www.trasno.net +# +# First Version: 2002-04-06 14:23+0200 +# +# Jesús Bravo Álvarez , 1999-2004. +# Ignacio Casal Quinteiro , 2005, 2006. +# Ignacio Casal Quinteiro , 2007. +# Ignacio Casal Quinteiro , 2008. +msgid "" +msgstr "" +"Project-Id-Version: gl\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-02 20:08+0100\n" +"Last-Translator: Ignacio Casal Quinteiro \n" +"Language-Team: Galego \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1)\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Gardouse a súa sesión." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Non se puido conectar co xestor de sesión" + --- gnome-session-2.27.92.orig/debian/po-up/si.po +++ gnome-session-2.27.92/debian/po-up/si.po @@ -0,0 +1,35 @@ +# translation of gnome-session.si.po to Sinhala +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Danishka Navin , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.si\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-05-27 20:26+0530\n" +"Last-Translator: Danishka Navin \n" +"Language-Team: Sinhala \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "ඔබගේ සැසිය සුරක්‍ෂිත විය." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "සැසි-කළමණාකරු සමඟ සම්බන්දවිය නොහැක" + --- gnome-session-2.27.92.orig/debian/po-up/th.po +++ gnome-session-2.27.92/debian/po-up/th.po @@ -0,0 +1,36 @@ +# Thai translation for gnome-session. +# Copyright (C) 2003-2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# +# Ranee Somchaimit , 2003 +# Paisa Seeluangsawat , 2004 +# Theppitak Karoonboonyanan , 2005-2008 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-06 18:00+0700\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "บันทึกวาระของคุณเรียบร้อย" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "ติดต่อโปรแกรมจัดการวาระไม่สำเร็จ" + --- gnome-session-2.27.92.orig/debian/po-up/es.po +++ gnome-session-2.27.92/debian/po-up/es.po @@ -0,0 +1,45 @@ +# translation of gnome-session.HEAD.po to Español +# gnome-session Spanish translation. +# Copyright © 1998-2003, 2006, 2007, 2008 the Free Software Foundation, Inc. +# Pablo Saratxaga 1999-2000 +# Javier Gómez 2000 +# Juanjo Alvarez 2000 +# Ismael Olea 2000 +# Manuel de Vega Barreiro 2000 +# Juan Manuel García Molina 2001-2002. +# +# Miguel de Icaza,computo,622-4680 1998. +# Francisco Javier F. Serrador , 2003. +# Francisco Javier F. Serrador , 2005, 2006. +# Jorge González , 2007. +# Jorge González , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-03 21:56+0100\n" +"Last-Translator: Jorge González \n" +"Language-Team: Español \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Se ha guardado su sesión." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "No se puede conectar al administrador de sesión" + --- gnome-session-2.27.92.orig/debian/po-up/xh.po +++ gnome-session-2.27.92/debian/po-up/xh.po @@ -0,0 +1,34 @@ +# Xhosa translation of gnome-session +# Copyright (C) 2005 Canonical Ltd. +# This file is distributed under the same license as the gnome-session package. +# Translation by Canonical Ltd with thanks to +# Translation World CC in South Africa, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2005-03-01 11:15+0200\n" +"Last-Translator: Simon Kemisho \n" +"Language-Team: Xhosa \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ayikwazanga ukunxulumana nomlawuli weseshoni" + --- gnome-session-2.27.92.orig/debian/po-up/mi.po +++ gnome-session-2.27.92/debian/po-up/mi.po @@ -0,0 +1,34 @@ +# Māori translation of gnome-session. +# Copyright (C) 2004 Free Software Foundation +# This file is distributed under the same license as the gnome-session package. +# John C Barstow , 2004. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2004-04-09 23:53+1200\n" +"Last-Translator: John C Barstow \n" +"Language-Team: Māori \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "" + --- gnome-session-2.27.92.orig/debian/po-up/ms.po +++ gnome-session-2.27.92/debian/po-up/ms.po @@ -0,0 +1,35 @@ +# gnome-session Bahasa Melayu (ms) +# Melihat Sistem kehakiman masa kini, Saya tak hairan +# kalau saya disabitkan dengan kesalahan mendera isteri +# ketika saya masih BUJANG +# +# Hasbullah Bin Pit (sebol) , 2001-2003 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2003-08-08 01:58+0800\n" +"Last-Translator: Hasbullah Bin Pit \n" +"Language-Team: Projek Gabai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Tak boleh menyambung ke pengurus sesi" + --- gnome-session-2.27.92.orig/debian/po-up/ga.po +++ gnome-session-2.27.92/debian/po-up/ga.po @@ -0,0 +1,34 @@ +# Irish translations for gnome-session package. +# Copyright (C) 2000, 2003, 2007 Free Software Foundation, Inc. +# Seán Ó Ceallaigh , 2000. +# Paul Duffy , 2003. +# Seán de Búrca , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-12-21 10:55-0700\n" +"Last-Translator: Seán de Búrca \n" +"Language-Team: Irish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "" + --- gnome-session-2.27.92.orig/debian/po-up/ar.po +++ gnome-session-2.27.92/debian/po-up/ar.po @@ -0,0 +1,39 @@ +# translation of gnome-session.HEAD.ar.po to Arabic +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER +# +# Sayed Jaffer Al-Mosawi , 2002. +# Djihed Afifi , 2006. +# Khaled Hosny , 2006, 2007, 2008. +# Anas Husseini , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.ar\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-06 04:03+0200\n" +"Last-Translator: Khaled Hosny \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "حُفِظت جلستُك." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "لم يمكن الاتصال بمدير الجلسات" + --- gnome-session-2.27.92.orig/debian/po-up/sq.po +++ gnome-session-2.27.92/debian/po-up/sq.po @@ -0,0 +1,35 @@ +# Përkthimi i mesazheve të gnome-session në shqip +# Copyright (C) 2006 Free Software Foundation, Inc. +# Deep_Dark , 2002. +# Laurent Dhima , 2003, 2004, 2005, 2006. +# Elian Myftiu , 2007 +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-02-28 17:13+0100\n" +"Last-Translator: Laurent Dhima \n" +"Language-Team: Albanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Seanca jote u ruajt." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "E pamundur lidhja me organizuesin e seancës" + --- gnome-session-2.27.92.orig/debian/po-up/eu.po +++ gnome-session-2.27.92/debian/po-up/eu.po @@ -0,0 +1,37 @@ +# translation of gnome-session.HEAD.po to Basque +# Copyright (C) 1999, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Joseba Bidaurrazaga van Dierdonck , 2000. +# Hizkuntza Politikarako Sailburuordetza , 2004. +# Iñaki Larrañaga Murgoitio , 2005, 2006, 2007, 2008. +# Iñaki Larrañaga Murgoitio , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-01-22 19:37+0100\n" +"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"Language-Team: Basque \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Zure saioa gorde da." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ezin izan da saio-kudeatzailearekin konektatu" + --- gnome-session-2.27.92.orig/debian/po-up/vi.po +++ gnome-session-2.27.92/debian/po-up/vi.po @@ -0,0 +1,35 @@ +# Vietnamese Translation for Gnome Session. +# Copyright © 2008 Gnome i18n Project for Vietnamese. +# Nguyễn Thái Ngọc Duy , 2002-2004,2007-2008. +# Clytie Siddall , 2005-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.20.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-23 16:41+0700\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.7b1\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Phiên chạy của bạn đã được lưu." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Không thể kết nối với trình quản lý phiên chạy" + --- gnome-session-2.27.92.orig/debian/po-up/hy.po +++ gnome-session-2.27.92/debian/po-up/hy.po @@ -0,0 +1,33 @@ +# translation of gnome-session.HEAD.hy.po to armenian +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.hy\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2005-08-25 13:59+0500\n" +"Last-Translator: Norayr Chilingaryan\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Անկարող է միանալ սեանսի մենեջերին" + --- gnome-session-2.27.92.orig/debian/po-up/id.po +++ gnome-session-2.27.92/debian/po-up/id.po @@ -0,0 +1,33 @@ +# Indonesia translation of gnome-session. +# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Mohammad DAMT , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2005-08-13 00:02+0300\n" +"Last-Translator: Mohammad DAMT \n" +"Language-Team: Indonesia \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Tidak dapat berhubungan dengan manajer sesi" + --- gnome-session-2.27.92.orig/debian/po-up/da.po +++ gnome-session-2.27.92/debian/po-up/da.po @@ -0,0 +1,51 @@ +# Danish translation of gnome-session. +# Copyright (C) 1998-08 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# Kenneth Christiansen , 1998-2000. +# Birger Langkjer , 1999. +# Keld Simonsen , 2000-2001. +# Ole Laursen , 2001, 02, 03. +# Martin Willemoes Hansen , 2004, 05. +# Lasse Bang Mikkelsen , 2007. +# Peter Bach , 2007. +# Ask Hjorth Larsen , 2007. +# Kenneth Nielsen , 2008. +# +# Konventioner: +# +# dialog -> vindue +# hints -> tip +# splash screen -> velkomstvindue +# start up -> starter +# tasklist -> procesliste +# URL -> adresse +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-09 21:52+0100\n" +"Last-Translator: Kenneth Nielsen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Din session er blevet gemt." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Kunne ikke tilkoble til sessionshåndteringen" + --- gnome-session-2.27.92.orig/debian/po-up/fr.po +++ gnome-session-2.27.92/debian/po-up/fr.po @@ -0,0 +1,42 @@ +# French translation of gnome-session. +# Copyright (C) 1998-2007 Free Software Foundation, Inc. +# +# Vincent Renardias , 1998-2000. +# Joaquim Fellmann , 2000. +# Christophe Merlet , 2000-2006. +# Sun G11n , 2002. +# Laurent Richard , 2006. +# Damien Durand , 2006. +# Robert-André Mauchin , 2006. +# Claude Paroz , 2007. +# Jonathan Ernst , 2007. +# Stéphane Raimbault , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-05 23:37+0100\n" +"Last-Translator: Stéphane Raimbault \n" +"Language-Team: GNOME French Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Votre session a été enregistrée." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ne peut se connecter au gestionnaire de connexions" + --- gnome-session-2.27.92.orig/debian/po-up/ro.po +++ gnome-session-2.27.92/debian/po-up/ro.po @@ -0,0 +1,33 @@ +# Sebastian Ivan , 2006. +# Eddy Petrișor , 2006. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session-2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-12-18 09:57+0200\n" +"Last-Translator: Eddy Petrișor \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" +"2:1))\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Nu s-a putut realiza conectarea la administratorul de sesiuni" + --- gnome-session-2.27.92.orig/debian/po-up/mg.po +++ gnome-session-2.27.92/debian/po-up/mg.po @@ -0,0 +1,32 @@ +# MALAGASY TRANSLATION OF GNOME-SESSION. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Thierry Randrianiriana , 2006. +msgid "" +msgstr "" +"Project-Id-Version: GNOME-SESSION 2.16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-08-04 22:16+0300\n" +"Last-Translator: Fano Rajaonarisoa \n" +"Language-Team: MALAGASY \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Tsy afaka nifandray tamin'ilay mpandrindra session" + --- gnome-session-2.27.92.orig/debian/po-up/fi.po +++ gnome-session-2.27.92/debian/po-up/fi.po @@ -0,0 +1,37 @@ +# gnome-session Finnish translation +# Copyright (C) 2002-2008 Free Software Foundation, Inc. +# Suomennos: http://gnome.fi/ +# Ville Hautamäki , 1998, 2000 +# Mikko Rauhala , 1999 +# Pauli Virtanen , 2000-2005 +# Ilkka Tuohela , 2005-2008 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-02-14 07:21+0300\n" +"Last-Translator: Ilkka Tuohela \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Istunto on tallennettu." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Istunnonhallintaan ei syntynyt yhteyttä" + --- gnome-session-2.27.92.orig/debian/po-up/am.po +++ gnome-session-2.27.92/debian/po-up/am.po @@ -0,0 +1,34 @@ +# Translations into the Amharic Language. +# Copyright (C) 2002 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# Ge'ez Frontier Foundation , 2002. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2003-01-24 09:30+EDT\n" +"Last-Translator: Ge'ez Frontier Foundation \n" +"Language-Team: Amharic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "" + --- gnome-session-2.27.92.orig/debian/po-up/hu.po +++ gnome-session-2.27.92/debian/po-up/hu.po @@ -0,0 +1,40 @@ +# Hungarian translation of gnome-session. +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# +# Szabolcs Ban , 1998, 1999, 2000, 2001, 2002. +# Emese Kovacs , 2000, 2001, 2002. +# Andras Timar , 2001, 2002, 2003. +# Laszlo Dvornik , 2004. +# Gabor Kelemen , 2004, 2005, 2006, 2007, 2008. +# Mate ORY , 2006. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-09 03:58+0100\n" +"Last-Translator: Gabor Kelemen \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "A munkamenet mentése sikeres." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Sikertelen kapcsolatfelvétel a munkamenet-kezelővel" + --- gnome-session-2.27.92.orig/debian/po-up/et.po +++ gnome-session-2.27.92/debian/po-up/et.po @@ -0,0 +1,41 @@ +# GNOME seansi eesti keele tõlge. +# Estonian translation of gnome-session. +# +# Copyright (C) 1999, 2001, 2002, 2004-2006 Free Software Foundation, Inc. +# Copyright (C) 2006-2008 The GNOME Project. +# +# Lauris Kaplinski , 1999. +# Ilmar Kerm , 2001, 2002. +# Tõivo Leedjärv , 2002. +# Priit Laes , 2004-2006. +# Ivar Smolin , 2005-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.22\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-01-23 08:04+0200\n" +"Last-Translator: Ivar Smolin \n" +"Language-Team: Estonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Sinu seanss salvestati." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ei saa ühendust seansihalduriga" + --- gnome-session-2.27.92.orig/debian/po-up/zh_CN.po +++ gnome-session-2.27.92/debian/po-up/zh_CN.po @@ -0,0 +1,35 @@ +# Dillion Chen +# Updated and QA by Wang Jian +# Updated and QA by Jiang Xiong +# Updated and QA by Zipeco +# Updated by Funda Wang , 2003 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-25 14:47+0800\n" +"Last-Translator: Yang Zhang \n" +"Language-Team: zh_CN \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "您的会话已保存。" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +# gsm/save-session.c:86 +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "无法连接到会话管理器" + --- gnome-session-2.27.92.orig/debian/po-up/eo.po +++ gnome-session-2.27.92/debian/po-up/eo.po @@ -0,0 +1,37 @@ +# Esperanto translation of gnome-session +# Copyright (C) 2003 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +# +# Joël Brich , 2003. +# Guillaume SAVATON , 2006 +# Dominique PELLÉ , 2006 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.3.6.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-09-25 13:45+0200\n" +"Last-Translator: Guillaume Savaton \n" +"Language-Team: Eo-Tradukado \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ne povis konekti al la sesiadministrilo" + --- gnome-session-2.27.92.orig/debian/po-up/pl.po +++ gnome-session-2.27.92/debian/po-up/pl.po @@ -0,0 +1,33 @@ +# Polish translation of gnome-session. +# Copyright (C) 2007 AviaryPL/GNOME-PL +# This file is distributed under the same license as the gnome-session package. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-06 15:17+0100\n" +"Last-Translator: Tomasz Dominikowski \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" +"X-Rosetta-Export-Date: 2007-06-29 15:48:13+0000\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Sesja została zapisana" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Nie można połączyć się z menedżerem sesji" + --- gnome-session-2.27.92.orig/debian/po-up/nl.po +++ gnome-session-2.27.92/debian/po-up/nl.po @@ -0,0 +1,44 @@ +# Dutch translation for gnome-session +# +# This file is distributed under the same license as the gnome-session package. +# +# Copyright (C) 1998 Free Software Foundation, Inc. +# Dirk-Jan C. Binnema , 1998, 1999. +# Dennis Smit , 2000. +# Almer S. Tigelaar , 2000. +# Vincent van Adrighem , 2001. +# Huib Kleinhout , 2002. +# Ronald Hummelink , 2002. +# Jeroen van der Vegt , 2002. +# Reinout van Schouwen , 2003 +# Tino Meinen 2005, 2006. +# Wouter Bolsterlee , 2007, 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-17 15:41+0100\n" +"Last-Translator: Wouter Bolsterlee \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Uw sessie is opgeslagen" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Kan geen verbinding maken met het sessiebeheer" + --- gnome-session-2.27.92.orig/debian/po-up/is.po +++ gnome-session-2.27.92/debian/po-up/is.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# Samúel Jón Gunnarsson , 2003. +# Richard Allen , 2003 +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2003-06-21 17:45--100\n" +"Last-Translator: Richard Allen \n" +"Language-Team: Icelandic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ekki tókst að tengjast setustjóra" + --- gnome-session-2.27.92.orig/debian/po-up/ne.po +++ gnome-session-2.27.92/debian/po-up/ne.po @@ -0,0 +1,38 @@ +# translation of gnome-session.HEAD.ne.po to Nepali +# Nepali translation of gnome-session +# This file is distributed under the same license as the gnome-session package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# +# Pawan Chitrakar , 2004. +# Shiva Prasad Pokharel , 2005. +# Nabin Gautam , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.ne\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-11-08 11:10+0545\n" +"Last-Translator: Nabin Gautam \n" +"Language-Team: Nepali \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n !=1\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "तपाईँको सत्र बचत गरिएको छ ।" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "सत्र प्रबन्धकमा जडान गर्न सकेन" + --- gnome-session-2.27.92.orig/debian/po-up/sv.po +++ gnome-session-2.27.92/debian/po-up/sv.po @@ -0,0 +1,37 @@ +# Swedish messages for gnome-session. +# Copyright (C) 1998-2008 Free Software Foundation, Inc. +# Daniel Nylander , 2006, 2007, 2008. +# Martin Wahlen , 1998. +# Anders Carlsson , 1999. +# Andreas Hyden , 2000. +# Martin Norbäck , 2000, 2001. +# Christian Rose , 2000, 2001, 2002, 2003, 2004, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-01-28 09:32+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Din session har sparats." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Kunde inte ansluta till sessionshanteraren" + --- gnome-session-2.27.92.orig/debian/po-up/ta.po +++ gnome-session-2.27.92/debian/po-up/ta.po @@ -0,0 +1,42 @@ +# translation of gnome-session.HEAD.po to TAMIL +# Tamil translation of Gnome-Session messages. +# Copyright (C) 2001, 2004, 2006, 2007 Free Software Foundation, Inc. +# +# Dinesh Nadarajah , 2004. +# Jayaradha N , 2004. +# Felix , 2006. +# Dr.T.Vasudevan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-08-12 16:06+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"\n" +"\n" + +# gsm/save-session.c:152 +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "உங்கள் அமர்வு சேமிக்கப்பட்டது" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +# gsm/save-session.c:93 +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "அமர்வு மேலாளருடன் இணைக்க முடியவில்லை" + --- gnome-session-2.27.92.orig/debian/po-up/cy.po +++ gnome-session-2.27.92/debian/po-up/cy.po @@ -0,0 +1,33 @@ +# gnome-session yn Gymraeg. +# Copyright (C) 2003 Free Software Foundation, Inc. +# www.gyfieithu.co.uk , 2003. +# and contributors +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2006-03-02 12:20-0000\n" +"Last-Translator: Rhys Jones \n" +"Language-Team: Cymraeg \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Methu cysylltu â'r rheolwr sesiwn" + --- gnome-session-2.27.92.orig/debian/po-up/pt.po +++ gnome-session-2.27.92/debian/po-up/pt.po @@ -0,0 +1,34 @@ +# gnome-session's Portuguese translation +# Copyright © 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 gnome-session +# Distributed under the same licence as the gnome-session package +# Nuno Ferreira , 1999 +# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.22\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-09 17:40+0000\n" +"Last-Translator: Duarte Loreto \n" +"Language-Team: Português \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "A sua sessão foi gravada." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Não foi possível ligar-se ao gestor de sessões" + --- gnome-session-2.27.92.orig/debian/po-up/nb.po +++ gnome-session-2.27.92/debian/po-up/nb.po @@ -0,0 +1,32 @@ +# Norwegian translation of gnome-session (bokmål dialect). +# Copyright (C) 1998-2004 Free Software Foundation, Inc. +# Kjartan Maraas , 1998-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.21.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-01-21 21:42+0100\n" +"Last-Translator: Kjartan Maraas \n" +"Language-Team: Norwegian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Din sesjon er lagret." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Kunne ikke koble til sesjonsbehandler" + --- gnome-session-2.27.92.orig/debian/po-up/te.po +++ gnome-session-2.27.92/debian/po-up/te.po @@ -0,0 +1,35 @@ +# Telugu translation of gnome-session. +# Copyright (C) 2007 Swecha Telugu Localisation team +# This file is distributed under the same license as the gnome-session package. +# Pavan Kumar , 2007 +# Y.Kiran Chandra , 2007 +# J.Bharat Kumar , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2007-07-19 13:59+0530\n" +"Last-Translator: Bharat Kumar \n" +"Language-Team: Swecha Telugu Localisation Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "మీ సమకూర్పు దాచబడింది" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "సమకూర్పు నిర్వాహకి తో బంధం సాధ్యపడలేదు" + --- gnome-session-2.27.92.orig/debian/po-up/nso.po +++ gnome-session-2.27.92/debian/po-up/nso.po @@ -0,0 +1,34 @@ +# Northern Sotho translation of gnome-session. +# Copyright (C) 2004 Zuza Software Foundation +# This file is distributed under the same license as the gnome-session package. +# +# Zuza Software Foundation , 2004 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2004-11-29 17:02+0200\n" +"Last-Translator: Zuza Software Foundation \n" +"Language-Team: Northern Sotho \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ga e kgone go kgokagana le molaodi wa lenaneo" + --- gnome-session-2.27.92.orig/debian/po-up/af.po +++ gnome-session-2.27.92/debian/po-up/af.po @@ -0,0 +1,34 @@ +# Afrikaans translation of gnome-session. +# Copyright (C) 2004 Zuza Software Foundation +# This file is distributed under the same license as the gnome-session package. +# +# Zuza Software Foundation , 2004 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.6-branch\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2004-03-30 17:02+0200\n" +"Last-Translator: Zuza Software Foundation \n" +"Language-Team: Afrikaans \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Kon nie met sessiebestuurder koppel nie" + --- gnome-session-2.27.92.orig/debian/po-up/lt.po +++ gnome-session-2.27.92/debian/po-up/lt.po @@ -0,0 +1,40 @@ +# translation of gnome-session.HEAD.po to Lithuanian +# Lithuanian translation of gnome-session +# Copyright (C) 2000-2006, 2007, 2008 Free Software Foundation, Inc. +# +# +# Gediminas Paulauskas , 2000-2003. +# Žygimantas Beručka , 2003-2007. +# Justina Klingaitė , 2005. +# Gintautas Miliauskas , 2006, 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-02 02:39+0200\n" +"Last-Translator: Žygimantas Beručka \n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Jūsų seansas išsaugotas." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Nepavyko prisijungti prie seansų valdyklės" + --- gnome-session-2.27.92.orig/debian/po-up/mr.po +++ gnome-session-2.27.92/debian/po-up/mr.po @@ -0,0 +1,41 @@ +# translation of gnome-session.HEAD.mr.po to marathi +# THIRD AUTHOR: Rahul Bhalerao , 2006. +# FOURTH AUTHOR:Sandeep Shedmake , 2008. +# sandeep shedmake , 2008. +# Marathi translation of gnome-session-2.0 +# Copyright (C) 2003, Jitendra Shah +# This file is released under GPL +# FIRST AUTHOR: Swapnil Hajare +# SECOND AUTHOR: Pradeep Deshpande +msgid "" +msgstr "" +"Project-Id-Version: gnome-session.HEAD.mr\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-18 11:45+0530\n" +"Last-Translator: sandeep shedmake \n" +"Language-Team: marathi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" +"\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "तुमचे सत्र संचयीत झाले आहे." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "सत्र संचालकाशी संपर्क झाला नाही" + --- gnome-session-2.27.92.orig/debian/po-up/de.po +++ gnome-session-2.27.92/debian/po-up/de.po @@ -0,0 +1,42 @@ +# German translation file for gnome-session. +# Copyright (C) 1998-2002, 2007 Free Software Foundation, Inc. +# Carsten Schaar , 1998. +# Matthias Warkus , 1999-2001. +# Karl Eichwalder , 2000, 2001. +# Christian Meyer , 2000, 2001. +# Benedikt Roth , 2000, 2001. +# Jörgen Scheibengruber , 2002. +# Christian Neumair , 2002, 2003, 2004. +# Hendrik Richter , 2005, 2006, 2007. +# Jochen Skulj , 2006. +# Andre Klapper +# Christian Kirbach +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-06-25 22:04-0600\n" +"Last-Translator: Christian Kirbach \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Ihre Sitzung wurde abgespeichert." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Sitzungsmanager konnte nicht kontaktiert werden" + --- gnome-session-2.27.92.orig/debian/po-up/sl.po +++ gnome-session-2.27.92/debian/po-up/sl.po @@ -0,0 +1,39 @@ +# This file is distributed under the same license as the program package. +# +# Translators: +# Andraz Tori 2000 +# Matej Urbančič , 2007 - 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-core 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-02-17 21:51+0100\n" +"Last-Translator: Matej Urbančič \n" +"Language-Team: Slovenian GNOME Translation Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Seja je bila shranjena." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ni se mogoče povezati z upraviteljem sej" + --- gnome-session-2.27.92.orig/debian/po-up/hr.po +++ gnome-session-2.27.92/debian/po-up/hr.po @@ -0,0 +1,32 @@ +# Translation of gnome-session to Croatiann +# Copyright (C) Croatiann team +# Translators: Automatski Prijevod <>,Denis Lackovic ,Robert Sedak , +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2004-02-05 23:49+CET\n" +"Last-Translator: auto\n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: TransDict server\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Ne mogu se spojiti na upravitelja sesije" + --- gnome-session-2.27.92.orig/debian/po-up/nn.po +++ gnome-session-2.27.92/debian/po-up/nn.po @@ -0,0 +1,42 @@ +# translation of nn.po to Norwegian Nynorsk +# Norwegian (nynorsk) translation of gnome-core. +# Copyright (C) 1998-2000, 2003, 2006, 2008 Free Software Foundation, Inc. +# +# Christian Fredrik Kalager Schaller , 2000-2001. +# Kjartan Maraas , 2001. +# Roy-Magne Mo , 2001-2002. +# Monica Gausen , 2001. +# Åsmund Skjæveland , 2003, 2006. +# Eskild Hustvedt , 2008 +msgid "" +msgstr "" +"Project-Id-Version: nn\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-31 19:33+0200\n" +"Last-Translator: Eskild Hustvedt \n" +"Language-Team: Norwegian Nynorsk \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: MagicPO 0.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +# +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "Din økt er lagra." + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +# gsm/save-session.c:92 +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "Kunne ikkje kople til økthandsamar" + --- gnome-session-2.27.92.orig/debian/po-up/bn_IN.po +++ gnome-session-2.27.92/debian/po-up/bn_IN.po @@ -0,0 +1,38 @@ +# translation of bn_IN.po to Bengali INDIA +# Taneem Ahmed , 2003. +# Khandakar Mujahidul Islam , 2003-2005. +# Runa Bhattacharjee , 2008. +# Bengali India translation of gnome-session. +# Copyright (C) 2003, 2006, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-session package. +msgid "" +msgstr "" +"Project-Id-Version: bn_IN\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-03-05 16:10+0530\n" +"Last-Translator: Runa Bhattacharjee \n" +"Language-Team: Bengali INDIA \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "আপনার সেশন সংরক্ষিত হয়েছে।" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "সেশান পরিচালনব্যবস্থার সাথে সংযোগ স্থাপন করতে ব্যর্থ" + --- gnome-session-2.27.92.orig/debian/po-up/zh_HK.po +++ gnome-session-2.27.92/debian/po-up/zh_HK.po @@ -0,0 +1,41 @@ +# Chinese (Hong Kong) translation of gnome-session. +# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# gnome-core: +# Yuan-Chung Cheng , 1999. +# Jing-Jong Shyue , 2000. +# Chih-Wei Huang , 2000. +# Abel Cheung , 2001-2002. +# gnome-session: +# Abel Cheung , 2002-2003. +# Woodman Tuen , 2005-006. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-session 2.21.91\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-12 11:04+0200\n" +"PO-Revision-Date: 2008-06-24 20:38+0800\n" +"Last-Translator: Woodman Tuen \n" +"Language-Team: Chinese (Hong Kong) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/10_session_save.patch:114 +msgid "Your session has been saved." +msgstr "作業階段已經儲存。" + +#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140 +msgid "Failed to save session" +msgstr "" + +#: ../patches/10_session_save.patch:128 +msgid "Could not connect to the session bus" +msgstr "" + +#: ../patches/10_session_save.patch:134 +msgid "Could not connect to the session manager" +msgstr "無法連接作業階段總管" +